[Libreoffice-commits] .: scp2/source shell/Library_losessioninstall.mk shell/Module_shell.mk

[Libreoffice Gerrit user]

 scp2/source/gnome/file_gnome.scp     |    2 ++
 scp2/source/gnome/module_gnome.scp   |    1 +
 scp2/source/ooo/file_library_ooo.scp |    1 -
 shell/Library_losessioninstall.mk    |    4 ----
 shell/Module_shell.mk                |    7 +++++++
 5 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 2154fca1fb30dc4b26cac8a98c27d51c78ff6a8f
Author: Michael Stahl <mst...@redhat.com>
Date:   Fri Nov 9 20:54:11 2012 +0100

    scp2: try to move losessioninstall so it does not break WNT build
    
    Also MSVC does not like libraries that do not have any objects.
    
    Change-Id: I172fe0b61db9de6c7c4975a7b7c7fa63624b1865

diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index 27968b5..9672965 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -33,6 +33,8 @@ File gid_File_Lib_GIO
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
 End
+
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno)
 #endif
 
 #ifdef ENABLE_GNOMEVFS
diff --git a/scp2/source/gnome/module_gnome.scp 
b/scp2/source/gnome/module_gnome.scp
index 80ec3f7..3a2604d 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -55,6 +55,7 @@ Module gid_Module_Optional_Gnome
 #endif
 #ifdef ENABLE_GIO
       gid_File_Lib_GIO,
+      gid_File_Lib_Losessioninstall,
 #endif
 #ifdef ENABLE_GCONF
       gid_File_Lib_Gconfbe,
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 27c5b2b..d3c08f3 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -94,7 +94,6 @@ End
 #endif
 
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno 
)
 
 File gid_File_Lib_Ldapbe2
     LIB_FILE_BODY;
diff --git a/shell/Library_losessioninstall.mk 
b/shell/Library_losessioninstall.mk
index ebd98af..65dee35 100644
--- a/shell/Library_losessioninstall.mk
+++ b/shell/Library_losessioninstall.mk
@@ -23,8 +23,6 @@ $(eval $(call gb_Library_use_libraries,losessioninstall,\
        sal \
 ))
 
-ifeq ($(RTL_OS),Linux)
-ifeq ($(ENABLE_GIO),TRUE)
 $(eval $(call gb_Library_use_externals,losessioninstall,\
     dbus \
     gio \
@@ -34,7 +32,5 @@ $(eval $(call 
gb_Library_add_exception_objects,losessioninstall,\
        shell/source/sessioninstall/SyncDbusSessionHelper \
        shell/source/sessioninstall/services \
 ))
-endif
-endif
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 50687ac..3726c4f 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -30,8 +30,15 @@ $(eval $(call gb_Module_Module,shell))
 $(eval $(call gb_Module_add_targets,shell,\
        Library_desktopbe \
        Library_localebe \
+))
+
+ifeq ($(OS),LINUX)
+ifeq ($(ENABLE_GIO),TRUE)
+$(eval $(call gb_Module_add_targets,shell,\
        Library_losessioninstall \
 ))
+endif
+endif
 
 ifeq ($(ENABLE_GCONF),TRUE)
 $(eval $(call gb_Module_add_targets,shell,\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits