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/libebook/ExternalProject_libebook.mk | |
| parent | 2013d184f1cf5928fa4a919d1521c1ae7b053796 (diff) | |
rebase all import libs
Change-Id: I9e1fc613816c943f4fb1033185e34e3acf317f1d
Diffstat (limited to 'external/libebook/ExternalProject_libebook.mk')
| -rw-r--r-- | external/libebook/ExternalProject_libebook.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index b4e2bd6a8378..785aeb714f14 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -19,10 +19,11 @@ $(eval $(call gb_ExternalProject_use_externals,libebook,\ boost_headers \ icu \ libxml2 \ - wpd \ + revenge \ zlib \ )) +# TODO: remove the generators/stream empty vars on libe-book update $(call gb_ExternalProject_get_state_target,libebook,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ @@ -31,15 +32,18 @@ $(call gb_ExternalProject_get_state_target,libebook,build) : --enable-static \ --disable-shared \ --without-docs \ + --without-tools \ + --disable-tests \ $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \ + $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ --disable-werror \ --disable-weffc \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \ XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \ XML_LIBS="$(LIBXML_LIBS)" \ + REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && cd src/lib \ - && $(MAKE) $(if $(VERBOSE)$(verbose),V=1) \ + && $(MAKE) \ ) # vim: set noet sw=4 ts=4: |