Makefile.in | 29 +++++++++++++++++++----------
solenv/gbuild/gbuild.mk | 2 --
2 files changed, 19 insertions(+), 12 deletions(-)
New commits:
commit 91a7e5adce8178ba83abc3a701dfd622dbbcc1bf
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Sep 16 19:47:15 2011 +0200
fail early when having mixed build/check targets, also escape GNUMAKE
correctly
diff --git a/Makefile.in b/Makefile.in
index 960f7d1..67cf587 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,12 +8,19 @@ else
CROSS_TOOLSET_RULE:=
endif
-.PHONY : build dev-install check allcheck unitcheck subsequentcheck all
cross-build-toolset install distro-pack-install clean distclean findunusedcode
+ifeq ($(filter all check unitcheck,$(MAKECMDGOALS)),)
+gb_MAKETARGET=build
+else
+# fail early
+gb_MAKETARGET=all
+endif
+
+.PHONY : build dev-install all cross-build-toolset install distro-pack-install
clean distclean findunusedcode
build: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded
$(CROSS_TOOLSET_RULE)
@. ./Env.Host.sh && \
- cd instsetoo_native && \
- gb_MAKETARGET=build build.pl -P@BUILD_NCPUS@ --all --
-P@BUILD_MAX_JOBS@
+ cd instsetoo_native && \
+ gb_MAKETARGET=$(gb_MAKETARGET) build.pl -P@BUILD_NCPUS@ --all
-- -P@BUILD_MAX_JOBS@
dev-install: build
@. ./Env.Host.sh && \
@@ -33,11 +40,13 @@ dev-install: build
fi
check : allcheck
+ @true
+
%check:
- @. ./Env.Host.sh && $(GNUMAKE) -f "$$SRC_ROOT"/GNUmakefile.mk -r \
- $(if @VERBOSE@,,-s) --jobs="$(if \
- $(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)"
\
- $(patsubst allcheck,check,$@)
+ @. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk -r \
+ $(if @VERBOSE@,,-s) --jobs="$(if \
+
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
+ $(patsubst allcheck,check,$@)
all: build unitcheck
@@ -126,9 +135,9 @@ findunusedcode:
@. ./Env.Host.sh && \
source <(sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) && \
callanalyse \
- $$WORKDIR/LinkTarget/*/* \
- */$$OUTPATH/bin/* \
- */$$OUTPATH/lib/* > unusedcode.all
+ $$WORKDIR/LinkTarget/*/* \
+ */$$OUTPATH/bin/* \
+ */$$OUTPATH/lib/* > unusedcode.all
#because non-c++ symbols could be dlsymed lets make a list of class level
#unused methods which don't require much effort to determine if they need
#to be just removed, or put behind appropiate platform or debug level ifdefs
commit 1c604d14774cdf7f5f0f12de356046156881291a
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Sep 16 19:44:47 2011 +0200
remove -r hint -- we are enabling it ourselves in gbuild.mk
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e704eca..68a9d2d 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -357,8 +357,6 @@ SYNOPSIS
make [ -f makefile ] [ options ] [ variable=value ... ] [ targets ] ...
IMPORTANT OPTIONS
- -r Eliminate use of the built-in implicit rules. Improves performance,
- please use always.
-s Silent operation; do not print the commands as they are executed.
-n Print the commands that would be executed, but do not execute them.
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
