diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-18 16:57:02 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-18 17:50:39 +0200 |
| commit | 80583d1c6dbca9e3f8fd49588be3d888f9c6083b (patch) | |
| tree | 36f6168ab7762e4af5eda34e524a523a49748997 | |
| parent | 1f2c47cf7d730ffc684d637c74d8a38afcf30aed (diff) | |
scp2: move pdfimport library to AutoInstall
Change-Id: Iac7d30ea181edbc479034e7b6f8eea285d7f6fbb
| -rw-r--r-- | Repository.mk | 5 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/module_pdfimport.scp | 9 |
4 files changed, 10 insertions, 6 deletions
diff --git a/Repository.mk b/Repository.mk index 53d124b700e5..60d86f4c3214 100644 --- a/Repository.mk +++ b/Repository.mk @@ -457,6 +457,10 @@ $(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) \ @@ -629,7 +633,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ OGLTrans \ - pdfimport \ postgresql-sdbc \ postgresql-sdbc-impl \ pythonloader \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 744c6cfa75d3..0e0bf53035b6 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -29,5 +29,6 @@ $(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: diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index f8f5a02fe6dd..0a4b83e481a9 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -13,6 +13,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ ooo \ ooobinarytable \ reportbuilder \ + xpdfimport \ )) $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ diff --git a/scp2/source/ooo/module_pdfimport.scp b/scp2/source/ooo/module_pdfimport.scp index 306ccc35751c..2b81713ab212 100644 --- a/scp2/source/ooo/module_pdfimport.scp +++ b/scp2/source/ooo/module_pdfimport.scp @@ -25,6 +25,8 @@ #include "macros.inc" +#include "AutoInstall/pdfimport" + Module gid_Module_Pdfimport Name = "PDF Import"; Description = "PDF Import"; @@ -32,10 +34,9 @@ Module gid_Module_Pdfimport ParentID = gid_Module_Root_Brand; Styles = (HIDDEN_ROOT); Dirs = (gid_Dir_Share_Xpdfimport); - Files = ( + Files = (auto_pdfimport_ALL, gid_File_Dat_XpdfimportErrPdf, gid_File_Exe_Xpdfimport, - gid_File_Lib_PdfimportUno, gid_File_Xcd_Pdfimport); End @@ -58,9 +59,7 @@ File gid_File_Exe_Xpdfimport Styles = (PACKED); End -STD_LIB_FILE( gid_File_Lib_PdfimportUno, pdfimport ) - -File gid_File_Xcd_Pdfimport +rile gid_File_Xcd_Pdfimport TXT_FILE_BODY; Dir = gid_Brand_Dir_Share_Registry; Name = "pdfimport.xcd"; |