Improve libntp.a dependency checking

bk: 4d2e18e5ET0HMNAWWLHH80SfSRY4og

diff --git a/adjtimed/Makefile.am b/adjtimed/Makefile.am
index 1ab50cff4bd296f5b211f14798adc07564e9a62b..5f3c07c1ac0984318d8049e957d739509426cb1b 100644 (file)
--- a/adjtimed/Makefile.am
+++ b/adjtimed/Makefile.am
@@ -6,7 +6,7 @@ else
 sbin_PROGRAMS= @MAKE_ADJTIMED@
 endif
 
-BUILT_SOURCES=
+BUILT_SOURCES= check-libntp
 CLEANFILES=
 EXTRA_PROGRAMS=        adjtimed
 
@@ -22,5 +22,10 @@ AM_CPPFLAGS = @CPPFLAGS_NTP@
 LDADD=         ../libntp/libntp.a
 ETAGS_ARGS=    Makefile.am
 
+check-libntp: FRC
+       cd ../libntp && $(MAKE)
+
+FRC:
+
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/depsver.mf

diff --git a/clockstuff/Makefile.am b/clockstuff/Makefile.am
index c235b2333f365c98e7d89cbfd6b9f9985bb3e6a1..3e912345e2af61391ea68faaf1fb095454baf75a 100644 (file)
--- a/clockstuff/Makefile.am
+++ b/clockstuff/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS =
 noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ @CLKTEST@
 EXTRA_PROGRAMS = propdelay chutest clktest
 
-BUILT_SOURCES =        clktest-opts.c clktest-opts.h
+BUILT_SOURCES =        check-libntp clktest-opts.c clktest-opts.h
 EXTRA_DIST = clktest-opts.def
 
 clktest_SOURCES = clktest.c clktest-opts.c clktest-opts.h
@@ -38,6 +38,11 @@ $(srcdir)/clktest-opts.c: $(srcdir)/clktest-opts.def $(std_def_list)
 ## chutest$(EXEEXT): ../libntp/libntp.a
 ## clktest$(EXEEXT): ../libntp/libntp.a
 
+check-libntp: FRC
+       cd ../libntp && $(MAKE)
+
+FRC:
+
 ../libntp/libntp.a:
        cd ../libntp && $(MAKE)
 

diff --git a/libparse/Makefile.am b/libparse/Makefile.am
index 7d2e1fda105826216270a226c1986ded4efb4094..a273f1fa699fb5f1ba2086c2afa923eabbe86f3c 100644 (file)
--- a/libparse/Makefile.am
+++ b/libparse/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 AUTOMAKE_OPTIONS =
-BUILT_SOURCES =
+BUILT_SOURCES = check-libntp
 noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@
 EXTRA_LIBRARIES = libparse.a libparse_kernel.a
 EXTRA_PROGRAMS = parsestreams parsesolaris
@@ -131,6 +131,11 @@ parsestreams.loadable_module.o: $(parsestreams_OBJECTS) libparse_kernel.a ../lib
 parse: $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a
        $(LD) -r -o $@ $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a
 
+check-libntp: FRC
+       cd ../libntp && $(MAKE)
+
+FRC:
+
 ../libntp/libntp.a:
        cd ../libntp && $(MAKE)
 

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 54647e15408cc8cc5e376a7323bd60c58cac97e3..1f4ec3860c196161fc191bff07bbc6de8064f881 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -76,6 +76,7 @@ B_S_DIST=                     \
 
 BUILT_SOURCES=         \
        $(VPHACK)       \
+       check-libntp    \
        ntp_parser.c    \
        ntp_parser.h    \
        $(VPHACK_AFTER) \
@@ -269,8 +270,13 @@ check-saveconfig: $(srcdir)/complete.conf compsave.conf
 ../libopts/libopts.la:
        cd ../libopts && $(MAKE) libopts.la
 
+check-libntp: FRC
+       cd ../libntp && $(MAKE)
+
+FRC:
+
 ../libntp/libntp.a:
-       cd ../libntp && $(MAKE) libntp.a
+       cd ../libntp && $(MAKE)
 
 ../libparse/libparse.a:
        cd ../libparse && $(MAKE) libparse.a

