Commit 37193f83 authored by Daniel Salzman's avatar Daniel Salzman

Makefile: move _LIBS from _LDFLAGS to _LIBADD + cleanup

parent 3d8f7477
...@@ -3,7 +3,7 @@ noinst_LTLIBRARIES += libcontrib.la ...@@ -3,7 +3,7 @@ noinst_LTLIBRARIES += libcontrib.la
libcontrib_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) libcontrib_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY)
libcontrib_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAG_EXCLUDE_LIBS) libcontrib_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAG_EXCLUDE_LIBS)
if !HAVE_LMDB if !HAVE_LMDB
libcontrib_la_LDFLAGS += $(pthread_LIBS) libcontrib_la_LIBADD = $(pthread_LIBS)
endif !HAVE_LMDB endif !HAVE_LMDB
EXTRA_DIST += \ EXTRA_DIST += \
...@@ -72,7 +72,7 @@ if HAVE_LIBDNSTAP ...@@ -72,7 +72,7 @@ if HAVE_LIBDNSTAP
noinst_LTLIBRARIES += libdnstap.la noinst_LTLIBRARIES += libdnstap.la
libdnstap_la_CPPFLAGS = $(AM_CPPFLAGS) $(DNSTAP_CFLAGS) libdnstap_la_CPPFLAGS = $(AM_CPPFLAGS) $(DNSTAP_CFLAGS)
libdnstap_la_LDFLAGS = $(AM_LDFLAGS) $(DNSTAP_LIBS) libdnstap_la_LIBADD = $(DNSTAP_LIBS)
SUFFIXES = .proto .pb-c.c .pb-c.h SUFFIXES = .proto .pb-c.c .pb-c.h
......
...@@ -22,9 +22,8 @@ libshared_la_SOURCES = \ ...@@ -22,9 +22,8 @@ libshared_la_SOURCES = \
libdnssec/shared/shared.h libdnssec/shared/shared.h
libdnssec_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(gnutls_CFLAGS) libdnssec_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(gnutls_CFLAGS)
libdnssec_la_LDFLAGS = $(AM_LDFLAGS) $(libdnssec_VERSION_INFO) $(gnutls_LIBS) \ libdnssec_la_LDFLAGS = $(AM_LDFLAGS) $(libdnssec_VERSION_INFO) $(LDFLAG_EXCLUDE_LIBS)
$(LDFLAG_EXCLUDE_LIBS) libdnssec_la_LIBADD = libshared.la $(gnutls_LIBS)
libdnssec_la_LIBADD = libshared.la
include_libdnssecdir = $(includedir)/libdnssec include_libdnssecdir = $(includedir)/libdnssec
include_libdnssec_HEADERS = \ include_libdnssec_HEADERS = \
......
...@@ -2,9 +2,8 @@ lib_LTLIBRARIES += libknot.la ...@@ -2,9 +2,8 @@ lib_LTLIBRARIES += libknot.la
pkgconfig_DATA += libknot.pc pkgconfig_DATA += libknot.pc
libknot_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(lmdb_CFLAGS) libknot_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(lmdb_CFLAGS)
libknot_la_LDFLAGS = $(AM_LDFLAGS) $(libknot_VERSION_INFO) $(lmdb_LIBS) \ libknot_la_LDFLAGS = $(AM_LDFLAGS) $(libknot_VERSION_INFO) $(LDFLAG_EXCLUDE_LIBS)
$(LDFLAG_EXCLUDE_LIBS) libknot_la_LIBADD = libcontrib.la libdnssec.la $(lmdb_LIBS)
libknot_la_LIBADD = libcontrib.la libdnssec.la
include_libknotdir = $(includedir) include_libknotdir = $(includedir)
nobase_include_libknot_HEADERS = \ nobase_include_libknot_HEADERS = \
......
...@@ -71,10 +71,10 @@ knsupdate_CPPFLAGS = $(AM_CPPFLAGS) $(gnutls_CFLAGS) ...@@ -71,10 +71,10 @@ knsupdate_CPPFLAGS = $(AM_CPPFLAGS) $(gnutls_CFLAGS)
knsupdate_LDADD = libknotus.la libzscanner.la knsupdate_LDADD = libknotus.la libzscanner.la
if HAVE_DNSTAP if HAVE_DNSTAP
kdig_LDADD += $(DNSTAP_LIBS) libdnstap.la
khost_LDADD += $(DNSTAP_LIBS) libdnstap.la
kdig_CPPFLAGS += $(DNSTAP_CFLAGS) kdig_CPPFLAGS += $(DNSTAP_CFLAGS)
kdig_LDADD += $(DNSTAP_LIBS) libdnstap.la
khost_CPPFLAGS += $(DNSTAP_CFLAGS) khost_CPPFLAGS += $(DNSTAP_CFLAGS)
khost_LDADD += $(DNSTAP_LIBS) libdnstap.la
endif HAVE_DNSTAP endif HAVE_DNSTAP
endif HAVE_UTILS endif HAVE_UTILS
......
...@@ -40,8 +40,6 @@ libtap_la_SOURCES = \ ...@@ -40,8 +40,6 @@ libtap_la_SOURCES = \
EXTRA_PROGRAMS = tap/runtests EXTRA_PROGRAMS = tap/runtests
tap_runtests_LDADD =
check_PROGRAMS = \ check_PROGRAMS = \
contrib/test_base32hex \ contrib/test_base32hex \
contrib/test_base64 \ contrib/test_base64 \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment