diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-09 20:54:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-09 20:54:11 +0100 |
| commit | 2154fca1fb30dc4b26cac8a98c27d51c78ff6a8f (patch) | |
| tree | a2a90291e0dc8c4a751d207675aeda8c2e865ec4 | |
| parent | 3bdb950f5edac0cdb09318cea307b4342a0fd714 (diff) | |
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
| -rw-r--r-- | scp2/source/gnome/file_gnome.scp | 2 | ||||
| -rw-r--r-- | scp2/source/gnome/module_gnome.scp | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 1 | ||||
| -rw-r--r-- | shell/Library_losessioninstall.mk | 4 | ||||
| -rw-r--r-- | shell/Module_shell.mk | 7 |
5 files changed, 10 insertions, 5 deletions
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 27968b546fc6..9672965b589b 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 80ec3f7a2143..3a2604d09590 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 27c5b2b9d9d5..d3c08f3dc921 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 ebd98af264bd..65dee35586e6 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 50687acc4e4c..3726c4fa1c1a 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,\ |