diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-11 00:41:11 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-11 00:41:11 +0100 |
| commit | 5b33be72e9f870cc040ed56bedb87b4a0c7a0eed (patch) | |
| tree | e7e9a5a90f23e0d7626d29aa938bc3bb1e16a284 | |
| parent | d1c34fdd6b51854af9a0fbe136daaecf0f4e9aa3 (diff) | |
| parent | d1c34fdd6b51854af9a0fbe136daaecf0f4e9aa3 (diff) | |
gnumake2: merging minibranches, updating all module makefiles
| -rw-r--r-- | framework/Makefile | 3 | ||||
| -rw-r--r-- | sfx2/Makefile | 3 | ||||
| -rw-r--r-- | xmloff/Makefile | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/framework/Makefile b/framework/Makefile index 45de5eecabc0..b7391a8db240 100644 --- a/framework/Makefile +++ b/framework/Makefile @@ -30,10 +30,9 @@ $(error No environment set!) endif gb_PARTITIALBUILD := T -include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) # vim: set noet sw=4 ts=4: diff --git a/sfx2/Makefile b/sfx2/Makefile index 45de5eecabc0..b7391a8db240 100644 --- a/sfx2/Makefile +++ b/sfx2/Makefile @@ -30,10 +30,9 @@ $(error No environment set!) endif gb_PARTITIALBUILD := T -include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) # vim: set noet sw=4 ts=4: diff --git a/xmloff/Makefile b/xmloff/Makefile index 45de5eecabc0..b7391a8db240 100644 --- a/xmloff/Makefile +++ b/xmloff/Makefile @@ -30,10 +30,9 @@ $(error No environment set!) endif gb_PARTITIALBUILD := T -include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) # vim: set noet sw=4 ts=4: |