diff options
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 25 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 3 |
3 files changed, 6 insertions, 28 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a4daea749060..89582867c409 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1144,6 +1144,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ rasqal \ rdf \ )) +else +$(eval $(call gb_Helper_register_packages_for_install,ooo, \ + raptor \ + rasqal \ + redland \ +)) endif define gb_LinkTarget__use_librdf diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5aace430d2ac..7c6aa29aa04c 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -274,28 +274,3 @@ File gid_File_Moz_Msvc80crt_Manifest End #endif -#ifndef SYSTEM_REDLAND -#ifndef WNT -File gid_File_Lib_Raptor - LIB_FILE_BODY; - Styles = (FILELIST); - Dir = FILELIST_DIR; - Name = "raptor.filelist"; -End - -File gid_File_Lib_Rasqal - LIB_FILE_BODY; - Styles = (FILELIST); - Dir = FILELIST_DIR; - Name = "rasqal.filelist"; -End - -File gid_File_Lib_Rdf - LIB_FILE_BODY; - Styles = (FILELIST); - Dir = FILELIST_DIR; - Name = "redland.filelist"; -End -#endif // WNT -#endif // SYSTEM_REDLAND - diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 0daac7fc4df3..9d6c5952cc5d 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -164,11 +164,8 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Recentfile, gid_File_Lib_Tab, gid_File_Lib_Tab2, - gid_File_Lib_Raptor, gid_Unixlink_File_Lib_Raptor, - gid_File_Lib_Rasqal, gid_Unixlink_File_Lib_Rasqal, - gid_File_Lib_Rdf, gid_Unixlink_File_Lib_Rdf, gid_File_Lib_Freebl3, gid_File_Lib_Nss3, |