From: Dave Hart <hart@ntp.org>
Date: Sat, 28 Nov 2009 23:42:10 +0000 (+0000)
Subject: [Bug 1391] avoid invoking autogen twice for .c and .h files.
X-Git-Tag: NTP_4_2_5P250_RC~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60a61f413af2f4e169d6bbf1b626acb14e9e49a6;p=thirdparty%2Fntp.git

[Bug 1391] avoid invoking autogen twice for .c and .h files.

bk: 4b11b552_reruTMBh9RtGb2n7HQwqA
---

diff --git a/ChangeLog b/ChangeLog
index 309cbf1bb..307ef2b6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1391] avoid invoking autogen twice for .c and .h files.
 * [Bug 1397] shmget() refclock_shm failing because of file mode.
 (4.2.5p249-RC) 2009/11/28 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1400] An empty KOD DB file causes sntp to coredump.
diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 972c3006d..37d4c30e9 100644
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -203,9 +203,13 @@ ntp_keyword.dummy:
 	echo stamp > $@
 
 $(srcdir)/ntp_keyword.h: $(NTP_KEYWORD_OUT)
-	echo $(srcdir)/ntp_keyword.h is unchanged > /dev/null
+	@: do-nothing action to avoid default SCCS get
+	@: .h updated if needed by ntp_keyword.out rule
 
-$(srcdir)/ntpd-opts.c $(srcdir)/ntpd-opts.h: $(srcdir)/ntpd-opts.def $(srcdir)/ntpdbase-opts.def $(std_def_list)
+$(srcdir)/ntpd-opts.h: $(srcdir)/ntpd-opts.c
+	@: do-nothing action to avoid default SCCS get, .h built with .c
+	
+$(srcdir)/ntpd-opts.c: $(srcdir)/ntpd-opts.def $(srcdir)/ntpdbase-opts.def $(std_def_list)
 	$(run_ag) ntpd-opts.def
 
 $(srcdir)/ntpd.1: $(srcdir)/ntpd-opts.def $(srcdir)/ntpdbase-opts.def $(std_def_list)
diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index a809afc7e..19eec3ddc 100644
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -32,7 +32,10 @@ std_def_list=	$(top_srcdir)/include/debug-opt.def		\
 		$(top_srcdir)/include/homerc.def 		\
 		$(top_srcdir)/include/version.def
 
-$(srcdir)/ntpdc-opts.c $(srcdir)/ntpdc-opts.h: $(srcdir)/ntpdc-opts.def $(std_def_list)
+$(srcdir)/ntpdc-opts.h: $(srcdir)/ntpdc-opts.c
+	@: do-nothing action to avoid default SCCS get, .h built with .c
+	
+$(srcdir)/ntpdc-opts.c: $(srcdir)/ntpdc-opts.def $(std_def_list)
 	$(run_ag) ntpdc-opts.def
 
 $(srcdir)/ntpdc.1: $(srcdir)/ntpdc-opts.def $(std_def_list)
diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index e58f662c4..a4771a6d7 100644
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -33,7 +33,10 @@ ntpq_SOURCES=	ntpq.c ntpq-subs.c ntpq-opts.c ntpq-opts.h
 
 libntpq_a_SOURCES =	libntpq.c libntpq.h libntpq_subs.c 
 
-$(srcdir)/ntpq-opts.c $(srcdir)/ntpq-opts.h: $(srcdir)/ntpq-opts.def $(std_def_list)
+$(srcdir)/ntpq-opts.h: $(srcdir)/ntpq-opts.c
+	@: do-nothing action to avoid default SCCS get, .h built with .c
+	
+$(srcdir)/ntpq-opts.c: $(srcdir)/ntpq-opts.def $(std_def_list)
 	$(run_ag) ntpq-opts.def
 
 $(srcdir)/ntpq.1: $(srcdir)/ntpq-opts.def $(std_def_list)
diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am
index c8b0fdca6..ede645205 100644
--- a/ntpsnmpd/Makefile.am
+++ b/ntpsnmpd/Makefile.am
@@ -30,7 +30,10 @@ std_def_list=	$(top_srcdir)/include/autogen-version.def 	\
 		$(top_srcdir)/include/homerc.def 		\
 		$(top_srcdir)/include/version.def
 
-$(srcdir)/ntpsnmpd-opts.c $(srcdir)/ntpsnmpd-opts.h: $(srcdir)/ntpsnmpd-opts.def $(std_def_list)
+$(srcdir)/ntpsnmpd-opts.h: $(srcdir)/ntpsnmpd-opts.c
+	@: do-nothing action to avoid default SCCS get, .h built with .c
+	
+$(srcdir)/ntpsnmpd-opts.c: $(srcdir)/ntpsnmpd-opts.def $(std_def_list)
 	$(run_ag) ntpsnmpd-opts.def
 
 $(srcdir)/ntpsnmpd.1: $(srcdir)/ntpsnmpd-opts.def $(std_def_list)
diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index b61d3c9b6..9575f41b3 100644
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -18,7 +18,7 @@ run_ag=	cd $(srcdir) &&				\
 
 bindir=	${exec_prefix}/${BINSUBDIR}
 bin_PROGRAMS=	sntp
-CLEANFILES=
+CLEANFILES=	libopts-subdir
 
 SUBDIRS=
 if NEED_LIBOPTS
@@ -125,16 +125,25 @@ $(srcdir)/../COPYRIGHT:
 $(srcdir)/COPYRIGHT: $(srcdir)/../COPYRIGHT
 	cat $(srcdir)/../COPYRIGHT > $@
 
-$(srcdir)/sntp-opts.c $(srcdir)/sntp-opts.h: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
+$(srcdir)/sntp-opts.h: $(srcdir)/sntp-opts.c
+	@: do-nothing action to avoid default SCCS get, .h built with .c
+	
+$(srcdir)/sntp-opts.c: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
 	$(run_ag) sntp-opts.def
 
 $(srcdir)/sntp.1: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
 	$(run_ag) -Tagman1.tpl -bsntp sntp-opts.def
 
 $(srcdir)/sntp-opts.texi $(srcdir)/sntp-opts.menu: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
-	$(MAKE) sntp	# aginfo.tpl runs the binary to extract --help usage text
+	$(MAKE) libopts-subdir sntp	# aginfo.tpl runs binary to extract --help usage text
 	$(run_ag) -Taginfo.tpl -DLEVEL=section sntp-opts.def
 
+libopts-subdir: $(LIBOPTS_LDADD)
+	touch $@	# LIBOPTS_LDADD is ./libopts/libopts.la if NEED_LIBOPTS
+
+libopts/libopts.la:
+	( cd libopts && $(MAKE) libopts.la )
+
 $(srcdir)/sntp.html: $(srcdir)/sntp-opts.menu $(srcdir)/sntp-opts.texi $(srcdir)/sntp.texi $(srcdir)/version.texi
 	cd $(srcdir) && makeinfo --force --html --no-split -o sntp.html sntp.texi
 
diff --git a/util/Makefile.am b/util/Makefile.am
index 8a7e7449e..f546abea7 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -32,7 +32,10 @@ std_def_list=	$(top_srcdir)/include/debug-opt.def		\
 		$(top_srcdir)/include/homerc.def 		\
 		$(top_srcdir)/include/version.def
 
-$(srcdir)/ntp-keygen-opts.c $(srcdir)/ntp-keygen-opts.h: $(srcdir)/ntp-keygen-opts.def $(std_def_list)
+$(srcdir)/ntp-keygen-opts.h: $(srcdir)/ntp-keygen-opts.c
+	@: do-nothing action to avoid default SCCS get, .h built with .c
+	
+$(srcdir)/ntp-keygen-opts.c: $(srcdir)/ntp-keygen-opts.def $(std_def_list)
 	$(run_ag) ntp-keygen-opts.def
 
 $(srcdir)/ntp-keygen.1: $(srcdir)/ntp-keygen-opts.def $(std_def_list)