[Libreoffice-commits] .: Branch 'libreoffice-3-3' - Makefile.am

[Chris Halls]

 Makefile.am |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 782d6ce2a2d76dfe3b9ab263d2317faade1f6bc9
Author: Chris Halls <halls at debian.org>
Date:   Wed Dec 8 11:47:48 2010 +0000

    Fix build target dependencies
    
    Fixes build failure with MAKEFLAGS=-j2
    
    With -j2, unpack and patch were running in parallel.
    The dependencies needed to be on the targets themselves, not the
    convenience targets without the $(OOBUILDDIR)/ prefix.

diff --git a/Makefile.am b/Makefile.am
index b9da4ee..5bebd9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,8 +34,8 @@ STAMP_DIR=$(top_builddir)/stamp
 
 # Source preparation
 
-unpack : $(OOBUILDDIR)/unpack $(top_srcdir)/bin/unpack
-$(OOBUILDDIR)/unpack :
+unpack : $(OOBUILDDIR)/unpack
+$(OOBUILDDIR)/unpack : $(top_srcdir)/bin/unpack
 	$(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR)
 	test -n "$(OOO_GIT_MANAGED)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true
 	if test -d $(OOBUILDDIR)/applied_patches ; then \
@@ -56,9 +56,11 @@ $(STAMP_DIR)/artwork.install : $(OOBUILDDIR)/unpack \
 	$(TOOLSDIR)/bin/install-artwork $(top_srcdir)/src $(OOBUILDDIR)
 	touch $@
 
-patch.apply: $(OOBUILDDIR)/unpack $(STAMP_DIR)/refresh $(STAMP_DIR)/patch.apply
+patch.apply: $(STAMP_DIR)/patch.apply
 $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \
 			   $(top_srcdir)/patches/*/*.diff \
+			   $(OOBUILDDIR)/unpack \
+			   $(STAMP_DIR)/refresh \
 			   $(APPLY_DIR)/apply
 	if test "z$(BUILD_WIN32)" != "z"; then \
 	    cp -af $(BUILDDIR)/x86/* $(OOBUILDDIR)/external/dbghelp || true; \