From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 7 Nov 2011 06:54:46 +0000 (-0500)
Subject: LDADD cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a9fc8478ae5db2104d9c32304f7ee498b8395fb;p=thirdparty%2Fntp.git

LDADD cleanup

bk: 4eb780b6daDtgAl8alMTkAnI6HztZw
---

diff --git a/libparse/Makefile.am b/libparse/Makefile.am
index 2b667de86a..64f6148632 100644
--- a/libparse/Makefile.am
+++ b/libparse/Makefile.am
@@ -120,10 +120,10 @@ kparse_conf.o: $(srcdir)/parse_conf.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/parse_conf.c -o $@
 
 parsestreams.loadable_module.o: $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a
-	$(LD) -r -o $@ $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
+	$(LD) -r -o $@ $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a
 
 parse: $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a
-	$(LD) -r -o $@ $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
+	$(LD) -r -o $@ $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a
 
 parsesolaris.o: sys/systm.h
 
diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index cacc776646..aaa5ff718c 100644
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -16,7 +16,7 @@ AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 # LDADD might need RESLIB and ADJLIB
 ntpdc_LDADD  = version.o $(LIBOPTS_LDADD)
-ntpdc_LDADD  = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
+ntpdc_LDADD += ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
 ntpdc_LDADD += $(PTHREAD_LIBS) $(EDITLINE_LIBS)
 ntpdc_LDADD += $(LCRYPTO)
 # ntpdc-layout doesn't need any additional libraries at all
diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 5edc3b8a57..e508b8f621 100644
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -13,7 +13,7 @@ AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 # LDADD might need RESLIB and ADJLIB
 ntpq_LDADD  = version.o $(LIBOPTS_LDADD)
-ntpq_LDADD  = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
+ntpq_LDADD += ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
 ntpq_LDADD += $(PTHREAD_LIBS) $(EDITLINE_LIBS)
 ntpq_LDADD += $(LCRYPTO)
 noinst_HEADERS=	ntpq.h