[Libreoffice-commits] core.git: Makefile.in solenv/bin

[Caolán McNamara]

 Makefile.in                     |   12 +++++++-----
 solenv/bin/callcatcher.Makefile |    6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 8fd1bd1879bae6d183ff45eba49d46ccfcd466c0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 19 16:46:21 2013 +0100

    bodge callcatcher build back to half-life
    
    Change-Id: I91393aa912bd69f3fbeb67d895ff7d8021effccb

diff --git a/Makefile.in b/Makefile.in
index 7dde471..01d8d5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -380,11 +380,13 @@ docs:
 findunusedcode:
 	@which callcatcher > /dev/null 2>&1 || \
 	    (echo "callcatcher not installed" && false)
-	@sed -e s,$$INPATH,callcatcher,g config_host.mk | sed -e s,"export OOO_JUNIT_JAR=.*","export OOO_JUNIT_JAR=",g > $(SRCDIR)/config_host_callcatcher.mk
-	@echo unexport ARCH_FLAGS >> $(SRCDIR)/config_host_callcatcher.mk
-	@echo unexport CFLAGS >> $(SRCDIR)/config_host_callcatcher.mk
-	@echo unexport CXXFLAGS >> $(SRCDIR)/config_host_callcatcher.mk
-	@mkdir -p $(SRCDIR)/solenv/callcatcher/bin && \
+	@mkdir -p $(SRCDIR)/callcatcher/config_host
+	@cp config_host/* callcatcher/config_host
+	@cp config_host.mk* callcatcher
+	@sed -e s,$$INPATH,callcatcher,g config_host.mk | sed -e s,"export OOO_JUNIT_JAR=.*","export OOO_JUNIT_JAR=",g > $(SRCDIR)/callcatcher/config_host.mk
+	@echo unexport ARCH_FLAGS >> $(SRCDIR)/callcatcher/config_host.mk
+	@echo unexport CFLAGS >> $(SRCDIR)/callcatcher/config_host.mk
+	@echo unexport CXXFLAGS >> $(SRCDIR)/callcatcher/config_host.mk
 	$(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile findunusedcode
 	@grep ::.*\( unusedcode.all \
               | grep -v ^Atom \
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index 9ea7ea5..7c24f9a 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -9,7 +9,7 @@
 
 .PHONY: all
 
-include config_host_callcatcher.mk
+include callcatcher/config_host.mk
 
 export CC:=callcatcher $(CC)
 export CXX:=callcatcher $(CXX)
@@ -23,9 +23,9 @@ export dbglevel:=2
 include $(SOLARENV)/gbuild/gbuild.mk
 
 findunusedcode:
-	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
+	$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
 	ooinstall -l $(DEVINSTALLDIR)/opt
-	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild subsequentcheck
+	$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild subsequentcheck
 	callanalyse $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \
 	  $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \
 	  > unusedcode.all