From: Dave Hart <hart@ntp.org>
Date: Fri, 8 Jan 2010 19:11:53 +0000 (+0000)
Subject: Makefile.am:
X-Git-Tag: NTP_4_2_7P8~1^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da69df8bbad5face72e2deac42ddfac1313329ba;p=thirdparty%2Fntp.git

Makefile.am:
  add dependencies on copyright.def
  correct dependencies to refer to $(srcdir)/version.def not
    $(srcdir)/../include/version.def
  add COPYRIGHT to BUILT_SOURCES, correct EXTRA_DIST reference to
    remove unneeded $(srcdir)/ prefix

bk: 4b478379_82qNNa26B2q1l6JE3n4Cw
---

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index c2527cd00..d07857132 100644
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -50,7 +50,7 @@ sntp_SOURCES =		\
 EXTRA_DIST=				\
 		autogen-version.def	\
 		bincheck.mf		\
-		$(srcdir)/COPYRIGHT	\
+		COPYRIGHT		\
 		deps-ver		\
 		depsver.mf		\
 		sntp-opts.def		\
@@ -71,6 +71,7 @@ BUILT_SOURCES=						\
 		check-autogen-version.def		\
 		check-version.def check-version.m4	\
 		check-version.texi			\
+		$(srcdir)/COPYRIGHT			\
 		libtool					\
 		sntp-opts.c				\
 		sntp-opts.h				\
@@ -130,16 +131,16 @@ $(srcdir)/COPYRIGHT: $(srcdir)/../COPYRIGHT
 $(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
+$(srcdir)/sntp-opts.c: $(srcdir)/sntp-opts.def $(srcdir)/version.def $(srcdir)/../include/copyright.def
 	$(run_ag) sntp-opts.def
 
-$(srcdir)/sntp.1: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
+$(srcdir)/sntp.1: $(srcdir)/sntp-opts.def $(srcdir)/version.def $(srcdir)/../include/copyright.def
 	$(run_ag) -Tagman1.tpl -bsntp sntp-opts.def
 
 $(srcdir)/sntp-opts.menu: $(srcdir)/sntp-opts.texi
 	@: do-nothing action to avoid default SCCS get, .menu built with .texi
 	
-$(srcdir)/sntp-opts.texi: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
+$(srcdir)/sntp-opts.texi: $(srcdir)/sntp-opts.def $(srcdir)/version.def $(srcdir)/../include/copyright.def
 	$(run_ag) -Taginfo.tpl -DLEVEL=section sntp-opts.def
 
 $(srcdir)/sntp.html: $(srcdir)/sntp-opts.menu $(srcdir)/sntp-opts.texi $(srcdir)/sntp.texi $(srcdir)/version.texi