diff options
| -rw-r--r-- | Makefile.in | 12 | ||||
| -rw-r--r-- | solenv/bin/callcatcher.Makefile | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 7dde471d8912..01d8d5c6806c 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 9ea7ea5e668e..7c24f9af93fb 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 |