Merge my tree and the remote tree (no change, I guess)

[apt.git] / Makefile

diff --git a/Makefile b/Makefile
index 9a47014c3ccb0fb1d840bb619bb5e6479acba539..24f5b3e2bf20a5180772639ea6fef0f4c30d28a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ endif
 .PHONY: default
 default: startup all
 
 .PHONY: default
 default: startup all
 

-.PHONY: headers library clean veryclean all binary program doc test
-all headers library clean veryclean binary program doc dirs test:
+.PHONY: headers library clean veryclean all binary program doc test update-po
+all headers library clean veryclean binary program doc manpages 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,9 +21,14 @@ all headers library clean veryclean binary program doc dirs test:
        $(MAKE) -C po $@
        $(MAKE) -C test $@
 
        $(MAKE) -C po $@
        $(MAKE) -C test $@
 

+all headers library clean veryclean binary program doc manpages 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.