Kaydet (Commit) 2154fca1 authored tarafından Michael Stahl's avatar Michael Stahl

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
üst 3bdb950f
...@@ -33,6 +33,8 @@ File gid_File_Lib_GIO ...@@ -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
......
...@@ -55,6 +55,7 @@ Module gid_Module_Optional_Gnome ...@@ -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,
......
...@@ -94,7 +94,6 @@ End ...@@ -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;
......
...@@ -23,8 +23,6 @@ $(eval $(call gb_Library_use_libraries,losessioninstall,\ ...@@ -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,\ ...@@ -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:
...@@ -30,8 +30,15 @@ $(eval $(call gb_Module_Module,shell)) ...@@ -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,\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment