Repository.mk | 64 ++++++++++++++++++-------------- scp2/AutoInstall.mk | 6 ++- scp2/InstallModule_base.mk | 5 ++ scp2/InstallModule_impress.mk | 5 ++ scp2/source/base/postgresqlsdbc.scp | 9 +--- scp2/source/impress/module_ogltrans.scp | 7 +-- scp2/source/ooo/file_library_ooo.scp | 14 ------- scp2/source/ooo/module_hidden_ooo.scp | 1 scp2/source/python/file_python.scp | 25 ------------ scp2/source/python/module_python.scp | 11 ----- solenv/gbuild/AutoInstall.mk | 6 +-- 11 files changed, 59 insertions(+), 94 deletions(-)
New commits: commit 8d3fc64066b157d2e24df57635000f121915793a Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 20 20:30:21 2014 +0200 Repository.mk: cluster the mobile-only stuff together Change-Id: I77348fce55db78e437431dd07879b4c26f0be893 diff --git a/Repository.mk b/Repository.mk index c94fff6..10c8f62 100644 --- a/Repository.mk +++ b/Repository.mk @@ -131,6 +131,20 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) +ifneq (,$(filter ANDROID IOS,$(OS))) + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + $(if $(filter $(OS),ANDROID), \ + lo-bootstrap \ + ) \ +)) + +$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ + libotouch \ +)) + +endif + ifeq ($(ENABLE_NPAPI_INTO_BROWSER),TRUE) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ npsoplugin \ @@ -455,14 +469,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \ writerfilter \ )) -ifneq (,$(filter ANDROID IOS,$(OS))) - -$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - libotouch \ -)) - -endif - $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ getuid \ smoketest \ @@ -594,12 +600,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ) \ )) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - $(if $(filter $(OS),ANDROID), \ - lo-bootstrap \ - ) \ -)) - ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \ $(if $(DISABLE_ACTIVEX),,\ commit 140ec1e0dd2bbb574a1d468820131c7f0ecd9704 Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 20 20:24:38 2014 +0200 scp2: move xsec_xmlsec lib to AutoInstall Change-Id: Iff2bb51047d6b8698b65b83ff79a99f6f125b53c diff --git a/Repository.mk b/Repository.mk index 763c5a4..c94fff6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -575,6 +575,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ unopkgapp \ xmlsecurity \ xsec_fw \ + xsec_xmlsec \ xstor \ $(if $(filter $(OS),MACOSX), \ macab1 \ @@ -592,8 +593,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ) \ ) \ )) + $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - xsec_xmlsec \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f756a8b..21b0538 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -92,20 +92,6 @@ End #endif -#if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building -//we need the nss libs for libxmlsec (or if the internal mozilla is enabled) - -File gid_File_Lib_XSec_XmlSec - PACKED_LIB_FILE_BODY; - #ifdef UNX - Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX)); - #else - Name = "xsec_xmlsec.dll"; - #endif -End - -#endif - #if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and // gid_Brand_File_Lib_Msvcr80 diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index e3d2bb7..c4db019 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -152,7 +152,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Neon, gid_Unixlink_File_Lib_Xslt, gid_Unixlink_File_Lib_eXslt, - gid_File_Lib_XSec_XmlSec, gid_File_Lib_I18n, gid_File_Lib_Accessbridge, gid_File_Lib_Dl, commit f01aa96eab0ac6b068cff53ee03c10beff662f2d Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 20 20:15:54 2014 +0200 scp2: move python libraries to AutoInstall Change-Id: Ib89daf3e608fd995845062eae2a7a33149964844 diff --git a/Repository.mk b/Repository.mk index 4c1443a..763c5a4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -428,6 +428,15 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \ pdfimport \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,python, \ + pythonloader \ +)) + +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,python, \ + pyuno \ + $(if $(filter-out WNT,$(OS)),pyuno_wrapper) \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,reportbuilder, \ rpt \ rptui \ @@ -584,8 +593,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ) \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - pyuno \ - pyuno_wrapper \ xsec_xmlsec \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ @@ -640,10 +647,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \ salhelper \ )) -$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - pythonloader \ -)) - $(eval $(call gb_Helper_register_libraries_for_install,UNOVERLIBS,ure, \ cppu \ sal \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 1958e74..1fe02e5 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -23,7 +23,7 @@ $(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1")) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) -$(eval $(call gb_AutoInstall_add_module,python)) +$(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE)) diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 43a8316..b2595ce 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -34,21 +34,6 @@ File gid_File_pyuno_python_scripts Styles = (FILELIST, PACKED); End -File gid_File_Lib_Pyuno - PACKED_LIB_FILE_BODY; - #ifdef UNX - Name = STRING(CONCAT2(libpyuno,UNXSUFFIX)); - #else - #ifdef MSVC_PKG_DEBUG_RUNTIME - Name = "pyuno_d.pyd"; - #else - Name = "pyuno.pyd"; - #endif // MSVC_PKG_DEBUG_RUNTIME - #endif -End - -STD_LIB_FILE( gid_File_Lib_Pythonloader, pythonloader ) - File gid_File_Pyuno_Rdb TXT_FILE_BODY; Dir = gid_Brand_Dir_Program_Services; @@ -109,16 +94,6 @@ File gid_File_Share_Registry_Pyuno_Xcd Name = "pyuno.xcd"; End -#ifdef UNX - -// pyuno.so even on Mac OS X, because it is a python module -File gid_File_Pyuno - PACKED_LIB_FILE_BODY; - Name = "pyuno.so"; -End - -#endif - #ifdef MINGW_SYSTEM_PYTHON // python_wrapper.exe diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index a4a152a..d9cf73c 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -38,17 +38,8 @@ Module gid_Module_Pyuno gid_Dir_Py_PythonCore, gid_Dir_Py_PythonCore_Bin, gid_Dir_Py_PythonCore_Lib); -/* right now auto_python_ALL just seems to contain the python core, which we don't need - with system-python - and if this is empty the next one (gid_File_Pyuno) apparently doesn't - correctly end up here. */ - Files = ( -#ifndef SYSTEM_PYTHON - auto_python_ALL, -#endif - gid_File_Pyuno, + Files = (auto_python_ALL, gid_File_Pyuno_Rdb, - gid_File_Lib_Pyuno, - gid_File_Lib_Pythonloader, gid_File_Py_Bin_Python, gid_File_Py_Python_Core, gid_File_Py_Python_Bin, commit 5ac6c4818aa533746c84c1a42fb07b82bc7ec713 Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 20 20:04:15 2014 +0200 scp2: move postgresqlsdbc libraries to AutoInstall Change-Id: Ia96e85191d877ebfd7621f7aa572f29e6482716c diff --git a/Repository.mk b/Repository.mk index ddf9a96..4c1443a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -419,6 +419,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ ) \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,postgresqlsdbc, \ + postgresql-sdbc \ + postgresql-sdbc-impl \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \ pdfimport \ )) @@ -636,8 +641,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - postgresql-sdbc \ - postgresql-sdbc-impl \ pythonloader \ )) diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index f40e0a4..1958e74 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -24,6 +24,7 @@ $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCOND $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,python)) +$(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE)) diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk index ca85bf5..84942d7 100644 --- a/scp2/InstallModule_base.mk +++ b/scp2/InstallModule_base.mk @@ -9,7 +9,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base)) -$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,base)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,\ + base \ + postgresqlsdbc \ +)) $(eval $(call gb_InstallModule_define_if_set,scp2/base,\ ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp index d27cf43..ba6d094 100644 --- a/scp2/source/base/postgresqlsdbc.scp +++ b/scp2/source/base/postgresqlsdbc.scp @@ -9,14 +9,15 @@ #include "macros.inc" +#include "AutoInstall/postgresqlsdbc" + #if defined WITH_POSTGRESQL_SDBC Module gid_Module_Optional_PostgresqlSdbc PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_POSTGRESQLSDBC); ParentID = gid_Module_Prg_Base_Bin; - Files = (gid_File_Lib_PostgresqlSdbc, - gid_File_Lib_PostgresqlSdbcImpl, + Files = (auto_postgresqlsdbc_ALL, gid_File_PostgresqlSdbc_Ini, gid_File_PostgresqlSdbc_Rdb, gid_File_PostgresqlSdbc_Xcd); @@ -25,10 +26,6 @@ Module gid_Module_Optional_PostgresqlSdbc Styles = (); End -STD_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc) - -STD_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl) - File gid_File_PostgresqlSdbc_Ini TXT_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index 60e628f..4b8b59f 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -12,7 +12,7 @@ define gb_AutoInstall__make_define echo "#define auto_$*_ALL \ " >> $@ $(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo " $(subst .,_,$(subst -,_,$(binary))), \ " >> $@;) -echo " $(lastword $(1))" >> $@; +echo " $(subst .,_,$(subst -,_,$(lastword $(1))))" >> $@; echo "" >> $@ endef @@ -26,7 +26,7 @@ $(file >>$@,\ endef define gb_AutoInstall__gen_lib -$(SCP2LIBTEMPLATE)(auto_$*_lib_$(1),$(call gb_Library_get_runtime_filename,$(1))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION))) +$(SCP2LIBTEMPLATE)(auto_$*_lib_$(subst .,_,$(subst -,_,$(1))),$(call gb_Library_get_runtime_filename,$(1))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION))) endef @@ -46,7 +46,7 @@ ifeq ($(HAVE_GNUMAKE_FILE_FUNC),) $(foreach jar,$(gb_Jar_MODULE_$*),auto_$*_jar_$(jar)) \ $(foreach pkg,$(gb_Package_MODULE_$*),auto_$*_pkg_$(pkg))) $(foreach lib,$(gb_Library_MODULE_$*),\ - echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;) + echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(subst .,_,$(subst -,_,$(lib))),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;) else $(file >$@,/* autogenerated installs for group $* */) $(call gb_AutoInstall__gen_define,\ commit 53fd7e8690fa5c545da674d562da7ea8f2b686c0 Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 20 19:55:40 2014 +0200 scp2: move OGLTrans library to AutoInstall Change-Id: I5140f4053fbb1add4bc0b1b8cb6cd9772f3ffa28 diff --git a/Repository.mk b/Repository.mk index 835b0b3..ddf9a96 100644 --- a/Repository.mk +++ b/Repository.mk @@ -224,6 +224,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \ smd \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ogltrans, \ + OGLTrans \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ acc \ $(call gb_Helper_optional,AVMEDIA,avmedia) \ @@ -632,7 +636,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - OGLTrans \ postgresql-sdbc \ postgresql-sdbc-impl \ pythonloader \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 58e155c..f40e0a4 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -19,6 +19,7 @@ $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1")) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk index eb1d084..cb88b93 100644 --- a/scp2/InstallModule_impress.mk +++ b/scp2/InstallModule_impress.mk @@ -9,7 +9,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/impress)) -$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,impress)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,\ + impress \ + ogltrans \ +)) $(eval $(call gb_InstallModule_define_if_set,scp2/impress,\ ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp index 49675cd..40fc17b 100644 --- a/scp2/source/impress/module_ogltrans.scp +++ b/scp2/source/impress/module_ogltrans.scp @@ -18,18 +18,17 @@ #include "macros.inc" +#include "AutoInstall/ogltrans" + Module gid_Module_Optional_OGLTrans PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_OGLTRANS); ParentID = gid_Module_Optional; - Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Share_Registry_Ogltrans_Xcd ); + Files = ( auto_ogltrans_ALL, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Share_Registry_Ogltrans_Xcd ); Minimal = NO; Default = NO; End - -STD_LIB_FILE(gid_File_Lib_OpenGLTransitions, OGLTrans) - File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml TXT_FILE_BODY; Styles = (FILELIST,PACKED); commit 31d3a4d96fbe4fa22dd873e36e5f415dbf45960e Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 20 19:51:50 2014 +0200 scp2: damnit, did i really push this utter garbage? Change-Id: I262456efc52c74aeeda1c55b24a69c4c628a26d8 diff --git a/Repository.mk b/Repository.mk index 60d86f4..835b0b3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -415,6 +415,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ ) \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \ + pdfimport \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,reportbuilder, \ rpt \ rptui \ @@ -457,10 +461,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ unowinreg \ )) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,reportbuilder, \ - pdfimport \ -)) - $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ affine_uno_uno \ $(if $(filter MSC,$(COM)),cli_uno) \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 0e0bf53..58e155c 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -23,12 +23,12 @@ $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCOND $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,python)) +$(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstall_add_module,xpdfimport,LIBO_LIB_FILE)) # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits