mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scp2: try to move losessioninstall so it does not break WNT build

Browse Source 
Also MSVC does not like libraries that do not have any objects.

Change-Id: I172fe0b61db9de6c7c4975a7b7c7fa63624b1865
This commit is contained in:
Michael Stahl
2012-11-09 20:54:11 +01:00
parent 3bdb950f5e
commit 2154fca1fb
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scp2/source/gnome/file_gnome.scp
View File

@@ -33,6 +33,8 @@ File gid_File_Lib_GIO
Dir = SCP2_OOO_BIN_DIR; Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX)); Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
End End
SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno)
#endif #endif
#ifdef ENABLE_GNOMEVFS #ifdef ENABLE_GNOMEVFS

1
scp2/source/gnome/module_gnome.scp
View File

@@ -55,6 +55,7 @@ Module gid_Module_Optional_Gnome
#endif #endif
#ifdef ENABLE_GIO #ifdef ENABLE_GIO
gid_File_Lib_GIO, gid_File_Lib_GIO,
gid_File_Lib_Losessioninstall,
#endif #endif
#ifdef ENABLE_GCONF #ifdef ENABLE_GCONF
gid_File_Lib_Gconfbe, gid_File_Lib_Gconfbe,

1
scp2/source/ooo/file_library_ooo.scp
View File

@@ -94,7 +94,6 @@ End
#endif #endif
SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno) 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 File gid_File_Lib_Ldapbe2
LIB_FILE_BODY; LIB_FILE_BODY;

4
shell/Library_losessioninstall.mk
View File

@@ -23,8 +23,6 @@ $(eval $(call gb_Library_use_libraries,losessioninstall,\
sal \ sal \
)) ))
ifeq ($(RTL_OS),Linux)
ifeq ($(ENABLE_GIO),TRUE)
$(eval $(call gb_Library_use_externals,losessioninstall,\ $(eval $(call gb_Library_use_externals,losessioninstall,\
dbus \ dbus \
gio \ gio \
@@ -34,7 +32,5 @@ $(eval $(call gb_Library_add_exception_objects,losessioninstall,\
shell/source/sessioninstall/SyncDbusSessionHelper \ shell/source/sessioninstall/SyncDbusSessionHelper \
shell/source/sessioninstall/services \ shell/source/sessioninstall/services \
)) ))
endif
endif
# vim:set shiftwidth=4 softtabstop=4 expandtab: # vim:set shiftwidth=4 softtabstop=4 expandtab:

7
shell/Module_shell.mk
View File

@@ -30,8 +30,15 @@ $(eval $(call gb_Module_Module,shell))
$(eval $(call gb_Module_add_targets,shell,\ $(eval $(call gb_Module_add_targets,shell,\
Library_desktopbe \ Library_desktopbe \
Library_localebe \ Library_localebe \
))
ifeq ($(OS),LINUX)
ifeq ($(ENABLE_GIO),TRUE)
$(eval $(call gb_Module_add_targets,shell,\
Library_losessioninstall \ Library_losessioninstall \
)) ))
endif
endif
ifeq ($(ENABLE_GCONF),TRUE) ifeq ($(ENABLE_GCONF),TRUE)
$(eval $(call gb_Module_add_targets,shell,\ $(eval $(call gb_Module_add_targets,shell,\