diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-02-27 11:32:18 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-02-27 11:32:18 +0100 |
commit | 823ef20035b82a9ec5f9e1006877670f7ee64750 (patch) | |
tree | 888e86526efda98b990621349b5eee7b8f9d19d3 | |
parent | 307c8cdd59bb46d66ba6902fe616d5cc19463c39 (diff) |
Clean up deliver, showdeliverables, showmodules targets
- deliver was only relevant for dmake
- showdeliverables works only per-module
- "'showmodules' is now pointless, it was used to identify modules from
tail_build"
[<http://lists.freedesktop.org/archives/libreoffice/2013-February/046510.html>
"Re: Show module dependencies"]
Change-Id: I400ec5bed4397a12ce4c5b604253c74ef7de0ce7
-rw-r--r-- | Makefile.in | 7 | ||||
-rw-r--r-- | solenv/gbuild/gbuild.help.txt | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 287fff484c4d..ba2dfc004429 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,7 +77,7 @@ $(if $(filter $(gbuild_modules),$(dmake_modules)),$(eval $(call gb_Output_warn,T export gb_TAILBUILDTARGET=all slowcheck define gbuild_module_rules -.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver +.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).showdeliverables $(1).subsequentcheck $(1): bootstrap fetch cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) @@ -91,15 +91,12 @@ $(1).all: bootstrap fetch ) \ $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) -$(1).build $(1).check $(1).clean: +$(1).build $(1).check $(1).clean $(1).showdeliverables: cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) $(1).subsequentcheck: cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck -$(1).deliver: - @true - endef define gbuild_modules_rules diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt index aeaf16dccc16..43076d6ea038 100644 --- a/solenv/gbuild/gbuild.help.txt +++ b/solenv/gbuild/gbuild.help.txt @@ -34,15 +34,14 @@ AVAILABLE TARGETS subsequentcheck run system tests (requires full installation) check run unit tests and if in toplevel subsequentcheck clean remove all generated files - showdeliverables show the targets delivered to OUTDIR and their source - showmodules show the modules that would be loaded debugrun starts the dev-install instance and allows tests to be run against it <module> build the named module <module>.check run unittests of the named module <module>.clean clean the named module <module>.all build the named module and the pre-requisite modules for it - <module>.deliver for dmake modules only, deliver the named module + <module>.showdeliverables show the targets delivered to OUTDIR and their + source cmd execute the command contained in the variable cmd="" in a shell with config_host.mk or config_build.mk environement set. (see gb_SIDE) |