* Makefile, buildlib/*.mak:

  - reshuffle dependencies so that parallel building seems to work

diff --git a/Makefile b/Makefile
index aa8160ac0694d7515ec5fb06b9724b088b5c9927..a35ad1d371ae5968d59f24948b4e6e7355dfdec1 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
-startup all headers library clean veryclean binary program doc dirs test update-po:
+all headers library clean veryclean binary program doc test update-po startup dirs:
        $(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 $@
 
-update-po: startup
+all headers library clean veryclean binary program doc test update-po: startup dirs
+
+dirs: startup
 
 # 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
+veryclean: clean
 
 # The startup target builds the necessary configure scripts. It should
 # be used after a CVS checkout.

diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index 310c2600c83561bbebb523de522778da01e01faf..c0d8e3c768d17f1ab75c07da43938221b6bbf5e3 100644 (file)
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -20,16 +20,15 @@ startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTE
 buildlib/config.sub:
        ln -sf /usr/share/misc/config.sub buildlib/config.sub
 buildlib/config.guess:
-       ln -sf /usr/share/misc/config.guess buildlib/config.guess       
+       ln -sf /usr/share/misc/config.guess buildlib/config.guess
 configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub
        autoconf
 
 aclocal.m4: $(wildcard buildlib/*.m4)
        aclocal -I buildlib
-       
+
 $(BUILDDIR)/config.status: configure
-       /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR)       
+       /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR)
        (HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure)
-       
-$(addprefix $(BUILDDIR)/,$(CONVERTED)):
-       (cd $(BUILDDIR) && ./config.status)
+
+$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/config.status

diff --git a/buildlib/copy.mak b/buildlib/copy.mak
index 3ae11a7eb9fec54d317881ed62c96cb43f511a6e..e8fe43deb5443faf780747649e2f5cc9c3d54dcc 100644 (file)
--- a/buildlib/copy.mak
+++ b/buildlib/copy.mak
@@ -21,7 +21,7 @@ veryclean: veryclean/$(LOCAL)
 
 MKDIRS += $(dir $($(LOCAL)-LIST))
 
-$($(LOCAL)-LIST) : $(TO)/% : %
+$($(LOCAL)-LIST) : $(TO)/% : % dirs
        echo Installing $< to $(@D)
        cp $< $(@D)
 

diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak
index bb1c77e47612ea45deb2d9662b5a814326fa68e0..d4665252077162d44c29ada25ddbe19c6c8f7a56 100644 (file)
--- a/buildlib/podomain.mak
+++ b/buildlib/podomain.mak
@@ -11,9 +11,9 @@ MY_DOMAIN := $(APT_DOMAIN)
 endif
 
 MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN)
-$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE))
-$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile
-       (echo $(SRC) | xargs -n1 echo) > $@
+$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: $(addprefix $(BASE)/$(SUBDIR)/,$(SOURCE))
+$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile dirs
+       (echo $(addprefix $(SUBDIR)/,$(SOURCE)) | xargs -n1 echo) > $@
 startup binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
 
 veryclean: veryclean/$(LOCAL)

diff --git a/debian/changelog b/debian/changelog
index af63bec4e8a4e0c862ff19e2b2acb381b1dcfae9..a118658911c5c55a398cfd7ce96d38180ce11b5a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ apt (0.9.4) UNRELEASED; urgency=low
   * apt-pkg/pkgcachegen.cc:
     - make IsDuplicatedDescription static so that it is really private
       as we don't need a symbol for it as it is not in a header
+  * Makefile, buildlib/*.mak:
+    - reshuffle dependencies so that parallel building seems to work
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 11 May 2012 23:26:59 +0200