From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 30 Sep 2014 19:16:10 +0000 (+0200)
Subject: Replace _LDFLAGS with _LIBADD where needed
X-Git-Tag: rec-3.7.0-rc1~234^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1756%2Fhead;p=thirdparty%2Fpdns.git

Replace _LDFLAGS with _LIBADD where needed
---

diff --git a/modules/db2backend/Makefile.am b/modules/db2backend/Makefile.am
index b44286ef12..84b06f6ae1 100644
--- a/modules/db2backend/Makefile.am
+++ b/modules/db2backend/Makefile.am
@@ -2,5 +2,6 @@ AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS)
 pkglib_LTLIBRARIES = libdb2backend.la
 
 libdb2backend_la_SOURCES=DB2Backend.cc DB2Backend.hh DB2Exception.cc DB2Exception.hh
-libdb2backend_la_LDFLAGS=-module -avoid-version -ldb2
+libdb2backend_la_LDFLAGS = -module -avoid-version
+libdb2backend_la_LIBADD = -ldb2
 
diff --git a/modules/geoipbackend/Makefile.am b/modules/geoipbackend/Makefile.am
index d3f661c7a2..ee8cdaa4b1 100644
--- a/modules/geoipbackend/Makefile.am
+++ b/modules/geoipbackend/Makefile.am
@@ -1,5 +1,6 @@
-AM_CPPFLAGS=$(THREADFLAGS) $(BOOST_CPPFLAGS) $(YAML_CFLAGS) $(GEOIP_CFLAGS)
-EXTRA_DIST=OBJECTFILES OBJECTLIBS
+AM_CPPFLAGS = $(THREADFLAGS) $(BOOST_CPPFLAGS) $(YAML_CFLAGS) $(GEOIP_CFLAGS)
+EXTRA_DIST = OBJECTFILES OBJECTLIBS
 pkglib_LTLIBRARIES = libgeoipbackend.la
-libgeoipbackend_la_SOURCES=geoipbackend.cc geoipbackend.hh
-libgeoipbackend_la_LDFLAGS=-module -avoid-version $(YAML_LIBS) $(GEOIP_LIBS)
+libgeoipbackend_la_SOURCES = geoipbackend.cc geoipbackend.hh
+libgeoipbackend_la_LDFLAGS = -module -avoid-version
+libgeoipbackend_la_LIBADD = $(YAML_LIBS) $(GEOIP_LIBS)
diff --git a/modules/gmysqlbackend/Makefile.am b/modules/gmysqlbackend/Makefile.am
index 9bf154b565..694bfe6218 100644
--- a/modules/gmysqlbackend/Makefile.am
+++ b/modules/gmysqlbackend/Makefile.am
@@ -9,4 +9,5 @@ dist_doc_DATA = schema.mysql.sql nodnssec-3.x_to_3.4.0_schema.mysql.sql dnssec-3
 libgmysqlbackend_la_SOURCES=gmysqlbackend.cc gmysqlbackend.hh \
 	smysql.hh smysql.cc
 
-libgmysqlbackend_la_LDFLAGS=-module -avoid-version $(MYSQL_lib)
+libgmysqlbackend_la_LDFLAGS = -module -avoid-version
+libgmysqlbackend_la_LIBADD = $(MYSQL_lib)
diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am
index 35bf963dfc..44af5e04cc 100644
--- a/modules/gpgsqlbackend/Makefile.am
+++ b/modules/gpgsqlbackend/Makefile.am
@@ -11,5 +11,5 @@ dist_doc_DATA=schema.pgsql.sql nodnssec-3.x_to_3.4.0_schema.pgsql.sql \
 libgpgsqlbackend_la_SOURCES=gpgsqlbackend.cc gpgsqlbackend.hh \
 	spgsql.hh spgsql.cc
 
-libgpgsqlbackend_la_LDFLAGS=-module -avoid-version $(PGSQL_lib)
-libgpgsqlbackend_la_LIBADD=-lssl $(LIBCRYPT) -lcrypto
+libgpgsqlbackend_la_LDFLAGS = -module -avoid-version
+libgpgsqlbackend_la_LIBADD = $(PGSQL_lib) -lssl $(LIBCRYPT) -lcrypto
diff --git a/modules/mydnsbackend/Makefile.am b/modules/mydnsbackend/Makefile.am
index 82cb409e2d..0363f82caa 100644
--- a/modules/mydnsbackend/Makefile.am
+++ b/modules/mydnsbackend/Makefile.am
@@ -8,5 +8,5 @@ dist_doc_DATA=schema.mydns.sql
 
 libmydnsbackend_la_SOURCES=mydnsbackend.cc mydnsbackend.hh
 
-libmydnsbackend_la_LDFLAGS=-module -avoid-version $(MYSQL_lib)
-libmydnsbackend_la_LIBADD=../gmysqlbackend/smysql.lo
+libmydnsbackend_la_LDFLAGS=-module -avoid-version
+libmydnsbackend_la_LIBADD= $(MYSQL_lib) ../gmysqlbackend/smysql.lo
diff --git a/modules/oraclebackend/Makefile.am b/modules/oraclebackend/Makefile.am
index c8ad393a20..4d77138cf6 100644
--- a/modules/oraclebackend/Makefile.am
+++ b/modules/oraclebackend/Makefile.am
@@ -7,5 +7,5 @@ EXTRA_DIST=OBJECTFILES OBJECTLIBS schema.oracle.sql drop-schema.oracle.sql
 dist_doc_DATA=schema.oracle.sql drop-schema.oracle.sql
 
 liboraclebackend_la_SOURCES=oraclebackend.cc oraclebackend.hh
-liboraclebackend_la_LDFLAGS=-module -avoid-version $(ORACLE_LIBS)
-liboraclebackend_la_LIBADD=-lclntsh
+liboraclebackend_la_LDFLAGS = -module -avoid-version
+liboraclebackend_la_LIBADD = $(ORACLE_LIBS) -lclntsh
diff --git a/modules/tinydnsbackend/Makefile.am b/modules/tinydnsbackend/Makefile.am
index 0380d8911b..f0a4e84bf0 100644
--- a/modules/tinydnsbackend/Makefile.am
+++ b/modules/tinydnsbackend/Makefile.am
@@ -4,4 +4,5 @@ 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
+libtinydnsbackend_la_LIBADD = $(CDB_LIBS)