Don't add includes to both CPPFLAGS and CXXFLAGS

diff --git a/configure.ac b/configure.ac
index e2814b5b48c467a8cfdc3379aa2f9762155b42da..8ce433b7f0d64c50c07a726da28e56f1deae2407 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -352,7 +352,6 @@ LDFLAGS="$LDFLAGS $RELRO_LDFLAGS"
 AC_SUBST(LIBS)
 
 AC_SUBST([AM_CPPFLAGS], ['-I$(top_builddir) -I$(top_srcdir)'])
-AC_SUBST([AM_CXXFLAGS], ['-I$(top_builddir) -I$(top_srcdir)'])
 
 export moduledirs moduleobjects modulelibs
 

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 7334fed3fb23dedbf1db29e62fa0e057819a1280..00ca9fce529f4e5733284a7eb0c7776a981118a6 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1,11 +1,11 @@
-AM_CXXFLAGS += -DSYSCONFDIR=\"$(sysconfdir)\" -DPKGLIBDIR=\"$(pkglibdir)\" -DLOCALSTATEDIR=\"$(socketdir)\" $(THREADFLAGS) $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS) -I$(top_srcdir)/pdns/ext/rapidjson/include -I$(top_srcdir)/pdns/ext/yahttp
+AM_CPPFLAGS += $(BOOST_CPPFLAGS) $(THREADFLAGS) -I$(top_srcdir)/pdns/ext/rapidjson/include -I$(top_srcdir)/pdns/ext/yahttp
+AM_CXXFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" -DPKGLIBDIR=\"$(pkglibdir)\" -DLOCALSTATEDIR=\"$(socketdir)\" $(THREADFLAGS) $(LUA_CFLAGS) $(SQLITE3_CFLAGS) $(POLARSSL_CFLAGS)
 
 YAHTTP_LIBS = -Lext/yahttp/yahttp -lyahttp
 
 AM_LFLAGS = -i
 AM_YFLAGS = -d --verbose --debug
 
-AM_CPPFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS)
 if BOTAN110
 AM_CPPFLAGS += $(BOTAN110_CFLAGS)
 endif