diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-24 14:53:37 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-24 16:52:02 +0200 |
| commit | c51a2542f52f99488f31beb90067586af3075b5b (patch) | |
| tree | 39e606ca56520cbe0d2ad2d83e8d1c86642fdcdb | |
| parent | 87a22d6a2371d8b58f96a6a9cf23c1063ce383d7 (diff) | |
do not deliver libwpg headers
Yes, I am impatient .-)
Change-Id: I3d9c292b0d86bc1dd40a574272a43d8178f3a3b3
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libwpg/ExternalPackage_libwpg.mk | 6 | ||||
| -rw-r--r-- | libwpg/UnpackedTarball_libwpg.mk | 7 |
4 files changed, 12 insertions, 7 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3ce5a4166892..1e45da6dbb55 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1593,6 +1593,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_wpg +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_package,$(1),\ libwpg \ ) diff --git a/configure.ac b/configure.ac index 1307e5ae6d2d..9815977005cc 100644 --- a/configure.ac +++ b/configure.ac @@ -7282,7 +7282,7 @@ libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],["-I${OUTDIR}/inc/external" dnl =================================================================== dnl Check for system libwpg dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpglib"]) +libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2],["-I${WORKDIR}/UnpackedTarball/libwpg/inc"],["-L${OUTDIR}/lib -lwpglib"]) # =================================================================== # Check for system libxslt diff --git a/libwpg/ExternalPackage_libwpg.mk b/libwpg/ExternalPackage_libwpg.mk index 927f2dae9b1f..b804836ba099 100644 --- a/libwpg/ExternalPackage_libwpg.mk +++ b/libwpg/ExternalPackage_libwpg.mk @@ -9,12 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libwpg,libwpg)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpg,inc/external/libwpg,\ - src/lib/libwpg.h \ - src/lib/WPGPaintInterface.h \ - src/lib/WPGraphics.h \ -)) - $(eval $(call gb_ExternalPackage_use_external_project,libwpg,libwpg)) ifeq ($(OS)$(COM),WNTMSC) diff --git a/libwpg/UnpackedTarball_libwpg.mk b/libwpg/UnpackedTarball_libwpg.mk index 03be2064afba..7c76a958eaf5 100644 --- a/libwpg/UnpackedTarball_libwpg.mk +++ b/libwpg/UnpackedTarball_libwpg.mk @@ -11,4 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libwpg)) $(eval $(call gb_UnpackedTarball_set_tarball,libwpg,$(WPG_TARBALL))) +# HACK to avoid the need to deliver the headers to $(OUTDIR). This +# should be removed when libwpg is updated. +$(eval $(call gb_UnpackedTarball_set_post_action,libwpg,\ + mkdir -p inc/libwpg && \ + cp -f src/lib/libwpg.h src/lib/WPGPaintInterface.h src/lib/WPGraphics.h inc/libwpg \ +)) + # vim: set noet sw=4 ts=4: |