[Libreoffice-commits] .: Branch 'feature/gnumake2' - svl/Makefile svtools/Makefile toolkit/Makefile tools/Makefile

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Fri Jan 7 00:45:41 PST 2011


 svl/Makefile     |    2 +-
 svtools/Makefile |    2 +-
 toolkit/Makefile |    2 +-
 tools/Makefile   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b999843d6b5d747e422d31f71f8e37249b169150
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Dec 20 14:21:34 2010 -0600

    fix Module level Makefile

diff --git a/svl/Makefile b/svl/Makefile
index ff9d4f2..a79aff8 100644
--- a/svl/Makefile
+++ b/svl/Makefile
@@ -33,6 +33,6 @@ gb_PARTIALBUILD := T
 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/svtools/Makefile b/svtools/Makefile
index ff9d4f2..a79aff8 100644
--- a/svtools/Makefile
+++ b/svtools/Makefile
@@ -33,6 +33,6 @@ gb_PARTIALBUILD := T
 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/toolkit/Makefile b/toolkit/Makefile
index ff9d4f2..a79aff8 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -33,6 +33,6 @@ gb_PARTIALBUILD := T
 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/tools/Makefile b/tools/Makefile
index ff9d4f2..a79aff8 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -33,6 +33,6 @@ gb_PARTIALBUILD := T
 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:


More information about the Libreoffice-commits mailing list