some patches from ian

put var index into final index
put CFLAGS into LINK

diff --git a/ChangeLog b/ChangeLog
index 0b21a9ec3d97527046b596ef3a2f7de52040712e..681b1352e39ea6cd2b6d56e3dcfc55010ddc5ef9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
+Wed Apr 30 19:15:47 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_yacc_lex_cxx): Include CXXFLAGS in CXXLINK.
+       (handle_yacc_lex_cxx): Include CFLAGS in LINK.
+
 Wed Apr 30 14:46:37 1997  Ian Lance Taylor  <ian@cygnus.com>
 
+       * automake.in (handle_dist_worker): When building a distribution,
+       if SUBDIRS is defined conditionaly, recur into each possible
+       subdirectory.
+
        * clean.am (distclean-generic): Remove stamp-h[0-9]*.
 
 Tue Apr 29 19:11:45 1997  Tom Tromey  <tromey@cygnus.com>

diff --git a/automake.in b/automake.in
index 03598f1229705f945b75dc26e248bf48487327b1..6bf90dc6f4db37c3bc7ab04dd89536553b2aa892 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -892,7 +892,7 @@ sub handle_yacc_lex_cxx
                          $ltcompile . '$(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)')
            if ($seen_libtool);
 
-       &define_variable ('CXXLINK', $ltlink . '$(CXX) $(LDFLAGS) -o $@');
+       &define_variable ('CXXLINK', $ltlink . '$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@');
 
        local ($ext);
        foreach $ext (@cxx_list)
@@ -943,7 +943,7 @@ sub handle_yacc_lex_cxx
                          $ltcompile .
                          '$(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)')
            if ($seen_libtool);
-       &define_variable ('LINK', $ltlink . '$(CC) $(LDFLAGS) -o $@');
+       &define_variable ('LINK', $ltlink . '$(CC) $(CFLAGS) $(LDFLAGS) -o $@');
 
        if (! defined $configure_vars{'CC'})
        {
@@ -2341,13 +2341,30 @@ sub handle_dist_worker
     # recursive build.
     if (&variable_defined ('SUBDIRS'))
     {
+       # If SUBDIRS is conditionally defined, then set DIST_SUBDIRS
+       # to all possible directories, and use it.
+       if (! &variable_conditions ('SUBDIRS'))
+       {
+           $dist_subdir_name = 'SUBDIRS';
+       }
+       else
+       {
+           $dist_subdir_name = 'DIST_SUBDIRS';
+           if (! &variable_defined ('DIST_SUBDIRS'))
+           {
+               &define_pretty_variable ('DIST_SUBDIRS', '',
+                                        &variable_value_as_list ('SUBDIRS',
+                                                                 'all'));
+           }
+       }
+
        # Test for directory existence here because previous automake
        # invocation might have created some directories.  Note that
        # we explicitly set distdir for the subdir make; that lets us
        # mix-n-match many automake-using packages into one large
        # package, and have "dist" at the top level do the right
        # thing.
-       $output_rules .= '      for subdir in $(SUBDIRS); do            \\
+       $output_rules .= '      for subdir in $(' . $dist_subdir_name . '); do          \\
          test -d $(distdir)/$$subdir           \\
          || mkdir $(distdir)/$$subdir          \\
          || exit 1;                            \\
@@ -4753,9 +4770,12 @@ sub define_variable
     }
 }
 
-# Like define_variable, but second arg is a list, and is
-# pretty-printed.  The third argument is the conditional under which
-# the value should be defined.
+# Like define_variable, but the value is a list, and the variable may
+# be defined conditionally.  The second argument is the conditional
+# under which the value should be defined; this should be the empty
+# string to define the variable unconditionally.  The third argument
+# is a list holding the values to use for the variable.  The value is
+# pretty printed in the output file.
 sub define_pretty_variable
 {
     local ($var, $cond, @value) = @_;

diff --git a/automake.texi b/automake.texi
index 943cb4817fa6329fa11fcb4552c0f31ea3fe767d..df6d5459ea4e0b20fa82ff33f1da772bdeb24fec 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -87,6 +87,7 @@ approved by the Free Software Foundation.
 @syncodeindex cv cp
 @syncodeindex op cp
 @syncodeindex tr cp
+@syncodeindex vr cp
 
 @ifinfo
 @node Top, Introduction, (dir), (dir)
@@ -2051,6 +2052,15 @@ handle files in the current directory; files in other directories will
 cause @code{make dist} runtime failures.
 @vindex EXTRA_DIST
 
+If you define @code{SUBDIRS}, automake will recursively include the
+subdirectories in the distribution.  If @code{SUBDIRS} is defined
+conditionally (@pxref{Conditionals}), automake will normally include all
+directories that could possibly appear in @code{SUBDIRS} in the
+distribution.  If you need to specify the set of directories
+conditionally, you can set the variable @code{DIST_SUBDIRS} to the exact
+list of subdirectories to include in the distribution.
+@vindex DIST_SUBDIRS
+
 Occasionally it is useful to be able to change the distribution before
 it is packaged up.  If the @code{dist-hook} target exists, it is run
 after the distribution directory is filled, but before the actual tar

diff --git a/stamp-vti b/stamp-vti
index f78d41b5f70bfa6acfac830f51da7d208b4075ec..b59fe22647fa419ec2b61de738eb3e6e468efa04 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 28 April 1997
+@set UPDATED 30 April 1997
 @set EDITION 1.1p
 @set VERSION 1.1p

diff --git a/version.texi b/version.texi
index f78d41b5f70bfa6acfac830f51da7d208b4075ec..b59fe22647fa419ec2b61de738eb3e6e468efa04 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 28 April 1997
+@set UPDATED 30 April 1997
 @set EDITION 1.1p
 @set VERSION 1.1p