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/libwpd | |
| 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/libwpd')
| -rw-r--r-- | external/libwpd/ExternalProject_libwpd.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk index 4d65938d403b..88b771580d80 100644 --- a/external/libwpd/ExternalProject_libwpd.mk +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -15,20 +15,25 @@ $(eval $(call gb_ExternalProject_register_targets,libwpd,\ build \ )) +$(eval $(call gb_ExternalProject_use_externals,libwpd,\ + revenge \ +)) + $(call gb_ExternalProject_get_state_target,libwpd,build) : $(call gb_ExternalProject_run,build,\ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \ - ./configure \ + export PKG_CONFIG="" \ + && ./configure \ --with-pic \ --enable-static \ --disable-shared \ - --without-stream \ --without-docs \ + --disable-tools \ --disable-debug \ $(if $(filter MACOSX,$(OS)),--disable-werror) \ + $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && $(if $(VERBOSE)$(verbose),V=1) \ - $(MAKE) \ + && $(MAKE) \ ) # vim: set noet sw=4 ts=4: |