[Bug 1414] Enable "make distcheck" success with BSD make.

bk: 4b23f532wbPJ3rdS2zzIx2ypiPeJ3g

diff --git a/ChangeLog b/ChangeLog
index 6d7fc017e4d7633757ef1d291c35d89b591dd7e8..c5f2456410e4a9bc76bf9fd949c776e0ceb10e23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+
+* [Bug 1414] Enable "make distcheck" success with BSD make.
+
 ---
 (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
 * Include (4.2.4p8) - [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.

diff --git a/libparse/Makefile.am b/libparse/Makefile.am
index b288a35f9e7d6c8cf86eb514a5822f75cfa2930f..12b47967de75bbf0f425dff62fbf350f0bfc2cfa 100644 (file)
--- a/libparse/Makefile.am
+++ b/libparse/Makefile.am
@@ -6,7 +6,7 @@ noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@
 EXTRA_LIBRARIES = libparse.a libparse_kernel.a
 EXTRA_PROGRAMS = parsestreams parsesolaris
 noinst_PROGRAMS = @MAKE_PARSEKMODULE@
-CLEANFILES = libparse.a libparse_kernel.a
+CLEANFILES = libparse.a libparse_kernel.a info_trimble.c
 
 K_CFLAGS = -DPARSESTREAM -DNTP_NEED_BOPS
 
@@ -33,24 +33,25 @@ libparse_a_SOURCES = parse.c \
                     $(NULL)
 
 libparse_kernel_a_SOURCES = 
-libparse_kernel_a_LIBADD = kparse$U.o \
-                           kparse_conf$U.o \
-                           kclk_computime$U.o \
-                           kclk_dcf7000$U.o \
-                           kclk_hopf6021$U.o \
-                           kclk_meinberg$U.o \
-                           kclk_rawdcf$U.o \
-                           kclk_rcc8000$U.o \
-                           kclk_schmid$U.o \
-                           kclk_trimtaip$U.o \
-                           kclk_trimtsip$U.o \
-                           kclk_varitext$U.o \
-                           kclk_wharton$U.o \
-                           kbinio$U.o \
-                           kieee754io$U.o \
-                           kmfp_mul$U.o \
-                           kgpstolfp$U.o \
-                           $(NULL)
+libparse_kernel_a_LIBADD =     \
+       kparse.o                \
+       kparse_conf.o           \
+       kclk_computime.o        \
+       kclk_dcf7000.o          \
+       kclk_hopf6021.o         \
+       kclk_meinberg.o         \
+       kclk_rawdcf.o           \
+       kclk_rcc8000.o          \
+       kclk_schmid.o           \
+       kclk_trimtaip.o         \
+       kclk_trimtsip.o         \
+       kclk_varitext.o         \
+       kclk_wharton.o          \
+       kbinio.o                \
+       kieee754io.o            \
+       kmfp_mul.o              \
+       kgpstolfp.o             \
+       $(NULL)
 
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
@@ -65,9 +66,9 @@ EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_
 # create info_trimble.c
 #
 info_trimble.c: $(top_srcdir)/include/trimble.h mkinfo_rcmd.sed mkinfo_scmd.sed
-       @rm -f info_trimble.c
-       sed -n -f $(srcdir)/mkinfo_scmd.sed $(top_srcdir)/include/trimble.h  > info_trimble.c || rm -f info_trimble.c
-       sed -n -f $(srcdir)/mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> info_trimble.c || rm -f info_trimble.c
+       @rm -f $@
+       sed -n -f $(srcdir)/mkinfo_scmd.sed $(top_srcdir)/include/trimble.h  > $@ || rm -f $@
+       sed -n -f $(srcdir)/mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> $@ || rm -f $@
 
 kieee754io.o: ieee754io.c
         $(COMPILE) $(K_CFLAGS) -c $(srcdir)/ieee754io.c -o $@

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 37d4c30e9a1a9b0c0c46299e6113b4d7305cd917..97470c437407e4e43bfb65ac272924640a7b6947 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -67,9 +67,23 @@ vphack_after:
                ln -s $(srcdir)/ntp_parser.h . \
                )
 
-BUILT_SOURCES= $(VPHACK) ntp_parser.c ntp_parser.h $(VPHACK_AFTER) \
-       ntp_keyword.h ntpd-opts.c ntpd-opts.h ntpd.1 ntpd-opts.texi \
-       ntpd-opts.menu
+# BUILT_SOURCES which should also be in EXTRA_DIST
+B_S_DIST=              \
+       ntp_keyword.h   \
+       ntpd-opts.c     \
+       ntpd-opts.h     \
+       ntpd.1          \
+       ntpd-opts.texi  \
+       ntpd-opts.menu  \
+       $(NULL)
+
+BUILT_SOURCES=         \
+       $(VPHACK)       \
+       ntp_parser.c    \
+       ntp_parser.h    \
+       $(VPHACK_AFTER) \
+       $(B_S_DIST)     \
+       $(NULL)
 
 man_MANS=      ntpd.1
 
@@ -97,7 +111,7 @@ EXTRA_DIST = \
        ntp_keyword.h           \
        refclock_msfees.c       \
        refclock_trak.c         \
-       $(BUILT_SOURCES)        \
+       $(B_S_DIST)             \
        $(NULL)
 ETAGS_ARGS = Makefile.am
 ###                                                    Y2Kfixes

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 9575f41b30034f8e717c5914c1eeb0d03f0be563..627c02bb707ece829415a78d804ceb9902569b95 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -50,7 +50,7 @@ sntp_SOURCES =                \
 EXTRA_DIST=                            \
                autogen-version.def     \
                bincheck.mf             \
-               COPYRIGHT               \
+               $(srcdir)/COPYRIGHT     \
                deps-ver                \
                depsver.mf              \
                sntp-opts.def           \