From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 16 Jun 2006 22:33:41 +0000 (-0400)
Subject: Makefile.am:
X-Git-Tag: NTP_4_2_3P3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f449dc2000a5639578610c68ce7234c0d1fe7f46;p=thirdparty%2Fntp.git

Makefile.am:
  "make distcheck" is now happy with the libopts/ stuff
configure.ac, Makefile.am:
  [Bug 635] get libopts/ properly distributed
  [Bug 635] Properly distribute libopts/ .
Makefile.am:
  Distribute copyright.def and debug-opt.def
debug-opt.def:
  Change mode to -rw-rw-rw-

bk: 449331c5nCGJF3OG6v2wZ62Zt2nZrw
---

diff --git a/Makefile.am b/Makefile.am
index 3cba05a05..8e7d81abd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,82 +1,89 @@
 #AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
 AUTOMAKE_OPTIONS = util/ansi2knr foreign 1.8
-ACLOCAL_AMFLAGS= -I m4 -I sntp/libopts/m4
+ACLOCAL_AMFLAGS= -I m4 -I libopts/m4
+
+NULL=
 
 SUBDIRS=
 if NEED_LIBOPTS
-SUBDIRS+= sntp/libopts
+SUBDIRS+= libopts
 endif
-SUBDIRS+= \
-	scripts \
-	include \
+SUBDIRS+= 		\
+	scripts 	\
+	include 	\
 	ElectricFence	\
-	@ARLIB_DIR@ \
-	libntp	\
+	@ARLIB_DIR@ 	\
+	libntp		\
 	libparse	\
-	ntpd	\
-	ntpdate	\
-	ntpdc	\
-	ntpq	\
+	ntpd		\
+	ntpdate		\
+	ntpdc		\
+	ntpq		\
 	parseutil	\
 	adjtimed	\
 	clockstuff	\
-	kernel	\
-	sntp	\
-	util
-
-DIST_SUBDIRS= \
-	scripts \
-	include \
+	kernel		\
+	sntp		\
+	util		\
+	$(NULL)
+
+DIST_SUBDIRS=		\
+	scripts		\
+	include		\
 	ElectricFence	\
-	arlib \
-	libntp	\
+	arlib		\
+	libntp		\
+	libopts		\
 	libparse	\
-	ntpd	\
-	ntpdate	\
-	ntpdc	\
-	ntpq	\
+	ntpd		\
+	ntpdate		\
+	ntpdc		\
+	ntpq		\
 	parseutil	\
 	adjtimed	\
 	clockstuff	\
-	kernel	\
-	sntp	\
-	sntp/libopts	\
-	util
-DISTCHECK_CONFIGURE_FLAGS=	--with-arlib --with-sntp
-
-EXTRA_DIST = \
-	COPYRIGHT \
-	ChangeLog \
+	kernel		\
+	sntp		\
+	util		\
+	$(NULL)
+
+DISTCHECK_CONFIGURE_FLAGS=	--with-arlib --enable-local-libopts
+
+EXTRA_DIST =		\
+	COPYRIGHT	\
+	ChangeLog	\
 	ChangeLog-4.1.0 \
-	NEWS \
-	NOTES.y2kfixes \
-	README.bk \
-	README.hackers \
-	README.patches \
+	NEWS		\
+	NOTES.y2kfixes	\
+	README.bk	\
+	README.hackers	\
+	README.patches	\
 	README.refclocks \
-	README.versions \
-	TODO \
-	WHERE-TO-START \
-	bootstrap \
-	build \
-	config.guess \
-	config.h.in \
-	config.sub \
-	dot.emacs \
-	excludes \
-	flock-build \
-	install-sh \
-	packageinfo.sh \
-	readme.y2kfixes \
-	results.y2kfixes \
+	README.versions	\
+	TODO		\
+	WHERE-TO-START	\
+	bootstrap	\
+	build		\
+	config.guess	\
+	config.h.in	\
+	config.sub	\
+	dot.emacs	\
+	excludes	\
+	flock-build	\
+	install-sh	\
+	packageinfo.sh	\
+	readme.y2kfixes	\
+	results.y2kfixes	\
+	\
+	conf		\
+	html		\
+	libisc		\
+	ports		\
 	\
-	conf \
-	html \
-	libisc \
-	ports \
+	version		\
+	version.m4	\
 	\
-	version \
-	version.m4
+	$(NULL)
 
 DISTCLEANFILES = .gcc-warning
 
diff --git a/configure.ac b/configure.ac
index 74be5d39b..66946d2c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ esac
 
 AMU_OS_CFLAGS
 
-LIBOPTS_CHECK(sntp/libopts)
+LIBOPTS_CHECK(libopts)
 
 AC_MSG_CHECKING(for bin subdirectory)
 AC_ARG_WITH(binsubdir,
diff --git a/include/Makefile.am b/include/Makefile.am
index 5ce3ddcaf..4a30a8d95 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,7 @@
 #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 ETAGS_ARGS = $(srcdir)/Makefile.am
-EXTRA_DIST = version.def
+EXTRA_DIST = copyright.def debug-opt.def version.def
 
 SUBDIRS = isc
 
diff --git a/include/debug-opt.def b/include/debug-opt.def
old mode 100755
new mode 100644