From e355e54f2fddcf3146f33c9690e580e6b77aacef Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 27 May 2016 15:21:50 +0200 Subject: configure: set BOOST_CPPFLAGS also in --without-system-boost case Simplify the makefiles. Change-Id: Ia695961e936e4a1ffdaff73eb56adc3c3905ed0c --- external/libebook/ExternalProject_libebook.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'external/libebook/ExternalProject_libebook.mk') diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index 5ef585ac9733..45b15f2f5eb7 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) : $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ --disable-werror \ --disable-weffc \ - CXXFLAGS="$(CXXFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ + CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS) \ -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ XML_CFLAGS="$(LIBXML_CFLAGS)" \ XML_LIBS="$(LIBXML_LIBS)" \ -- cgit