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
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

View File

@@ -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

View File

@@ -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,

View File

@@ -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;

View File

@@ -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:

View File

@@ -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,\