solenv/gbuild/extensions/post_BuildplTargets.mk |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit c0d26723ebcbfe81f3d66bc055168d6c584f3d36
Author: Bjoern Michaelsen <[email protected]>
Date:   Tue Nov 29 00:15:45 2011 +0100

    do not loop

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 182c8ae..74ce553 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -35,18 +35,21 @@ gb_FULLDEPS=
 
 clean: clean-host clean-build
 
-subsequentcheck: dev-install
-       @$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ 
gb_PARTIALBUILD=
+subsequentcheck: smoketestoo_native
+       @$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ 
gb_PARTIALBUILD=T
 
-unitcheck: dev-install
-       @$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ 
gb_PARTIALBUILD=
+# instsetoo_native via build.pl already runs unittests
+unitcheck: instsetoo_native
+       @true
 
 all:
 
+gb_MAKETARGET=all
+# if we have only build as target use build instead of all
+ifneq ($(strip $(MAKECMDGOALS)),)
 ifeq ($(filter-out build,$(MAKECMDGOALS)),)
 gb_MAKETARGET=build
-else
-gb_MAKETARGET=all
+endif
 endif
 
 define gb_BuildplTarget_command
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to