From 59f5264b7926fa9b7375f1d8d06c444109a99cbc Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Tue, 22 Jul 2014 18:03:29 +0200 Subject: [PATCH] Replace autoconf variables with make variables This has the nice advantage that you can override those variables at make time instead of configure time. --- modules/bindbackend/Makefile.am | 2 +- modules/db2backend/Makefile.am | 2 +- modules/geobackend/Makefile.am | 2 +- modules/gmysqlbackend/Makefile.am | 2 +- modules/goraclebackend/Makefile.am | 2 +- modules/gpgsqlbackend/Makefile.am | 8 +++--- modules/gsqlite3backend/Makefile.am | 2 +- modules/ldapbackend/Makefile.am | 4 +-- modules/lmdbbackend/Makefile.am | 4 +-- modules/luabackend/Makefile.am | 4 +-- modules/mydnsbackend/Makefile.am | 4 +-- modules/opendbxbackend/Makefile.am | 4 +-- modules/oraclebackend/Makefile.am | 2 +- modules/pipebackend/Makefile.am | 2 +- modules/randombackend/Makefile.am | 2 +- modules/remotebackend/Makefile.am | 42 ++++++++++++++--------------- modules/tinydnsbackend/Makefile.am | 4 +-- pdns/Makefile.am | 32 +++++++++++----------- pdns/ext/yahttp/yahttp/Makefile.am | 2 +- 19 files changed, 63 insertions(+), 63 deletions(-) diff --git a/modules/bindbackend/Makefile.am b/modules/bindbackend/Makefile.am index 6cf2e5ef01..2878c858f3 100644 --- a/modules/bindbackend/Makefile.am +++ b/modules/bindbackend/Makefile.am @@ -1,5 +1,5 @@ pkglib_LTLIBRARIES = libbindbackend.la -AM_CPPFLAGS=-I../../pdns $(BOOST_CPPFLAGS) $(POLARSSL_CFLAGS) @THREADFLAGS@ +AM_CPPFLAGS=-I../../pdns $(BOOST_CPPFLAGS) $(POLARSSL_CFLAGS) $(THREADFLAGS) AM_LFLAGS = -i AM_YFLAGS = -d --verbose --debug diff --git a/modules/db2backend/Makefile.am b/modules/db2backend/Makefile.am index db27bc0368..b44286ef12 100644 --- a/modules/db2backend/Makefile.am +++ b/modules/db2backend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = libdb2backend.la libdb2backend_la_SOURCES=DB2Backend.cc DB2Backend.hh DB2Exception.cc DB2Exception.hh diff --git a/modules/geobackend/Makefile.am b/modules/geobackend/Makefile.am index 4fd6311315..7b447b842c 100644 --- a/modules/geobackend/Makefile.am +++ b/modules/geobackend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS) EXTRA_DIST=OBJECTFILES OBJECTLIBS pkglib_LTLIBRARIES = libgeobackend.la libgeobackend_la_SOURCES=geobackend.cc geobackend.hh ippreftree.cc ippreftree.hh diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am index 5d53beccef..46d1d324eb 100644 --- a/modules/gmysqlbackend/Makefile.am +++ b/modules/gmysqlbackend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=@MYSQL_inc@ @THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(MYSQL_inc) $(THREADFLAGS) $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = libgmysqlbackend.la EXTRA_DIST=OBJECTFILES OBJECTLIBS \ diff --git a/modules/goraclebackend/Makefile.am b/modules/goraclebackend/Makefile.am index 075223cea6..c89db52de0 100644 --- a/modules/goraclebackend/Makefile.am +++ b/modules/goraclebackend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=$(ORACLE_CFLAGS) @THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(ORACLE_CFLAGS) $(THREADFLAGS) $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = libgoraclebackend.la EXTRA_DIST=OBJECTFILES OBJECTLIBS diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am index 3ab8c7715b..0fcca8cbf9 100644 --- a/modules/gpgsqlbackend/Makefile.am +++ b/modules/gpgsqlbackend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=-I@PGSQL_incdir@ @THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=-I$(PGSQL_incdir) $(THREADFLAGS) $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = libgpgsqlbackend.la EXTRA_DIST=OBJECTFILES OBJECTLIBS \ @@ -11,10 +11,10 @@ libgpgsqlbackend_la_SOURCES=gpgsqlbackend.cc gpgsqlbackend.hh \ ## Don't remove the empty lines between if and endif or tabs will screw up your makefile if OS_MACOSX -libgpgsqlbackend_la_LDFLAGS=-module -avoid-version @PGSQL_lib@ -lpq +libgpgsqlbackend_la_LDFLAGS=-module -avoid-version $(PGSQL_lib) -lpq else -libgpgsqlbackend_la_LDFLAGS=-module -avoid-version @PGSQL_lib@ -Wl,-Bstatic -lpq -Wl,-Bdynamic +libgpgsqlbackend_la_LDFLAGS=-module -avoid-version $(PGSQL_lib) -Wl,-Bstatic -lpq -Wl,-Bdynamic endif -libgpgsqlbackend_la_LIBADD=-lssl @LIBCRYPT@ -lcrypto +libgpgsqlbackend_la_LIBADD=-lssl $(LIBCRYPT) -lcrypto diff --git a/modules/gsqlite3backend/Makefile.am b/modules/gsqlite3backend/Makefile.am index 121a082813..23f957e31c 100644 --- a/modules/gsqlite3backend/Makefile.am +++ b/modules/gsqlite3backend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = libgsqlite3backend.la EXTRA_DIST=OBJECTFILES OBJECTLIBS \ diff --git a/modules/ldapbackend/Makefile.am b/modules/ldapbackend/Makefile.am index 7c0e9c41ff..67a1275714 100644 --- a/modules/ldapbackend/Makefile.am +++ b/modules/ldapbackend/Makefile.am @@ -1,8 +1,8 @@ -AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS) EXTRA_DIST = OBJECTFILES OBJECTLIBS pkglib_LTLIBRARIES = libldapbackend.la libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh libldapbackend_la_LDFLAGS =-module -avoid-version -libldapbackend_la_LIBADD =-l@LIBLDAP@ +libldapbackend_la_LIBADD =-l$(LIBLDAP) diff --git a/modules/lmdbbackend/Makefile.am b/modules/lmdbbackend/Makefile.am index 922822bb97..559e3a7f94 100644 --- a/modules/lmdbbackend/Makefile.am +++ b/modules/lmdbbackend/Makefile.am @@ -1,8 +1,8 @@ -AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = liblmdbbackend.la EXTRA_DIST=OBJECTFILES OBJECTLIBS liblmdbbackend_la_SOURCES=lmdbbackend.cc lmdbbackend.hh liblmdbbackend_la_LDFLAGS=-module -avoid-version -liblmdbbackend_la_LIBADD=-l@LIBLMDB@ +liblmdbbackend_la_LIBADD=-l$(LIBLMDB) diff --git a/modules/luabackend/Makefile.am b/modules/luabackend/Makefile.am index 0f75cf835d..90e53b3d46 100644 --- a/modules/luabackend/Makefile.am +++ b/modules/luabackend/Makefile.am @@ -1,5 +1,5 @@ -AM_CPPFLAGS=$(LUA_CFLAGS) @THREADFLAGS@ $(BOOST_CPPFLAGS) -#AM_CPPFLAGS=-I/usr/local/include/luajit-2.0 -DUSE_LUAJIT @THREADFLAGS@ +AM_CPPFLAGS=$(LUA_CFLAGS) $(THREADFLAGS) $(BOOST_CPPFLAGS) +#AM_CPPFLAGS=-I/usr/local/include/luajit-2.0 -DUSE_LUAJIT $(THREADFLAGS) EXTRA_DIST=OBJECTFILES OBJECTLIBS diff --git a/modules/mydnsbackend/Makefile.am b/modules/mydnsbackend/Makefile.am index 89d943e1da..f197e7c4e2 100644 --- a/modules/mydnsbackend/Makefile.am +++ b/modules/mydnsbackend/Makefile.am @@ -1,6 +1,6 @@ -AM_CPPFLAGS=@MYSQL_inc@ @THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(MYSQL_inc) $(THREADFLAGS) $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = libmydnsbackend.la EXTRA_DIST=OBJECTFILES OBJECTLIBS libmydnsbackend_la_SOURCES=mydnsbackend.cc mydnsbackend.hh -libmydnsbackend_la_LDFLAGS=-module -avoid-version @MYSQL_lib@ +libmydnsbackend_la_LDFLAGS=-module -avoid-version $(MYSQL_lib) diff --git a/modules/opendbxbackend/Makefile.am b/modules/opendbxbackend/Makefile.am index 6a1806ee8e..8092b914ee 100644 --- a/modules/opendbxbackend/Makefile.am +++ b/modules/opendbxbackend/Makefile.am @@ -1,8 +1,8 @@ -AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS) EXTRA_DIST = OBJECTFILES OBJECTLIBS pkglib_LTLIBRARIES = libopendbxbackend.la libopendbxbackend_la_SOURCES = odbxbackend.hh odbxbackend.cc odbxprivate.cc libopendbxbackend_la_LDFLAGS =-module -avoid-version -libopendbxbackend_la_LIBADD =-l@LIBOPENDBX@ +libopendbxbackend_la_LIBADD =-l$(LIBOPENDBX) diff --git a/modules/oraclebackend/Makefile.am b/modules/oraclebackend/Makefile.am index b04fc2ecdd..25f9094361 100644 --- a/modules/oraclebackend/Makefile.am +++ b/modules/oraclebackend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=$(ORACLE_CFLAGS) @THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(ORACLE_CFLAGS) $(THREADFLAGS) $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = liboraclebackend.la diff --git a/modules/pipebackend/Makefile.am b/modules/pipebackend/Makefile.am index 941af1f175..0e8df89fd7 100644 --- a/modules/pipebackend/Makefile.am +++ b/modules/pipebackend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS) #if !ALLSTATIC #install-exec-local: # install .lib/libpipebackend.so.0.0.0 @libdir@ diff --git a/modules/randombackend/Makefile.am b/modules/randombackend/Makefile.am index b4112ad7e6..b4ff1e453e 100644 --- a/modules/randombackend/Makefile.am +++ b/modules/randombackend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS) EXTRA_DIST=OBJECTFILES OBJECTLIBS diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am index a2ad46224f..e5f171d2a3 100644 --- a/modules/remotebackend/Makefile.am +++ b/modules/remotebackend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=@THREADFLAGS@ $(BOOST_CPPFLAGS) -I../../pdns/ext/rapidjson/include -I../../pdns/ext/yahttp $(POLARSSL_CFLAGS) -I../../pdns +AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS) -I../../pdns/ext/rapidjson/include -I../../pdns/ext/yahttp $(POLARSSL_CFLAGS) -I../../pdns #if !ALLSTATIC #install-exec-local: # install .lib/libremotebackend.so.0.0.0 @libdir@ @@ -44,8 +44,8 @@ libtestremotebackend_la_SOURCES += ../../pdns/pkcs11signers.hh ../../pdns/pkcs11 libtestremotebackend_la_LIBADD+=$(P11KIT1_LIBS) endif -libtestremotebackend_la_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(POLARSSL_CFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) $(P11KIT1_CFLAGS) -g -O0 -I../../pdns -libtestremotebackend_la_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ $(POLARSSL_CFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) $(P11KIT1_CFLAGS) -g -O0 -I../../pdns +libtestremotebackend_la_CFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) $(POLARSSL_CFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) $(P11KIT1_CFLAGS) -g -O0 -I../../pdns +libtestremotebackend_la_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) $(POLARSSL_CFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) $(P11KIT1_CFLAGS) -g -O0 -I../../pdns test_remotebackend_pipe_SOURCES=test-remotebackend.cc test-remotebackend-pipe.cc test-remotebackend-keys.hh test_remotebackend_unix_SOURCES=test-remotebackend.cc test-remotebackend-unix.cc test-remotebackend-keys.hh @@ -54,27 +54,27 @@ test_remotebackend_post_SOURCES=test-remotebackend.cc test-remotebackend-post.cc test_remotebackend_json_SOURCES=test-remotebackend.cc test-remotebackend-json.cc test-remotebackend-keys.hh test_remotebackend_zeromq_SOURCES=test-remotebackend.cc test-remotebackend-zeromq.cc test-remotebackend-keys.hh -test_remotebackend_pipe_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_pipe_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_pipe_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBZMQ_LIBS) +test_remotebackend_pipe_CFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns +test_remotebackend_pipe_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns +test_remotebackend_pipe_LDADD=libtestremotebackend.la $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBDL) $(POLARSSL_LIBS) $(LIBZMQ_LIBS) -test_remotebackend_unix_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_unix_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_unix_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBZMQ_LIBS) +test_remotebackend_unix_CFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns +test_remotebackend_unix_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns +test_remotebackend_unix_LDADD=libtestremotebackend.la $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBDL) $(POLARSSL_LIBS) $(LIBZMQ_LIBS) -test_remotebackend_http_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_http_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_http_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBZMQ_LIBS) +test_remotebackend_http_CFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns +test_remotebackend_http_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns +test_remotebackend_http_LDADD=libtestremotebackend.la $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBDL) $(POLARSSL_LIBS) $(LIBZMQ_LIBS) -test_remotebackend_post_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_post_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_post_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBZMQ_LIBS) +test_remotebackend_post_CFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns +test_remotebackend_post_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns +test_remotebackend_post_LDADD=libtestremotebackend.la $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBDL) $(POLARSSL_LIBS) $(LIBZMQ_LIBS) -test_remotebackend_json_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_json_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_json_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBZMQ_LIBS) +test_remotebackend_json_CFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns +test_remotebackend_json_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns +test_remotebackend_json_LDADD=libtestremotebackend.la $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBDL) $(POLARSSL_LIBS) $(LIBZMQ_LIBS) -test_remotebackend_zeromq_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_zeromq_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns -test_remotebackend_zeromq_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBZMQ_LIBS) +test_remotebackend_zeromq_CFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns +test_remotebackend_zeromq_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns +test_remotebackend_zeromq_LDADD=libtestremotebackend.la $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBDL) $(POLARSSL_LIBS) $(LIBZMQ_LIBS) diff --git a/modules/tinydnsbackend/Makefile.am b/modules/tinydnsbackend/Makefile.am index 404093ec50..0380d8911b 100644 --- a/modules/tinydnsbackend/Makefile.am +++ b/modules/tinydnsbackend/Makefile.am @@ -1,7 +1,7 @@ -AM_CPPFLAGS=@CDB_CFLAGS@ @THREADFLAGS@ $(BOOST_CPPFLAGS) +AM_CPPFLAGS=$(CDB_CFLAGS) $(THREADFLAGS) $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = libtinydnsbackend.la EXTRA_DIST=OBJECTFILES OBJECTLIBS libtinydnsbackend_la_SOURCES=cdb.cc cdb.hh tinydnsbackend.cc tinydnsbackend.hh -libtinydnsbackend_la_LDFLAGS=-module -avoid-version @CDB_LIBS@ +libtinydnsbackend_la_LDFLAGS=-module -avoid-version $(CDB_LIBS) diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 63faf95cc0..430fb671f4 100644 --- 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_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 YAHTTP_LIBS = -Lext/yahttp/yahttp -lyahttp AM_LFLAGS = -i AM_YFLAGS = -d --verbose --debug -AM_CPPFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ +AM_CPPFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) if BOTAN110 AM_CPPFLAGS += $(BOTAN110_CFLAGS) endif @@ -69,7 +69,7 @@ version.hh version.cc rfc2136handler.cc responsestats.cc responsestats.hh \ comment.hh auth-carbon.cc -pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic +pdns_server_LDFLAGS=@moduleobjects@ @modulelibs@ $(DYNLINKFLAGS) @LIBDL@ $(THREADFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) -rdynamic pdns_server_LDADD= $(POLARSSL_LIBS) $(BOOST_SERIALIZATION_LIBS) $(LUA_LIBS) $(SQLITE3_LIBS) $(YAHTTP_LIBS) if BOTAN110 @@ -112,7 +112,7 @@ pdnssec_SOURCES=pdnssec.cc dbdnsseckeeper.cc sstuff.hh dnsparser.cc dnsparser.hh dns_random.cc json.cc \ serialtweaker.cc randomhelper.cc -pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) +pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ $(DYNLINKFLAGS) @LIBDL@ $(THREADFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) pdnssec_LDADD= $(POLARSSL_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(YAHTTP_LIBS) zone2sql_SOURCES=bindparser.yy bindlexer.l bind-dnssec.schema.sqlite3.sql.h \ @@ -123,7 +123,7 @@ zone2sql_SOURCES=bindparser.yy bindlexer.l bind-dnssec.schema.sqlite3.sql.h \ nsecrecords.cc base32.cc bindparserclasses.hh \ dns_random.cc json.cc json.hh -zone2sql_LDFLAGS=@THREADFLAGS@ +zone2sql_LDFLAGS=$(THREADFLAGS) zone2sql_LDADD= $(POLARSSL_LIBS) zone2json_SOURCES=bindparser.yy bindlexer.l bind-dnssec.schema.sqlite3.sql.h \ @@ -132,7 +132,7 @@ zone2json_SOURCES=bindparser.yy bindlexer.l bind-dnssec.schema.sqlite3.sql.h \ dnswriter.cc dnslabeltext.cc rcpgenerator.cc dnsparser.cc base64.cc sillyrecords.cc \ nsecrecords.cc base32.cc bindparserclasses.hh -zone2json_LDFLAGS=@THREADFLAGS@ +zone2json_LDFLAGS=$(THREADFLAGS) zone2json_LDADD= $(POLARSSL_LIBS) zone2ldap_SOURCES=bindparser.yy bindlexer.l bind-dnssec.schema.sqlite3.sql.h \ @@ -142,7 +142,7 @@ zone2ldap_SOURCES=bindparser.yy bindlexer.l bind-dnssec.schema.sqlite3.sql.h \ nsecrecords.cc base32.cc bindparserclasses.hh \ dns_random.cc -zone2ldap_LDFLAGS=@THREADFLAGS@ +zone2ldap_LDFLAGS=$(THREADFLAGS) zone2ldap_LDADD= $(POLARSSL_LIBS) if LMDB @@ -155,7 +155,7 @@ zone2lmdb_SOURCES=bindparser.yy bindlexer.l bind-dnssec.schema.sqlite3.sql.h \ nsecrecords.cc base32.cc bindparserclasses.hh \ dns_random.cc dns.cc -zone2lmdb_LDFLAGS=@THREADFLAGS@ +zone2lmdb_LDFLAGS=$(THREADFLAGS) zone2lmdb_LDADD= $(POLARSSL_LIBS) -llmdb endif @@ -253,11 +253,11 @@ speedtest_SOURCES=speedtest.cc dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter dnswasher_SOURCES=dnswasher.cc misc.cc unix_utility.cc qtype.cc \ logger.cc statbag.cc dnspcap.cc dnspcap.hh dnsparser.hh -dnswasher_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ +dnswasher_LDFLAGS= $(DYNLINKFLAGS) $(THREADFLAGS) dnsbulktest_SOURCES=dnsbulktest.cc misc.cc unix_utility.cc qtype.cc logger.cc statbag.cc dnsparser.cc \ dnsrecords.cc dnswriter.cc dnslabeltext.cc rcpgenerator.cc base32.cc base64.cc sillyrecords.cc nsecrecords.cc -dnsbulktest_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) +dnsbulktest_LDFLAGS= $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) dnsbulktest_LDADD= $(BOOST_PROGRAM_OPTIONS_LIBS) @@ -271,7 +271,7 @@ dnsreplay_SOURCES=dnsreplay.cc misc.cc qtype.cc anadns.hh \ rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh dnswriter.cc dnslabeltext.cc dnswriter.hh \ unix_utility.cc utility.hh sillyrecords.cc nsecrecords.cc base32.cc -dnsreplay_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) +dnsreplay_LDFLAGS= $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) dnsreplay_LDADD= $(BOOST_PROGRAM_OPTIONS_LIBS) nproxy_SOURCES=nproxy.cc dnsparser.cc dnsrecords.cc dnsparser.hh \ @@ -279,7 +279,7 @@ nproxy_SOURCES=nproxy.cc dnsparser.cc dnsrecords.cc dnsparser.hh \ sillyrecords.cc selectmplexer.cc mplexer.hh misc.cc nsecrecords.cc unix_utility.cc qtype.cc \ logger.cc statbag.cc base32.cc -nproxy_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) +nproxy_LDFLAGS= $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) nproxy_LDADD= $(BOOST_PROGRAM_OPTIONS_LIBS) notify_SOURCES=notify.cc dnsparser.cc dnsrecords.cc dnsparser.hh \ @@ -287,7 +287,7 @@ notify_SOURCES=notify.cc dnsparser.cc dnsrecords.cc dnsparser.hh \ sillyrecords.cc selectmplexer.cc nsecrecords.cc base32.cc misc.cc unix_utility.cc \ logger.cc qtype.cc statbag.cc dns.cc arguments.cc -notify_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) +notify_LDFLAGS= $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) notify_LDADD= $(BOOST_PROGRAM_OPTIONS_LIBS) dnsscope_SOURCES=dnsscope.cc misc.cc unix_utility.cc qtype.cc \ @@ -295,7 +295,7 @@ dnsscope_SOURCES=dnsscope.cc misc.cc unix_utility.cc qtype.cc \ base64.cc base64.hh dnswriter.cc dnslabeltext.cc dnswriter.hh rcpgenerator.cc rcpgenerator.hh \ utility.hh dnsparser.hh sillyrecords.cc nsecrecords.cc base32.cc dns.cc arguments.cc -dnsscope_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_PROGRAM_OPTIONS_LDFLAGS) +dnsscope_LDFLAGS= $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) dnsscope_LDADD = $(BOOST_PROGRAM_OPTIONS_LIBS) dnsgram_SOURCES=dnsgram.cc misc.cc unix_utility.cc qtype.cc \ @@ -321,7 +321,7 @@ testrunner_SOURCES=testrunner.cc test-misc_hh.cc test-nameserver_cc.cc test-dnsr bindparser.cc bindlexer.c test-zoneparser_tng_cc.cc zoneparser-tng.hh \ zoneparser-tng.cc dns.cc -testrunner_LDFLAGS= @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) +testrunner_LDFLAGS= $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) testrunner_LDADD= $(POLARSSL_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) if PKCS11 @@ -347,7 +347,7 @@ pdns_recursor_LDADD= $(POLARSSL_LIBS) $(YAHTTP_LIBS) pdns_control_SOURCES=dynloader.cc dynmessenger.cc arguments.cc logger.cc statbag.cc \ misc.cc unix_utility.cc qtype.cc -pdns_control_LDFLAGS=@THREADFLAGS@ +pdns_control_LDFLAGS=$(THREADFLAGS) if UNIT_TESTS TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message diff --git a/pdns/ext/yahttp/yahttp/Makefile.am b/pdns/ext/yahttp/yahttp/Makefile.am index 04b8082485..b771ac33d2 100644 --- a/pdns/ext/yahttp/yahttp/Makefile.am +++ b/pdns/ext/yahttp/yahttp/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ +AM_CPPFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) noinst_LTLIBRARIES=libyahttp.la libyahttp_la_SOURCES=cookie.hpp exception.hpp reqresp.cpp reqresp.hpp router.cpp router.hpp url.hpp utility.hpp yahttp-config.h yahttp.hpp -- 2.47.2