diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-11-10 15:16:14 -0500 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-13 07:29:34 +0000 |
| commit | a6e9bb4c7bad649cb44efaeef67fa18090348c53 (patch) | |
| tree | 9988224bcfa074fd8665d19052fe145800474742 /RepositoryExternal.mk | |
| parent | a2b3ee4abf39e47037fa9adbf44a8742379098f7 (diff) | |
fdo#38878 upgrade xpdf to poppler
Change-Id: Ib908a3acba1faabeb411b4d1459968a362ee8029
Reviewed-on: https://gerrit.libreoffice.org/1036
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 734ed1f1cfd0..93978c850979 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1579,21 +1579,20 @@ endef else # !SYSTEM_POPPLER $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - fofi \ - Goo \ - xpdf \ + poppler \ )) define gb_LinkTarget__use_poppler $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR)/inc/xpdf \ + -I$(call gb_UnpackedTarball_get_dir,poppler) \ + -I$(call gb_UnpackedTarball_get_dir,poppler/poppler) \ $$(INCLUDE) \ ) +$(call gb_LinkTarget_use_package,$(1),poppler) + $(call gb_LinkTarget_use_static_libraries,$(1),\ - fofi \ - Goo \ - xpdf \ + poppler \ ) ifeq ($(OS),MACOSX) |