* automake.in (handle_source_transform): Don't generate dist

	variables when no-dist is set.
	(generate_makefile): Likewise.
	* tests/nodist3.test: Ensure that DIST_SOURCES is not created,
	and that dist target does not exist.
        Reported by Tom Fitzsimmons.

diff --git a/ChangeLog b/ChangeLog
index 29e564274c5d4bab99948dd3b0eacde3a0709306..c2cb450630700c94f23b872743de56e56e6e6db2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-02  Tom Tromey  <tromey@redhat.com>
+
+       * automake.in (handle_source_transform): Don't generate dist
+       variables when no-dist is set.
+       (generate_makefile): Likewise.
+       * tests/nodist3.test: Ensure that DIST_SOURCES is not created,
+       and that dist target does not exist.
+        Reported by Tom Fitzsimmons.
+
 2004-01-02  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * tests/libtool5.test, tests/ltcond.test, tests/ltcond2.test,

diff --git a/automake.in b/automake.in
index dc54b44577afa183ae6ece10f8180b5f7680af70..dd850d689d5ceac57cb9d50d7fbf2c13d238867e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1821,7 +1821,7 @@ sub handle_source_transform ($$$$%)
          unless $prefix =~ /EXTRA_/;
 
        push @sources, "\$($varname)";
-       if ($prefix !~ /^nodist_/)
+       if (! option 'no-dist' && $prefix !~ /^nodist_/)
          {
            # If the VAR wasn't defined conditionally, we add
            # it to DIST_SOURCES as is.  Otherwise we create a
@@ -6896,7 +6896,10 @@ sub generate_makefile ($$)
 
   # Variables used by distdir.am and tags.am.
   define_pretty_variable ('SOURCES', TRUE, INTERNAL, @sources);
-  define_pretty_variable ('DIST_SOURCES', TRUE, INTERNAL, @dist_sources);
+  if (! option 'no-dist')
+    {
+      define_pretty_variable ('DIST_SOURCES', TRUE, INTERNAL, @dist_sources);
+    }
 
   handle_multilib;
   handle_texinfo;

diff --git a/tests/nodist3.test b/tests/nodist3.test
index 8506ffd88e10cc6ed773c4ce33a3ab27b4b9d9cd..13c4115f0a45e460ff6298f0bcede77d449a4786 100755 (executable)
--- a/tests/nodist3.test
+++ b/tests/nodist3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -35,6 +35,7 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-grep '^dist:' Makefile.in
+grep '^dist:' Makefile.in && exit 1
+grep '^DIST_SOURCES =' Makefile.in && exit 1
 
 exit 0