blob: aa45dec827e6262182a11e38bfc88c29e63b8656 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
Index: ntp-4.2.6/ntpd/Makefile.am
===================================================================
--- ntp-4.2.6.orig/ntpd/Makefile.am
+++ ntp-4.2.6/ntpd/Makefile.am
@@ -83,8 +83,8 @@ man_MANS= ntpd.1
# floor refclock_wwv.o
# which are (usually) provided by -lm.
keyword_gen_LDADD = ../libntp/libntp.a
-ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntp.a
-ntpdsim_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntpsim.a
+ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@
+ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@
ntpdsim_CFLAGS = $(CFLAGS) -DSIM
check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
DISTCLEANFILES = keyword-gen .version version.c
Index: ntp-4.2.6/ntpdc/Makefile.am
===================================================================
--- ntp-4.2.6.orig/ntpdc/Makefile.am
+++ ntp-4.2.6/ntpdc/Makefile.am
@@ -10,8 +10,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$
-I$(top_srcdir)/lib/isc/nothreads/include \
-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
# LDADD might need RESLIB and ADJLIB
-ntpdc_LDADD= version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
- ../libntp/libntp.a
+ntpdc_LDADD= version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+ ../libntp/libntp.a @LCRYPTO@
# ntpdc-layout doesn't need any additional libraries at all
ntpdc_layout_LDADD=
DISTCLEANFILES= .version version.c
Index: ntp-4.2.6/ntpq/Makefile.am
===================================================================
--- ntp-4.2.6.orig/ntpq/Makefile.am
+++ ntp-4.2.6/ntpq/Makefile.am
@@ -8,8 +8,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$
-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
# LDADD might need RESLIB and ADJLIB
-ntpq_LDADD= version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
- ../libntp/libntp.a
+ntpq_LDADD= version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+ ../libntp/libntp.a @LCRYPTO@
noinst_HEADERS= ntpq.h
noinst_LIBRARIES= libntpq.a
# HMS: I don't think we need libntpq_a_LIBADD...
|
GitWeb
