merge patches from daniel to fix merge artifact and test failure

[apt.git] / Makefile

diff --git a/Makefile b/Makefile
index aa8160ac0694d7515ec5fb06b9724b088b5c9927..98b6d337a29074165a15b86a45fd5b2907cedea4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ endif
 default: startup all
 
 .PHONY: headers library clean veryclean all binary program doc test update-po
 default: startup all
 
 .PHONY: headers library clean veryclean all binary program doc test update-po

-startup all headers library clean veryclean binary program doc dirs 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 methods $@
        $(MAKE) -C apt-pkg $@
        $(MAKE) -C apt-inst $@
        $(MAKE) -C methods $@


@@ -21,11 +21,14 @@ startup all headers library clean veryclean binary program doc dirs test update-
        $(MAKE) -C po $@
        $(MAKE) -C test $@
 
        $(MAKE) -C po $@
        $(MAKE) -C test $@
 

-update-po: startup
+all headers library clean veryclean binary program doc manpages debiandoc test update-po: startup dirs
+
+dirs: startup

 
 # Some very common aliases
 
 # Some very common aliases

-.PHONY: maintainer-clean dist-clean distclean pristine sanity 
+.PHONY: maintainer-clean dist-clean distclean pristine sanity

 maintainer-clean dist-clean distclean pristine sanity: veryclean
 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.
 
 # The startup target builds the necessary configure scripts. It should
 # be used after a CVS checkout.