[Libreoffice-commits] .: Branch 'feature/gnumake2' - 2 commits - framework/Makefile sfx2/Makefile sfx2/source xmloff/Makefile

[Norbert Thiebaud]

 framework/Makefile                |    2 +-
 sfx2/Makefile                     |    2 +-
 sfx2/source/appl/shutdownicon.cxx |    3 ++-
 xmloff/Makefile                   |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit e4ceef1c8a7720f17b09f42a70cf9f2b34d05e0d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Jan 7 02:17:32 2011 -0600

    missing rtl namespace conflict resolution fixes

diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 5d1858c..5cf4fd2 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -78,6 +78,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::ui::dialogs;
 using ::rtl::OUString;
+using ::rtl::OString;
 using namespace ::sfx2;
 
 #ifdef ENABLE_QUICKSTART_APPLET
@@ -883,7 +884,7 @@ void ShutdownIcon::SetAutostart( bool bActivate )
         getAutostartDir( true );
 
         OUString aPath( RTL_CONSTASCII_USTRINGPARAM("${BRAND_BASE_DIR}/share/xdg/qstart.desktop" ) );
-        Bootstrap::expandMacros( aPath );
+        ::rtl::Bootstrap::expandMacros( aPath );
 
         OUString aDesktopFile;
         ::osl::File::getSystemPathFromFileURL( aPath, aDesktopFile );
commit 6f7518ee0edf7a235c639b486918fb9aa20d3ca7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Dec 20 14:21:33 2010 -0600

    fix Module level Makefile

diff --git a/framework/Makefile b/framework/Makefile
index ff9d4f2..a79aff8 100644
--- a/framework/Makefile
+++ b/framework/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/sfx2/Makefile b/sfx2/Makefile
index ff9d4f2..a79aff8 100644
--- a/sfx2/Makefile
+++ b/sfx2/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/xmloff/Makefile b/xmloff/Makefile
index ff9d4f2..a79aff8 100644
--- a/xmloff/Makefile
+++ b/xmloff/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: