diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-29 11:27:45 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-29 11:36:58 +0100 |
| commit | 79e5ee5f6949f4b8645ef32dba61705d02473c60 (patch) | |
| tree | 2042e4b002d19e7d828b838537278ca9f10da629 /postprocess | |
| parent | 053108588dd634838457ba81e7dc70e82aa50e02 (diff) | |
Isolate PDF Import so it can be made optionally installable
...which can be attractive for installation sets that use --with-system-poppler
but do not want the LO core package to depend on a poppler package. See the
comment at the top of scp2/source/ooo/module_pdfimport.scp for details.
The build-time --disable-pdfimport configure switch is gone, PDF Import is built
unconditionally for all platforms but Android and iOS now. (The
ENABLE_PDFIMPORT variable now uses TRUE/FALSE rather than YES/NO, to increase
consistency across those variables.)
Change-Id: I6509d0b2e770b276cd54540408fb1ec5a7dda058
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 2 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index a195b66b8ab0..2758f255e07f 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -302,7 +302,7 @@ my_components += \ my_components += component/extensions/source/plugin/pl .END -.IF "$(ENABLE_PDFIMPORT)" == "YES" +.IF "$(ENABLE_PDFIMPORT)" == "TRUE" my_components += component/sdext/source/pdfimport/pdfimport .END diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 5877fe6f9c63..f353ef29299f 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -342,9 +342,6 @@ MY_FILES_main += \ $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu MY_DRIVERS += hsqldb jdbc .END -.IF "$(ENABLE_PDFIMPORT)" == "YES" -MY_FILES_main += pdfimport/pdf_import_filter.xcu -.END .IF "$(ENABLE_TDEAB)" == "TRUE" MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-tdeab.xcu .END @@ -470,6 +467,16 @@ MY_FILES_ogltrans = \ $(MY_MOD)/org/openoffice/Office/Impress-ogltrans.xcu .END +.IF "$(ENABLE_PDFIMPORT)" == "TRUE" +MY_XCDS += $(MISC)/pdfimport.xcd +MY_OPTDEPS_pdfimport = calc draw impress math writer + # HACK: for all fcfg_X_types.xcu in filter/Configuration_filter.mk that + # include pdf_Portable_Document_Format (i.e., X in calc, draw, global, + # impress, math, web, writer), add optional dependencies on those XCDS that + # include those fcfg_X_types.xcu +MY_FILES_pdfimport = pdfimport/pdf_import_filter.xcu pdfimport/pdf_types.xcu +.END + .IF "$(GUIBASE)" == "WIN" MY_XCDS += $(MISC)/forcedefault.xcd MY_DEPS_forcedefault = main @@ -497,6 +504,8 @@ $(MISC)/%.xcd .ERRREMOVE : $(MISC)/%.list $(MISC)/%.list : makefile.mk - $(RM) $@ echo '<list>' $(foreach,i,$(MY_DEPS_$(@:b)) '<dependency file="$i"/>') \ + $(foreach,i,$(MY_OPTDEPS_$(@:b)) \ + '<dependency file="$i" optional="true"/>') \ $(foreach,i,$(MY_FILES_$(@:b)) '<filename>$i</filename>') '</list>' > $@ $(MISC)/lang/Langpack-{$(alllangiso)}.xcd : $(SOLARXMLDIR)/$(MY_MOD)/$$(@:b).xcu |