diff options
| author | delphij <delphij@FreeBSD.org> | 2017-03-28 04:48:17 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2017-03-28 04:48:17 +0000 |
| commit | 9e55018b05bf06a66cff34b38d0513f3e6ce1693 (patch) | |
| tree | 902f92e264fe4e9744915013573ddc0d77146551 /contrib/ntp/parseutil | |
| parent | d39342cfdc6bedaba7e1c71da4f06feb63517476 (diff) | |
| download | FreeBSD-src-9e55018b05bf06a66cff34b38d0513f3e6ce1693.zip FreeBSD-src-9e55018b05bf06a66cff34b38d0513f3e6ce1693.tar.gz | |
MFC r315871: MFV r315791: ntp 4.2.8p10.
Diffstat (limited to 'contrib/ntp/parseutil')
| -rw-r--r-- | contrib/ntp/parseutil/Makefile.am | 6 | ||||
| -rw-r--r-- | contrib/ntp/parseutil/Makefile.in | 15 |
2 files changed, 13 insertions, 8 deletions
diff --git a/contrib/ntp/parseutil/Makefile.am b/contrib/ntp/parseutil/Makefile.am index 99fb3d1..ee2e1b6 100644 --- a/contrib/ntp/parseutil/Makefile.am +++ b/contrib/ntp/parseutil/Makefile.am @@ -5,10 +5,14 @@ CLEANFILES = noinst_PROGRAMS = @TESTDCF@ @DCFD@ EXTRA_PROGRAMS = testdcf dcfd -AM_CFLAGS = $(CFLAGS_NTP) +AM_CFLAGS = $(CFLAGS_NTP) +AM_CFLAGS += $(NTP_HARD_CFLAGS) AM_CPPFLAGS = $(NTP_INCS) AM_CPPFLAGS += $(CPPFLAGS_NTP) +AM_CPPFLAGS += $(NTP_HARD_CPPFLAGS) + +AM_LDFLAGS = $(NTP_HARD_LDFLAGS) LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) diff --git a/contrib/ntp/parseutil/Makefile.in b/contrib/ntp/parseutil/Makefile.in index a23d6e4..73e7a83 100644 --- a/contrib/ntp/parseutil/Makefile.in +++ b/contrib/ntp/parseutil/Makefile.in @@ -109,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_dir_sep.m4 \ $(top_srcdir)/sntp/m4/ntp_facilitynames.m4 \ $(top_srcdir)/sntp/m4/ntp_googletest.m4 \ + $(top_srcdir)/sntp/m4/ntp_harden.m4 \ $(top_srcdir)/sntp/m4/ntp_ipv6.m4 \ $(top_srcdir)/sntp/m4/ntp_lib_m.m4 \ $(top_srcdir)/sntp/m4/ntp_libevent.m4 \ @@ -242,10 +243,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPFLAGS_LIBEVENT = @CPPFLAGS_LIBEVENT@ CPPFLAGS_NTP = @CPPFLAGS_NTP@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DCFD = @DCFD@ DEFS = @DEFS@ @@ -298,6 +295,7 @@ LN_S = @LN_S@ LSCF = @LSCF@ LTHREAD_LIBS = @LTHREAD_LIBS@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MAKE_ADJTIMED = @MAKE_ADJTIMED@ MAKE_CHECK_LAYOUT = @MAKE_CHECK_LAYOUT@ @@ -361,6 +359,9 @@ NTPTRACE_DL = @NTPTRACE_DL@ NTPTRACE_DS = @NTPTRACE_DS@ NTPTRACE_MS = @NTPTRACE_MS@ NTPTRACE_NI = @NTPTRACE_NI@ +NTP_HARD_CFLAGS = @NTP_HARD_CFLAGS@ +NTP_HARD_CPPFLAGS = @NTP_HARD_CPPFLAGS@ +NTP_HARD_LDFLAGS = @NTP_HARD_LDFLAGS@ NTP_KEYGEN_DB = @NTP_KEYGEN_DB@ NTP_KEYGEN_DL = @NTP_KEYGEN_DL@ NTP_KEYGEN_DS = @NTP_KEYGEN_DS@ @@ -434,7 +435,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -486,8 +486,9 @@ NULL = BUILT_SOURCES = .deps-ver CLEANFILES = .deps-ver noinst_PROGRAMS = @TESTDCF@ @DCFD@ -AM_CFLAGS = $(CFLAGS_NTP) -AM_CPPFLAGS = $(NTP_INCS) $(CPPFLAGS_NTP) +AM_CFLAGS = $(CFLAGS_NTP) $(NTP_HARD_CFLAGS) +AM_CPPFLAGS = $(NTP_INCS) $(CPPFLAGS_NTP) $(NTP_HARD_CPPFLAGS) +AM_LDFLAGS = $(NTP_HARD_LDFLAGS) LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) ETAGS_ARGS = Makefile.am DISTCLEANFILES = $(EXTRA_PROGRAMS) |
