diff options
| -rw-r--r-- | Makefile.in | 43 | ||||
| -rw-r--r-- | solenv/gbuild/Module.mk | 1 |
2 files changed, 37 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 208f6197cf88..eb67dad50720 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,13 +84,42 @@ endef $(eval $(call gbuild_modules_rules,$(filter-out Module%,$(subst /, ,$(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/*/Module_*.mk)))))) -# run a JunitTest - relies on naming convention (module prefix) -$(WORKDIR)/JunitTest/%/done : - cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@ - -# run a CppunitTest - relies on naming convention (module prefix) -$(WORKDIR)/CppunitTest/%.test : - cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@ +gbuild_TARGETS := AllLangHelp \ + AllLangResTarget \ + AllLangZip \ + AutoInstallLibs \ + CliLibrary \ + CliNativeLibrary \ + CliUnoApiTarget \ + Configuration \ + CppunitTest \ + CustomTarget \ + Dictionary \ + Executable \ + Extension \ + ExternalPackage \ + ExternalProject \ + InstallModule \ + InstallScript \ + InternalUnoApi \ + Jar \ + JunitTest \ + Library \ + Module \ + Package \ + Pagein \ + Pyuno \ + Rdb \ + StaticLibrary \ + UI \ + UnoApi \ + UnoApiMerge \ + UnpackedTarball \ + WinResTarget \ + Zip +# build a generic gbuild target +$(foreach target,$(gbuild_TARGETS),$(target)_%): + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build $@ # # Clean diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 926aeae8996f..0e694e5f6173 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -164,6 +164,7 @@ gb_Module_SUBSEQUENTCHECKTARGETSTACK := $(call gb_Module_get_subsequentcheck_tar gb_Module_CLEANTARGETSTACK := $(call gb_Module_get_clean_target,$(1)) $(gb_Module_CLEANTARGETSTACK) gb_Module_CURRENTMODULE_DEBUG_ENABLED := $(call gb_Module__debug_enabled,$(1)) gb_Module_CURRENTMODULE_NAME := $(1) +$(call gb_Helper_make_userfriendly_targets,$(1),Module) endef |