Don't distribute BUILT_SOURCES or DATA

diff --git a/ChangeLog b/ChangeLog
index 5cfa43bf70ed57ec5be94ebdb6222c3e963945ee..8661b780b3305a4e1867e9ec2ccc3878de8bdda8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Sep 17 23:35:14 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * Makefile.am (EXTRA_DIST): Include pkgdata_DATA.
+
+       * dist-vars.am (DISTFILES): Don't distribute BUILT_SOURCES or
+       DATA.
+       (DEP_DISTFILES): Ditto.
+
 Mon Sep 16 22:28:56 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (check_typos): Renamed.

diff --git a/Makefile.am b/Makefile.am
index 8f2a1d6d9397a4b9431effed28d362ed3b9e7cae..2ad35ce0820c562e2161f4e8cfc3591f41877d7a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,6 @@ SUBDIRS = tests m4
 
 bin_SCRIPTS = automake aclocal
 info_TEXINFOS = automake.texi
-# SUBDIRS = intl po
-# CONFIG_HEADER = config.h
 
 pkgdata_DATA = clean-kr.am clean.am compile-kr.am compile-vars.am \
 compile.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am \
@@ -23,7 +21,8 @@ ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
 ## These must all be executable when installed.
 pkgdata_SCRIPTS = config.guess config.sub install-sh interlock mdate-sh \
 mkinstalldirs elisp-comp ylwrap acinstall
-EXTRA_DIST = acinstall
+
+EXTRA_DIST = acinstall $(pkgdata_DATA)
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = automake.in aclocal.in --lang=none \
@@ -38,6 +37,12 @@ installcheck-local:
          $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \
        done
 
+################################################################
+##
+## Everything past here is useful to the maintainer, but probably not
+## to anybody else
+##
+
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal

diff --git a/Makefile.in b/Makefile.in
index eaa619d6db01ea47d806039ef3e541417a758451..b67ccd195cf9090528de141edc3d5b248d7e20d5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,8 +46,6 @@ SUBDIRS = tests m4
 
 bin_SCRIPTS = automake aclocal
 info_TEXINFOS = automake.texi
-# SUBDIRS = intl po
-# CONFIG_HEADER = config.h
 
 pkgdata_DATA = clean-kr.am clean.am compile-kr.am compile-vars.am \
 compile.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am \
@@ -60,7 +58,8 @@ ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
 
 pkgdata_SCRIPTS = config.guess config.sub install-sh interlock mdate-sh \
 mkinstalldirs elisp-comp ylwrap acinstall
-EXTRA_DIST = acinstall
+
+EXTRA_DIST = acinstall $(pkgdata_DATA)
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = automake.in aclocal.in --lang=none \
@@ -311,7 +310,7 @@ dist: distdir
 distdir: $(DEP_DISTFILES)
        @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
          echo "NEWS not updated; not releasing" 1>&2; \
-         exit 1;                               \
+         exit 1; \
        fi
        rm -rf $(distdir)
        mkdir $(distdir)
@@ -372,11 +371,11 @@ mostlyclean-generic:
 
 clean-generic:
        test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 distclean-generic:
        rm -f Makefile $(DISTCLEANFILES)
        rm -f config.cache config.log $(CONFIG_HEADER) stamp-h
+       test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
@@ -428,6 +427,8 @@ installcheck-local:
          $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \
        done
 
+################################################################
+
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal

diff --git a/NEWS b/NEWS
index 3d380bcc6299f17efa0dc53fa49bcaa1094035a8..71d17b82a31fbe7c0c189930d2bf766700edd4af 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ New in 1.1e:
 * Will interpolate $(...) and ${...} when examining contents of a variable
 * .deps files now in build directory, not source directory; dependency
   handling generally rewritten
+* DATA and BUILT_SOURCES no longer included in distribution
 \f
 New in 1.0:
 * Bug fixes

diff --git a/automake.texi b/automake.texi
index a20ee721263dd04365aa5f0f858dfba1142e541a..7664c8f19245d13fd0245e2f773d7ee50f29aec6 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1171,7 +1171,7 @@ Such data can be installed in the directories @code{datadir},
 @code{sysconfdir}, @code{sharedstatedir}, @code{localstatedir}, or
 @code{pkgdatadir}.
 
-All such data files are included in the distribution.
+By default, data files are not included in a distribution.
 
 Here is how @code{automake} installs its auxiliary data files:
 
@@ -1195,8 +1195,8 @@ should be listed in the @code{BUILT_SOURCES} variable.
 @vindex BUILT_SOURCES
 
 Files listed in @code{BUILT_SOURCES} are built before any automatic
-dependency tracking is done.  Built sources are included in a
-distribution.
+dependency tracking is done.  By default, built sources are not included
+in a distribution.
 
 
 @node Other GNU Tools

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 8f2a1d6d9397a4b9431effed28d362ed3b9e7cae..2ad35ce0820c562e2161f4e8cfc3591f41877d7a 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -8,8 +8,6 @@ SUBDIRS = tests m4
 
 bin_SCRIPTS = automake aclocal
 info_TEXINFOS = automake.texi
-# SUBDIRS = intl po
-# CONFIG_HEADER = config.h
 
 pkgdata_DATA = clean-kr.am clean.am compile-kr.am compile-vars.am \
 compile.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am \
@@ -23,7 +21,8 @@ ansi2knr.1 aclocal.m4 lisp.am lisp-clean.am
 ## These must all be executable when installed.
 pkgdata_SCRIPTS = config.guess config.sub install-sh interlock mdate-sh \
 mkinstalldirs elisp-comp ylwrap acinstall
-EXTRA_DIST = acinstall
+
+EXTRA_DIST = acinstall $(pkgdata_DATA)
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = automake.in aclocal.in --lang=none \
@@ -38,6 +37,12 @@ installcheck-local:
          $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \
        done
 
+################################################################
+##
+## Everything past here is useful to the maintainer, but probably not
+## to anybody else
+##
+
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal

diff --git a/version.texi b/version.texi
index 7dbe3f7f84a0d8b1595a3847a46e3bb420c7ae6e..cc88283f9ee2da8ab968da9608250edd9d132b61 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 12 September 1996
+@set UPDATED 17 September 1996
 @set EDITION 1.1f
 @set VERSION 1.1f