[ooo-build-commit] .: Makefile.shared
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Jan 25 00:36:58 PST 2010
Makefile.shared | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 42772928ad94616e4347ed6af2b854eeee442a68
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Jan 25 09:35:43 2010 +0100
Fixed broken makefiles (autocorrection scripts)
* Makefile.shared:
diff --git a/Makefile.shared b/Makefile.shared
index 6c166c7..94e4ce3 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -30,8 +30,11 @@ $(STAMP_DIR)/artwork.install : $(OOBUILDDIR)/unpack \
$(TOOLSDIR)/bin/install-artwork $(top_srcdir)/src $(OOBUILDDIR)
touch $@
-autocorr.apply: $(top_srcdir)/bin/add_acor.py $(top_srcdir)/src/acor.csv $(STAMP_DIR)/autocorr.apply
+autocorr.apply: $(STAMP_DIR)/autocorr.apply
+$(STAMP_DIR)/autocorr.apply: $(OOBUILDDIR)/unpack \
+ $(top_srcdir)/bin/add_acor.py $(top_srcdir)/src/acor.csv
$(top_srcdir)/bin/add_acor.py $(OOBUILDDIR) $(top_srcdir)/src/acor.csv
+ touch $@
patch.apply: $(OOBUILDDIR)/unpack $(STAMP_DIR)/patch.apply
$(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \
@@ -74,7 +77,7 @@ patch.list:
# Build bits:
prebuild : $(STAMP_DIR)/prebuild
-$(STAMP_DIR)/prebuild : $(OOBUILDDIR)/unpack $(STAMP_DIR)/autocorr.apply
+$(STAMP_DIR)/prebuild : $(OOBUILDDIR)/unpack
echo "Creating environment"
mkdir -p $(BUILDDIR)
mkdir -p $(BUILDDIR)/bin
@@ -97,6 +100,7 @@ build.prepare : $(STAMP_DIR)/build_prepared
$(STAMP_DIR)/build_prepared : $(OOBUILDDIR)/unpack \
$(STAMP_DIR)/patch.apply \
$(STAMP_DIR)/artwork.install \
+ $(STAMP_DIR)/autocorr.apply \
$(STAMP_DIR)/build.tools \
$(STAMP_DIR)/prebuild
touch $@
More information about the ooo-build-commit
mailing list