[#229] configure* updated to 4.4.3

[thirdparty/dhcp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a6d0d9598a6385df5d86e54b28487c5460b0b483..ed692a5027ee793f3029aee48d745b0ee8003eaf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,61 @@
-EXTRA_DIST = contrib/* contrib/ms2isc/* doc/* tests/DHCPv6/* tests/failover/*
-SUBDIRS = includes common minires dst omapip client dhcpctl relay server
+#
+# automake adds dependencies that we don't like, so we explicitly remove them
+#
+Makefile:
+
+#
+# for libtool
+#
+ACLOCAL_AMFLAGS = -I m4
+
+#
+# We have a lot of files that we want shipped with the distribution.
+#
+EXTRA_DIST = RELNOTES LICENSE configure.ac+lt config+lt \
+            contrib/3.0b1-lease-convert contrib/dhclient-tz-exithook.sh \
+            contrib/dhcp.spec contrib/sethostname.sh contrib/solaris.init \
+            contrib/ms2isc/Registry.pm contrib/ms2isc/ms2isc.pl \
+            contrib/ms2isc/readme.txt contrib/ldap/dhcpd-conf-to-ldap \
+            contrib/ldap/dhcp.schema contrib/ldap/README.ldap \
+             contrib/dhcp-lease-list.pl \
+            doc/BIND-libraries doc/DHCPv4-over-DHCPv6 \
+            doc/IANA-arp-parameters doc/Makefile doc/References.html \
+            doc/References.txt doc/References.xml doc/api+protocol \
+            doc/ja_JP.eucJP/dhclient-script.8 doc/ja_JP.eucJP/dhclient.8 \
+            doc/ja_JP.eucJP/dhclient.conf.5 doc/ja_JP.eucJP/dhclient.leases.5 \
+            doc/ja_JP.eucJP/dhcp-eval.5 doc/ja_JP.eucJP/dhcp-options.5 \
+            doc/examples/dhclient-dhcpv6.conf doc/examples/dhcpd-dhcpv6.conf \
+            doc/devel/arch.dox doc/devel/atf.dox doc/devel/contrib.dox \
+            doc/devel/debug.dox doc/devel/isc-logo.jpg doc/devel/libtool.dox \
+            doc/devel/mainpage.dox doc/devel/omapi.dox doc/devel/qa.dox \
+            client/tests/Atffile common/tests/Atffile server/tests/Atffile \
+            client/tests/Kyuafile common/tests/Kyuafile server/tests/Kyuafile \
+         m4/README CONTRIBUTING.md
+
+if HAVE_BINDDIR
+EXTRA_DIST += bind/Makefile.in bind/bind.tar.gz bind/version.tmp
+endif
+
+# Use an autoconf substitution vs an automake conditional here
+# to fool automake when the bind directory does not exist.
+SUBDIRS = @BINDSUBDIR@ includes tests common omapip client dhcpctl relay server
+
+DIST_SUBDIRS = $(SUBDIRS) keama
 
 nobase_include_HEADERS = dhcpctl/dhcpctl.h
+
+#
+# distcheck tuning
+#
+
+DISTCHECK_CONFIGURE_FLAGS =  @DISTCHECK_ATF_CONFIGURE_FLAG@
+DISTCHECK_CONFIGURE_FLAGS += @DISTCHECK_LIBBIND_CONFIGURE_FLAG@
+DISTCHECK_CONFIGURE_FLAGS += @DISTCHECK_LIBTOOL_CONFIGURE_FLAG@
+
+distcheck-hook:
+if HAVE_BINDDIR
+       chmod u+w $(distdir)/bind
+endif
+
+distclean-local:
+       rm -f config.report