diff options
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 20 |
2 files changed, 4 insertions, 18 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 98736fc41bfb..721eb9d0190c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -986,7 +986,7 @@ endef ifneq ($(OS),ANDROID) ifeq ($(COM),MSC) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ raptor2 \ rasqal \ rdf \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f9aa5c46816c..c90e28ab8132 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -275,23 +275,7 @@ File gid_File_Lib_Xslt LIB_FILE_BODY; Styles = (FILELIST); Dir = FILELIST_DIR; - Name = "libxslt.filelist"; -End -File gid_File_Lib_eXslt - PACKED_LIB_FILE_BODY; - #ifdef UNX - #ifdef MACOSX - Name = STRING(CONCAT4(libexslt,.,0,UNXSUFFIX)); - #else - Name = STRING(CONCAT4(libexslt,UNXSUFFIX,.,0)); - #endif - #else - #ifdef _gcc3 - Name = "libexslt-0.dll"; - #else - Name = "libexslt.dll"; - #endif - #endif + Name = "xslt.filelist"; End #endif @@ -369,6 +353,7 @@ End #endif #ifndef SYSTEM_REDLAND +#ifndef WNT File gid_File_Lib_Raptor LIB_FILE_BODY; Styles = (FILELIST); @@ -389,5 +374,6 @@ File gid_File_Lib_Rdf Dir = FILELIST_DIR; Name = "redland.filelist"; End +#endif // WNT #endif // SYSTEM_REDLAND |