diff --git a/ntpdate/Makefile.am b/ntpdate/Makefile.am
index bfb345ea756fa3d7252322cd6004e7e16863124b..a09d130e7c09a2744bef5a7069623eaba826b5bb 100644 (file)
--- a/ntpdate/Makefile.am
+++ b/ntpdate/Makefile.am
@@ -1,7 +1,7 @@
 NULL=
 AUTOMAKE_OPTIONS=
 
-BUILT_SOURCES=
+BUILT_SOURCES= check-libntp
 CLEANFILES=
 
 if NTP_BINSUBDIR_IS_BIN
@@ -31,6 +31,11 @@ ETAGS_ARGS=  Makefile.am
 
 $(PROGRAMS): $(LDADD)
 
+check-libntp: FRC
+       cd ../libntp && $(MAKE)
+
+FRC:
+
 ../libntp/libntp.a:
        cd ../libntp && $(MAKE)
 

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index 5ed79104aac23c355c60eb6b5693ea101b9017a5..3197135807c566d004b86efc616dc5a88b2bded5 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -9,7 +9,7 @@ endif
 
 EXTRA_PROGRAMS=        ntpdc-layout
 EXTRA_DATA=    check-layout
-BUILT_SOURCES= @MAKE_CHECK_LAYOUT@ ntpdc-opts.c ntpdc-opts.h
+BUILT_SOURCES= check-libntp @MAKE_CHECK_LAYOUT@ ntpdc-opts.c ntpdc-opts.h
 
 INCLUDES  = -I$(top_srcdir)/include
 INCLUDES += -I$(top_srcdir)/lib/isc/include
@@ -71,6 +71,11 @@ check-layout: ntpdc-layout $(srcdir)/layout.std layout.here
 
 $(PROGRAMS): $(LDADD)
 
+check-libntp: FRC
+       cd ../libntp && $(MAKE)
+
+FRC:
+
 ../libntp/libntp.a:
        cd ../libntp && $(MAKE)
 
@@ -78,7 +83,7 @@ $(top_srcdir)/sntp/version:
        cd $(top_srcdir)/sntp && $(MAKE) version
 
 version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/sntp/version
-       env CSET=`cat $(top_srcdir)/sntp/sntp/version` $(top_builddir)/scripts/mkver ntpdc
+       env CSET=`cat $(top_srcdir)/sntp/version` $(top_builddir)/scripts/mkver ntpdc
        $(COMPILE) -c version.c
 
 # I ran nl_in.c (attached, to be installed into ntpdc) through

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 1346602b456ef8defce13468bc2fa58502ccc40c..6e1db693ac08bc0240d66160491b80300fe1040b 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -26,7 +26,7 @@ CLEANFILES=
 DISTCLEANFILES=        .version version.c
 ETAGS_ARGS=    Makefile.am
 EXTRA_DIST=    ntpq-opts.def ntpq.1 ntpq-opts.texi ntpq-opts.menu
-BUILT_SOURCES= ntpq-opts.c ntpq-opts.h
+BUILT_SOURCES= check-libntp ntpq-opts.c ntpq-opts.h
 man_MANS=      $(srcdir)/ntpq.1
 noinst_DATA=   $(srcdir)/ntpq-opts.texi $(srcdir)/ntpq-opts.menu
 run_ag=                cd $(srcdir) && env PATH="$(abs_builddir):$(PATH)"      \
@@ -60,6 +60,11 @@ $(srcdir)/ntpq-opts.texi: $(srcdir)/ntpq-opts.def $(std_def_list)
 
 $(PROGRAMS): $(LDADD)
 
+check-libntp: FRC
+       cd ../libntp && $(MAKE)
+
+FRC:
+
 ../libntp/libntp.a:
        cd ../libntp && $(MAKE)
 

diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am
index e13eedf670a83b84bcc11c79e381033f0601df8a..5c2981ebb202d43dfff4ca4e77aee7444d762dcb 100644 (file)
--- a/ntpsnmpd/Makefile.am
+++ b/ntpsnmpd/Makefile.am
@@ -26,7 +26,7 @@ AM_CFLAGS =   @SNMP_CFLAGS@ @CFLAGS_NTP@
 AM_CPPFLAGS =  @CPPFLAGS_NTP@
 EXTRA_DIST=    ntpsnmpd-opts.def ntpsnmpd.1 ntpsnmpd-opts.texi \
                ntpsnmpd-opts.menu ntpv4-mib.mib
-BUILT_SOURCES= ntpsnmpd-opts.c ntpsnmpd-opts.h
+BUILT_SOURCES= check-libntp ntpsnmpd-opts.c ntpsnmpd-opts.h
 CLEANFILES=
 noinst_DATA=   $(srcdir)/ntpsnmpd-opts.texi $(srcdir)/ntpsnmpd-opts.menu
 man_MANS=      $(srcdir)/ntpsnmpd.1
@@ -56,5 +56,13 @@ $(srcdir)/ntpsnmpd-opts.texi: $(srcdir)/ntpsnmpd-opts.def $(std_def_list)
        $(run_ag) -Taginfo.tpl -DLEVEL=section ntpsnmpd-opts.def
        $(top_srcdir)/scripts/check--help $@
 
+check-libntp: FRC
+       cd ../libntp && $(MAKE)
+
+FRC:
+
+../libntp/libntp.a:
+       cd ../libntp && $(MAKE)
+
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/depsver.mf

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 4f95d04d78a95fe7e970b79971cbff2293a8a21a..74ada09694aa2dfee46477dc1fc4b72b8182e008 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -78,6 +78,7 @@ EXTRA_DIST =                          \
        $(NULL)
 
 BUILT_SOURCES =                                \
+       check-libntp                    \
        $(srcdir)/COPYRIGHT             \
        libtool                         \
        $(srcdir)/sntp-opts.c           \
@@ -176,8 +177,11 @@ $(srcdir)/sntp-opts.texi: $(srcdir)/sntp-opts.def $(srcdir)/include/version.def
 $(srcdir)/sntp.html: $(srcdir)/sntp-opts.menu $(srcdir)/sntp-opts.texi $(srcdir)/sntp.texi $(srcdir)/include/version.texi
        cd $(srcdir) && ( makeinfo --force --html --no-split -o sntp.html sntp.texi || true )
 
+check-libntp: FRC
+       cd ../libntp && $(MAKE)
+
 ../libntp/libntp.a:
-       cd ../libntp && $(MAKE) libntp.a
+       cd ../libntp && $(MAKE)
 
 libtool: $(LIBTOOL_DEPS)
        ./config.status --recheck

diff --git a/util/Makefile.am b/util/Makefile.am
index b1d82cc8a1e8598c0b375a64194f59e08349cb54..01cb3ba0d035614de72ac60ae5c5cb46729a3fc3 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -30,7 +30,7 @@ ntp_keygen_LDADD= version.o $(LIBOPTS_LDADD) ../libntp/libntp.a @LCRYPTO@
 ETAGS_ARGS=    Makefile.am
 #EXTRA_DIST=   README TAGS
 EXTRA_DIST=    ntp-keygen-opts.def ntp-keygen.1 ntp-keygen-opts.texi ntp-keygen-opts.menu
-BUILT_SOURCES= ntp-keygen-opts.c ntp-keygen-opts.h
+BUILT_SOURCES= check-libntp ntp-keygen-opts.c ntp-keygen-opts.h
 CLEANFILES=
 DISTCLEANFILES=        .version version.c
 noinst_DATA=   $(srcdir)/ntp-keygen-opts.texi $(srcdir)/ntp-keygen-opts.menu
@@ -65,6 +65,11 @@ $(srcdir)/ntp-keygen-opts.texi: $(srcdir)/ntp-keygen-opts.def $(std_def_list)
 jitter_SOURCES=        jitter.c jitter.h
 jitter_LDADD=
 
+check-libntp: FRC
+       cd ../libntp && $(MAKE)
+
+FRC:
+
 ../libntp/libntp.a:
        cd ../libntp && $(MAKE)