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/libcdr | |
parent | coverity#1158084 Unchecked dynamic_cast (diff) | |
download | core-48c9d7ac7ccdad27067efe0d168e96ff48372631.tar.gz core-48c9d7ac7ccdad27067efe0d168e96ff48372631.zip |
rebase all import libs
Change-Id: I9e1fc613816c943f4fb1033185e34e3acf317f1d
Diffstat (limited to 'external/libcdr')
-rw-r--r-- | external/libcdr/ExternalProject_libcdr.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk index d96b0b227ed2..174de182ad60 100644 --- a/external/libcdr/ExternalProject_libcdr.mk +++ b/external/libcdr/ExternalProject_libcdr.mk @@ -19,8 +19,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\ boost_headers \ icu \ lcms2 \ - wpd \ - wpg \ + revenge \ zlib \ )) @@ -32,14 +31,14 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : --enable-static \ --disable-shared \ --without-docs \ + --disable-tools \ --disable-debug \ --disable-werror \ --disable-weffc \ + $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \ $(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: |