diff options
| -rw-r--r-- | Repository.mk | 34 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/canvas/canvascommons.scp | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 20 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 16 |
5 files changed, 19 insertions, 55 deletions
diff --git a/Repository.mk b/Repository.mk index bb73ddc8d72e..de3bbd508701 100644 --- a/Repository.mk +++ b/Repository.mk @@ -217,24 +217,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif -ifeq ($(DISABLE_SCRIPTING),) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ - basctl \ -)) -endif -ifeq ($(OS),WNT) -ifeq ($(DISABLE_ATL),) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ - emser \ -)) -endif -endif - - $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ + avmedia \ + $(if $(DISABLE_SCRIPTING),,basctl) \ bib \ + canvastools \ chartcore \ chartcontroller \ + cppcanvas \ ctl \ cui \ dba \ @@ -243,7 +233,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ dbtools \ dbaxml \ drawinglayer \ + $(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \ file \ + for \ + forui \ frm \ fwe \ fwi \ @@ -251,9 +244,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ fwm \ lng \ lwpft \ + $(if $(MERGELIBS),merged) \ sdbt \ odbcbase \ t602filter \ + $(if $(ENABLE_TELEPATHY),tubes) \ + unordf \ + unoxml \ wpftwriter \ writerfilter \ )) @@ -270,21 +267,17 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ $(if $(filter $(OS),ANDROID),, \ basebmp \ ) \ - canvastools \ communi \ date \ evtatt \ - forui \ odbc \ oox \ ooxml \ sdbc \ AppleRemote \ - avmedia \ avmediaQuickTime \ basegfx \ calc \ - cppcanvas \ dbp \ dbu \ deploymentmisc \ @@ -305,7 +298,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ filtertracer \ flash \ flat \ - for \ fwk \ graphicfilter \ guesslang \ @@ -330,7 +322,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ lnth \ log \ MacOSXSpell \ - merged \ mork \ mozab2 \ mozabdrv \ @@ -385,9 +376,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ textfd \ tk \ tl \ - tubes \ - unordf \ - unoxml \ updatecheckui \ utl \ uui \ diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 839e88557461..3390f45b75e7 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -55,7 +55,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_OPENGL \ ENABLE_TDE \ ENABLE_TDEAB \ - ENABLE_TELEPATHY \ MERGELIBS \ SYSTEM_APACHE_COMMONS \ SYSTEM_BOOST \ diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp index cd2dc9c2d6ea..f390a9ed550f 100644 --- a/scp2/source/canvas/canvascommons.scp +++ b/scp2/source/canvas/canvascommons.scp @@ -27,8 +27,5 @@ #include "macros.inc" -STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas) -STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools) - SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno) SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index ea3a7d9efb12..edb44674d174 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1118,10 +1118,6 @@ STD_LIB_FILE( gid_File_Lib_Swui, swui) STD_LIB_FILE( gid_File_Lib_Msword, msword ) -#ifdef MERGELIBS -STD_LIB_FILE( gid_File_Lib_Merged, merged ) -#endif - #if ! defined UNX File gid_File_Lib_Sysdtrans LIB_FILE_BODY; @@ -1331,12 +1327,6 @@ File gid_File_Lib_eXslt End #endif - -STD_LIB_FILE( gid_File_Lib_Unoxml, unoxml ) - -// AVMedia -STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia ) - #if defined ENABLE_GSTREAMER SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGStreamer, avmediagst ) #endif @@ -1553,11 +1543,6 @@ File gid_File_Lib_Rdf End #endif // SYSTEM_REDLAND -STD_LIB_FILE(gid_File_Lib_Unordf, unordf) - -STD_LIB_FILE( gid_File_Lib_For, for) -STD_LIB_FILE( gid_File_Lib_Forui, forui) - #if defined(WNT) && defined(HAVE_WINDOWS_SDK) File gid_File_Lib_sellangmsi @@ -1568,8 +1553,3 @@ File gid_File_Lib_sellangmsi End #endif - -#ifdef ENABLE_TELEPATHY -STD_LIB_FILE( gid_File_Lib_Tubes , tubes) -#endif - diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 7b661765af35..3004622e5dce 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -196,8 +196,8 @@ Module gid_Module_Root_Files_4 gid_File_Lib_drawinglayer_auto_installed, gid_File_Lib_Editeng, gid_File_Lib_Flat, - gid_File_Lib_For, - gid_File_Lib_Forui, + gid_File_Lib_for_auto_installed, + gid_File_Lib_forui_auto_installed, gid_File_Lib_frm_auto_installed, gid_File_Lib_fwe_auto_installed, gid_File_Lib_fwi_auto_installed, @@ -226,12 +226,12 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Svl, gid_File_Lib_Svtools, gid_File_Lib_Svx, - gid_File_Lib_AVMedia, + gid_File_Lib_avmedia_auto_installed, gid_File_Lib_AVMediaWin, gid_File_Lib_AVMediaGStreamer, gid_File_Lib_AVMediaGStreamer_0_10, gid_File_Lib_BaseGfx, - gid_File_Lib_Merged, + gid_File_Lib_merged_auto_installed, gid_File_Lib_Sysdtrans, gid_File_Lib_Sw, gid_File_Lib_TextConversionDlgs, @@ -256,8 +256,8 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Vclplug_Kde, gid_File_Lib_Vclplug_Kde4, gid_File_Lib_Vclplug_Svp, - gid_File_Lib_CanvasTools, - gid_File_Lib_CppCanvas, + gid_File_Lib_canvastools_auto_installed, + gid_File_Lib_cppcanvas_auto_installed, gid_File_Lib_fwm_auto_installed, gid_File_Lib_Guesslang); End @@ -336,7 +336,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Srtrs1, gid_File_Lib_Tab, gid_File_Lib_Tab2, - gid_File_Lib_Unoxml, + gid_File_Lib_unoxml_auto_installed, gid_File_Lib_Localebe, gid_File_Lib_Migrationoo2, gid_File_Lib_Migrationoo3, @@ -361,7 +361,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Smime3, gid_File_Lib_Sqlite3, gid_File_Lib_Ssl3, - gid_File_Lib_Unordf, + gid_File_Lib_unordf_auto_installed, gid_File_Lib_Sndfile, gid_File_Lib_Tvhlp1, gid_File_Lib_Ucb1, |