* merged with mainline, finalized changelog

[apt.git] / Makefile

diff --git a/Makefile b/Makefile
index 1db7bfd07f1b76879b2c336f2844a13d568bc689..72cac61b5ec7f5833e401956be4364fae4eb2654 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,17 +6,19 @@ 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 $@
-ifdef GUI      
-       $(MAKE) -C deity $@
-       $(MAKE) -C gui $@
-endif
+       $(MAKE) -C ftparchive $@
+       $(MAKE) -C dselect $@
        $(MAKE) -C doc $@
+       $(MAKE) -C po $@
 
 # Some very common aliases
 .PHONY: maintainer-clean dist-clean distclean pristine sanity 
@@ -24,7 +26,9 @@ maintainer-clean dist-clean distclean pristine sanity: veryclean
 
 # The startup target builds the necessary configure scripts. It should
 # be used after a CVS checkout.
-CONVERTED=environment.mak include/config.h makefile
+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
-include buildlib/configure.mak
+$(BUILDDIR)/makefile: buildlib/makefile.in