diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-28 22:32:40 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-29 11:37:48 +0100 |
| commit | f4fac5eed2b17782f0255127e837cb2f07253d92 (patch) | |
| tree | e25540bc47a2e1d0720245bcd42ef7cf5610db6f | |
| parent | 7c898c933cb5c4baa7315bb5547a1b53cb12ea61 (diff) | |
scp2: move xpdfimport executables to AutoInstall
Change-Id: I9b75436a03c06252530bbd54a7011fb553ceb9be
| -rw-r--r-- | Repository.mk | 7 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/module_pdfimport.scp | 8 |
3 files changed, 7 insertions, 10 deletions
diff --git a/Repository.mk b/Repository.mk index bf32244e4db9..b624d92ab8c0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -102,6 +102,12 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,crashrep, \ )) endif +ifneq ($(ENABLE_PDFIMPORT),) +$(eval $(call gb_Helper_register_executables_for_install,OOO,pdfimport, \ + xpdfimport \ +)) +endif + $(eval $(call gb_Helper_register_executables,OOO, \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \ gnome-open-url.bin \ @@ -119,7 +125,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \ vcldemo \ tiledrendering \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \ - xpdfimport \ $(if $(filter WNT,$(OS)), \ odbcconfig \ python \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 78879ce278fe..1e492e1288b8 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -29,7 +29,7 @@ $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_J $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(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,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(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)) diff --git a/scp2/source/ooo/module_pdfimport.scp b/scp2/source/ooo/module_pdfimport.scp index 320ba857b33b..3c6add511935 100644 --- a/scp2/source/ooo/module_pdfimport.scp +++ b/scp2/source/ooo/module_pdfimport.scp @@ -36,7 +36,6 @@ Module gid_Module_Pdfimport Dirs = (gid_Dir_Share_Xpdfimport); Files = (auto_pdfimport_ALL, gid_File_Dat_XpdfimportErrPdf, - gid_File_Exe_Xpdfimport, gid_File_Xcd_Pdfimport); End @@ -52,13 +51,6 @@ File gid_File_Dat_XpdfimportErrPdf Styles = (PACKED); End -File gid_File_Exe_Xpdfimport - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = EXENAME(xpdfimport); - Styles = (PACKED); -End - File gid_File_Xcd_Pdfimport TXT_FILE_BODY; Dir = gid_Brand_Dir_Share_Registry; |