refactor key removal code to reuse it in next step

[apt.git] / Makefile

diff --git a/Makefile b/Makefile
index 33f40750545f7ccd61ae14d129b3cff03f7d7b43..6e1edbd5f1010617317f7a6a5a1af790d717ef7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,37 +6,37 @@ ifndef NOISY
 .SILENT:
 endif
 
-.PHONY: headers library clean veryclean all binary program doc
-all headers library clean veryclean binary program doc:
+.PHONY: default
+default: startup all
+
+.PHONY: headers library clean veryclean all binary program doc test update-po
+all headers library clean veryclean binary program doc manpages docbook test update-po startup dirs:
+       $(MAKE) -C vendor $@
        $(MAKE) -C apt-pkg $@
+       $(MAKE) -C apt-inst $@
+       $(MAKE) -C apt-private $@
        $(MAKE) -C methods $@
-#      $(MAKE) -C methods/ftp $@
        $(MAKE) -C cmdline $@
-       $(MAKE) -C deity $@
-       $(MAKE) -C gui $@
+       $(MAKE) -C ftparchive $@
+       $(MAKE) -C dselect $@
        $(MAKE) -C doc $@
+       $(MAKE) -C po $@
+       $(MAKE) -C test $@
 
-.PHONY: maintainer-clean dist-clean distclean pristine sanity 
-maintainer-clean dist-clean distclean pristine sanity: veryclean
+all headers library clean veryclean binary program doc manpages docbook test update-po: startup dirs
 
+dirs: startup
+
+# Some very common aliases
+.PHONY: maintainer-clean dist-clean distclean pristine sanity
+maintainer-clean dist-clean distclean pristine sanity: veryclean
+veryclean: clean
 
 # The startup target builds the necessary configure scripts. It should
 # be used after a CVS checkout.
-.PHONY: startup
-BUILD=build
-CONVERTED=$(BUILD)/environment.mak $(BUILD)/include/config.h $(BUILD)/makefile
-startup: configure $(CONVERTED)
-
-configure: aclocal.m4 configure.in
-       autoconf        
-
-aclocal.m4:
-       aclocal -I buildlib
-
-$(BUILD)/config.status: configure
-       test -e $(BUILD) || mkdir $(BUILD)      
-       (HERE=`pwd`; cd $(BUILD) && $$HERE/configure)
-$(BUILD)/include/config.h: buildlib/config.h.in
-$(BUILD)/environment.mak: buildlib/environment.mak.in
-$(CONVERTED): $(BUILD)/config.status
-       (cd $(BUILD) && ./config.status)
+CONVERTED=environment.mak include/config.h include/apti18n.h build/doc/Doxyfile makefile
+include buildlib/configure.mak
+$(BUILDDIR)/include/config.h: buildlib/config.h.in
+$(BUILDDIR)/include/apti18n.h: buildlib/apti18n.h.in
+$(BUILDDIR)/environment.mak: buildlib/environment.mak.in
+$(BUILDDIR)/makefile: buildlib/makefile.in