summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-07-20 19:51:50 +0200
committerMichael Stahl <mstahl@redhat.com>2014-07-20 20:59:16 +0200
commit31d3a4d96fbe4fa22dd873e36e5f415dbf45960e (patch)
treef3590debaefdd14a321dc871290cf00730fe7871
parent6ca69fc429c45890f23e622b3591b81074d3d9ba (diff)
scp2: damnit, did i really push this utter garbage?
Change-Id: I262456efc52c74aeeda1c55b24a69c4c628a26d8
-rw-r--r--Repository.mk8
-rw-r--r--scp2/AutoInstall.mk2
2 files changed, 5 insertions, 5 deletions
diff --git a/Repository.mk b/Repository.mk
index 60d86f4c3214..835b0b31190b 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 0e0bf53035b6..58e155c4cee4 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: