fix progress-segfault in case of dpkg errors/prompts

[apt.git] / Makefile

diff --git a/Makefile b/Makefile
index b2e55a57f209328e8c8b6d04c389f99189c44da7..fb843983ceeaf9ac463f0982b0f9ef8f0f5bd902 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,40 @@
 
 # This is the top level make file for APT, it recurses to each lower
 # level make file and runs it with the proper target
+ifndef NOISY
 .SILENT:
+endif
 
-.PHONY: headers library clean veryclean all binary program doc
-all headers library clean veryclean binary program doc:
-       $(MAKE) -C deity $@
+.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 debiandoc test update-po startup dirs:
        $(MAKE) -C apt-pkg $@
+       $(MAKE) -C apt-inst $@
+       $(MAKE) -C apt-private $@
+       $(MAKE) -C methods $@
+       $(MAKE) -C cmdline $@
+       $(MAKE) -C ftparchive $@
+       $(MAKE) -C dselect $@
        $(MAKE) -C doc $@
+       $(MAKE) -C po $@
+       $(MAKE) -C test $@ 
+
+all headers library clean veryclean binary program doc manpages debiandoc 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.
+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