diff options
| author | David Tardon <dtardon@redhat.com> | 2014-05-24 14:21:21 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-05-26 18:49:04 +0200 |
| commit | 48c9d7ac7ccdad27067efe0d168e96ff48372631 (patch) | |
| tree | 82b808b8c597046ed507aa6e2badd21090090190 /external/libwpg | |
| parent | 2013d184f1cf5928fa4a919d1521c1ae7b053796 (diff) | |
rebase all import libs
Change-Id: I9e1fc613816c943f4fb1033185e34e3acf317f1d
Diffstat (limited to 'external/libwpg')
| -rw-r--r-- | external/libwpg/ExternalProject_libwpg.mk | 7 | ||||
| -rw-r--r-- | external/libwpg/UnpackedTarball_libwpg.mk | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk index e8fafe709ebd..804a989f4598 100644 --- a/external/libwpg/ExternalProject_libwpg.mk +++ b/external/libwpg/ExternalProject_libwpg.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libwpg,\ )) $(eval $(call gb_ExternalProject_use_externals,libwpg,\ + revenge \ wpd \ )) @@ -27,12 +28,12 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) : --enable-static \ --disable-shared \ --without-docs \ + --disable-tools \ --disable-debug \ --disable-werror \ + $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && (cd $(EXTERNAL_WORKDIR)/src/lib && \ - $(if $(VERBOSE)$(verbose),V=1) \ - $(MAKE)) \ + && $(MAKE) \ ) # vim: set noet sw=4 ts=4: diff --git a/external/libwpg/UnpackedTarball_libwpg.mk b/external/libwpg/UnpackedTarball_libwpg.mk index 7c76a958eaf5..03be2064afba 100644 --- a/external/libwpg/UnpackedTarball_libwpg.mk +++ b/external/libwpg/UnpackedTarball_libwpg.mk @@ -11,11 +11,4 @@ $(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: |