diff options
| author | Peter Foley <pefoley2@pefoley.com> | 2014-09-08 14:52:03 -0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-09-09 08:36:03 +0000 |
| commit | 7abf6861f96052de3b04424ba64b4ee07de35348 (patch) | |
| tree | dc0c245aaef3670873361b239b6cb77139af886d | |
| parent | 5390946c8651bfae8b88e2e9f2a286bcd5fbdf3b (diff) | |
Fix help and showmodules build targets
Change-Id: I096798159f4d3d59306be1b3843de1daca280f7a
Reviewed-on: https://gerrit.libreoffice.org/11342
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.help.txt | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 73da08811516..94d99457b0f6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,13 +9,13 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck -.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 tags debugrun help translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) +.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 tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) MAKECMDGOALS?=all build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\ $(if $(filter build-nocheck,$(MAKECMDGOALS)),build)\ $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)\ - $(filter all build-l10n-only build-non-l10n-only debugrun help translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo,$(MAKECMDGOALS)) + $(filter all build-l10n-only build-non-l10n-only debugrun help showmodules translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo,$(MAKECMDGOALS)) SHELL := @SHELL_BASH@ SRCDIR := @SRC_ROOT@ @@ -29,7 +29,7 @@ GIT_BUILD := $(if $(wildcard $(SRCDIR)/.git),T) # think packagers would ever want that. I certainly do not.) # 2. if we are making help, clean or distclean, because they do not # need updated configuration -ifeq (,$(MAKE_RESTARTS)$(if $(GIT_BUILD),,T)$(if $(filter-out help clean distclean,$(MAKECMDGOALS)),,T)) +ifeq (,$(MAKE_RESTARTS)$(if $(GIT_BUILD),,T)$(if $(filter-out help showmodules clean distclean,$(MAKECMDGOALS)),,T)) .PHONY : force-restart Makefile: $(BUILDDIR)/config_host.mk force-restart @@ -235,7 +235,10 @@ ifeq ($(OS),IOS) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios endif -build-non-l10n-only build-l10n-only build-nocheck check debugrun help translations packageinfo $(gb_Top_MODULE_CHECK_TARGETS): build +build-non-l10n-only build-l10n-only build-nocheck check debugrun translations packageinfo $(gb_Top_MODULE_CHECK_TARGETS): build + +help showmodules: + $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ cross-toolset: bootstrap fetch $(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt index 4831e719a36f..986c91065e51 100644 --- a/solenv/gbuild/gbuild.help.txt +++ b/solenv/gbuild/gbuild.help.txt @@ -39,6 +39,7 @@ AVAILABLE TARGETS against it dump-deps-png creates dependency diagrams in PNG format NOTE: needs graphviz to work + showmodules shows all registered modules <module> build the named module <module>.check run unittests of the named module <module>.clean clean the named module |