diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-07-08 14:01:17 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-08 16:25:32 +0000 |
| commit | eb276d11a652601f743d69ada7a38016bd97d73e (patch) | |
| tree | 6cbbf7c8705bf7fd29ab2d3bed373977d657c7e2 /RepositoryExternal.mk | |
| parent | 39f42b0b03489459540404dd218c38709853c021 (diff) | |
fdo#38878: Upgrading internal xpdf -> poppler
Change-Id: I00aafb3fd275e6be3b5d0eb370320e5325110da5
Reviewed-on: https://gerrit.libreoffice.org/4770
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ce9def6130a1..826f51016465 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1898,10 +1898,6 @@ endif # ENABLE_VALGRIND ifeq ($(SYSTEM_POPPLER),YES) define gb_LinkTarget__use_poppler -$(call gb_LinkTarget_add_defs,$(1),\ - -DSYSTEM_POPPLER \ -) - $(call gb_LinkTarget_set_include,$(1),\ $(POPPLER_CFLAGS) \ $$(INCLUDE) \ @@ -1916,19 +1912,19 @@ endef else # !SYSTEM_POPPLER define gb_LinkTarget__use_poppler -$(call gb_LinkTarget_use_package,$(1),xpdf) +$(call gb_LinkTarget_use_package,$(1),poppler) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,xpdf) \ - -I$(call gb_UnpackedTarball_get_dir,xpdf)/xpdf \ - -I$(call gb_UnpackedTarball_get_dir,xpdf)/goo \ + -I$(call gb_UnpackedTarball_get_dir,poppler) \ + -I$(call gb_UnpackedTarball_get_dir,poppler)/poppler \ + -I$(call gb_UnpackedTarball_get_dir,poppler)/goo \ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ fofi \ - Goo \ - xpdf \ + goo \ + poppler \ ) ifeq ($(OS),MACOSX) |