LDADD cleanup

bk: 4eb780b6daDtgAl8alMTkAnI6HztZw

diff --git a/libparse/Makefile.am b/libparse/Makefile.am
index 2b667de86aaff9f35287fa13a872125ff6d47011..64f6148632c245d4cbee5aaecbe17b4b9d1625bd 100644 (file)
--- 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 cacc776646b35f93d3318abd4b02fb868b8a8af3..aaa5ff718c43bb1f083128fd5b0d5259526d256c 100644 (file)
--- 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 5edc3b8a57d1bb329777f8eefbc54b8643ba97fc..e508b8f621180c2f26704bec10d94e9ae618338c 100644 (file)
--- 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