[Libreoffice-commits] core.git: config_host.mk.in configure.ac Makefile.in

[Bjoern Michaelsen]

 Makefile.in       |   29 ++++++++---------------------
 config_host.mk.in |    1 -
 configure.ac      |   11 -----------
 3 files changed, 8 insertions(+), 33 deletions(-)

New commits:
commit 4eebd65858655eef3f39e40ecbe74c505f6b4688
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Nov 19 14:25:45 2013 +0100

    fix Makefile.in
    
    - unify ~all gbuild targets to one gbuild call
    - kill CHECK_PARALLELISM as we dont respect it consistently anyway
    - ${MODULE}.subsequentcheck needs no specialcasing now anymore too
    - should fix e.g. "make unitcheck slowcheck subsequentcheck" calls
    
    Change-Id: I4238d7de599cb9fbaf09f60539d6655b85b87c29
    Reviewed-on: https://gerrit.libreoffice.org/6722
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/Makefile.in b/Makefile.in
index 443f758..76d4abf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-.PHONY : all bootstrap build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip subsequentcheck tags
+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip subsequentcheck tags debugrun help slowcheck translations unitcheck
 
 ifeq ($(MAKECMDGOALS),)
 MAKECMDGOALS:=all
@@ -79,12 +79,9 @@ define gbuild_module_rules
 $(1): bootstrap fetch
 	cd $(SRCDIR)/$(2) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
 
-$(1).build $(1).check $(1).clean $(1).showdeliverables:
+$(1).build $(1).check $(1).clean $(1).showdeliverables $(1).subsequentcheck:
 	cd $(SRCDIR)/$(2) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@)
 
-$(1).subsequentcheck:
-	cd $(SRCDIR)/$(2) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck
-
 $(1).all: bootstrap fetch
 	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if $(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1))
 
@@ -231,23 +228,22 @@ bootstrap: compilerplugins
 #
 # Build
 #
-# Note: if invoked as "make check" this will also run subsequentcheck!
+# Note: this will pipe through all gbuild targets to ... gbuild
+#       with some translations like "build"->"all" for historic reasons
 #
 build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset)
 ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),)
 	mkdir -p $(INSTDIR) && install-gdb-printers -a $(INSTDIR) -c
 endif
 	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \
-		all $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)
+		$(if $(filter build,$(MAKECMDGOALS)),all) \
+		$(if $(filter build-nocheck,$(MAKECMDGOALS)),build) \
+		$(filter all build-l10n-only build-non-l10n-only debugrun help slowcheck translations unitcheck subsequentcheck,$(MAKECMDGOALS))
 ifeq ($(OS),IOS)
 	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
 endif
 
-build-nocheck: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset)
-	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build
-
-build-l10n-only build-non-l10n-only: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset)
-	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
+build-nocheck check debugrun help slowcheck translations unitcheck subsequentcheck : build
 
 cross-toolset: bootstrap fetch
 	$(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools
@@ -384,8 +380,6 @@ findunusedcode:
 findunusedheaders:
 	$(SRCDIR)/bin/find-unusedheaders.pl
 
-# the actual running of subsequentcheck is now done in "build" target => faster
-check: build
 
 dump-deps:
 	@$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild
@@ -393,13 +387,6 @@ dump-deps:
 dump-deps-png:
 	@$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild | dot -Tpng -o lo.png
 
-subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),build)
-	$(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
-
-.PHONY : debugrun help slowcheck translations unitcheck
-debugrun help slowcheck translations unitcheck :
-	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
-
 define GbuildToIdeIntegration
 $(1)-ide-integration:
 	cd $(SRCDIR) && (make cmd -npf Makefile.gbuild all || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1)
diff --git a/config_host.mk.in b/config_host.mk.in
index dc1b454..92c6d51 100755
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -50,7 +50,6 @@ export CC=@CC@
 export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@
 export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
 @x_CFLAGS@ export CFLAGS=@CFLAGS@
-export CHECK_PARALLELISM?=@CHECK_PARALLELISM@
 export CLANGBUILD=@CLANGBUILD@
 export CLANGDIR=@CLANGDIR@
 export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 17aecb5..14fdbfd 100755
--- a/configure.ac
+++ b/configure.ac
@@ -12446,17 +12446,6 @@ fi
 AC_MSG_RESULT([$PARALLELISM])
 AC_SUBST(PARALLELISM)
 
-# ===================================================================
-# Number of parallel jobs to be executed during subsequenttest
-# ===================================================================
-AC_MSG_CHECKING([for maximum no. of jobs during subsequenttest])
-CHECK_PARALLELISM=$PARALLELISM
-if test "$with_check_jobs" != ""; then
-    CHECK_PARALLELISM="$with_check_jobs"
-fi
-AC_MSG_RESULT([$CHECK_PARALLELISM])
-AC_SUBST(CHECK_PARALLELISM)
-
 #
 # Set up ILIB for MSVC build
 #