diff options
| -rw-r--r-- | Module_ooo.mk | 4 | ||||
| -rwxr-xr-x | solenv/gbuild/module.mk | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Module_ooo.mk b/Module_ooo.mk index 4814d34e01d8..2ff66415c558 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Module_Module,ooo)) -$(eval $(call gb_Module_add_targets,ooo,$(foreach module,\ +$(eval $(call gb_Module_add_moduledirs,ooo,\ framework \ sfx2 \ svl \ @@ -36,6 +36,6 @@ $(eval $(call gb_Module_add_targets,ooo,$(foreach module,\ sw \ toolkit \ tools \ -,$(module)/Module_$(module)))) +)) # vim: set noet ts=4 sw=4: diff --git a/solenv/gbuild/module.mk b/solenv/gbuild/module.mk index eaa8d8527b46..df3ad699472f 100755 --- a/solenv/gbuild/module.mk +++ b/solenv/gbuild/module.mk @@ -64,10 +64,18 @@ gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTA endef +define gb_Module_add_moduledir +$(call gb_Module_add_target,$(1),$(2)/Module_$(2)) +endef + define gb_Module_add_targets $(foreach target,$(2),$(call gb_Module_add_target,$(1),$(target))) endef +define gb_Module_add_moduledirs +$(foreach target,$(2),$(call gb_Module_add_moduledir,$(1),$(target))) +endef + define gb_Module_make_global_targets gb_Module_CURRENTMODULELOCATION := $$(dir $$(realpath $$(firstword $(MAKEFILE_LIST)))) ifneq ($(1),) |