diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-11-19 14:25:45 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2013-11-19 11:30:24 -0600 |
| commit | 4eebd65858655eef3f39e40ecbe74c505f6b4688 (patch) | |
| tree | 5eff891d00267b3fcc0a9c87c0bda51593496629 /Makefile.in | |
| parent | cc27264466c372d83d9a37001919ec73f5c221b3 (diff) | |
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@redhat.com>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/Makefile.in b/Makefile.in index 443f7581da13..76d4abffcc81 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) |