Merge with Michael archive (Debian version)

[apt.git] / Makefile

diff --git a/Makefile b/Makefile
index a7f4a4c221bf1270c0fd505331dc686ff8252011..72cac61b5ec7f5833e401956be4364fae4eb2654 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,38 +6,29 @@ ifndef NOISY
 .SILENT:
 endif
 
+.PHONY: default
+default: startup all
+
 .PHONY: headers library clean veryclean all binary program doc
-all headers library clean veryclean binary program doc:
+all headers library clean veryclean binary program doc dirs:
        $(MAKE) -C apt-pkg $@
+       $(MAKE) -C apt-inst $@
        $(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 $@
 
+# Some very common aliases
 .PHONY: maintainer-clean dist-clean distclean pristine sanity 
 maintainer-clean dist-clean distclean pristine sanity: veryclean
 
-
 # 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:
-       mkdir $(BUILD)
-$(BUILD)/config.status: configure
-       (HERE=`pwd`; cd $(BUILD) && $$HERE/configure)
-$(BUILD)/include/config.h: buildlib/config.h.in
-$(BUILD)/environment.mak: buildlib/environment.mak.in
-$(CONVERTED):
-       (cd $(BUILD) && ./config.status)
+CONVERTED=environment.mak include/config.h include/apti18n.h 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