Re: getting rid of DEP_FILES

[Tom Tromey]

Tom> BTW, what do you think of the appended?  This fixes a bug
Tom> that Tom Fitzsimmons noticed in the no-dist option.

adl> Looks good to me.

Here's what I'm checking in.  This includes an update to the test
case, and also fixes nodist3.test to check what it claimed to check
in the first place.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * 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.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1533
diff -u -r1.1533 automake.in
--- automake.in 1 Jan 2004 21:57:23 -0000 1.1533
+++ automake.in 2 Jan 2004 21:35:23 -0000
@@ -1821,7 +1821,7 @@
          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 @@
 
   # 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;
Index: tests/nodist3.test
===================================================================
RCS file: /cvs/automake/automake/tests/nodist3.test,v
retrieving revision 1.2
diff -u -r1.2 nodist3.test
--- tests/nodist3.test 14 Nov 2003 21:25:59 -0000 1.2
+++ tests/nodist3.test 2 Jan 2004 21:35:23 -0000
@@ -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 @@
 $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