More fixes for uniform naming

diff --git a/ChangeLog b/ChangeLog
index 6e55cf83c5adfc0b46faca0001015be874723c47..9381ab023842b20dd700dc07a4cbc5a80c67c08e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Fri Dec  8 16:30:48 1995  Tom Tromey  <tromey@cambric.colorado.edu>
        * depend.am (DEP_FILES): Handle deANSIfication case.  From Jim
        Meyering.
 
+
+       * automake.in (am_install_var): Changed how 'clean' handled for
+       uniform name targets.
        * Makefile.am (pkgdata_DATA): Added new files.
        * data-clean.am: New file.
        * scripts-clean.am: New file.

diff --git a/Makefile.in b/Makefile.in
index 31ba00aed7512d864a9e69be56ec3dd2a4eb44ec..563624d5f29e9834b78af65a1f0f5865e1561927 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,11 +58,13 @@ libraries.am library.am mans-vars.am \
 program.am programs.am remake-hdr.am \
 remake-subd.am remake.am scripts.am subdirs.am tags.am tags-subd.am \
 tags-clean.am \
-texi-clean.am texi-version.am texinfos-vars.am texinfos.am
+texi-clean.am texi-version.am texinfos-vars.am texinfos.am \
+libraries-clean.am scripts-clean.am programs-clean.am data-clean.am
 
 DIST_OTHER = automake.in
 
-ETAGS_ARGS = automake.in --lang=none --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi
+ETAGS_ARGS = automake.in --lang=none \
+ --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi
 
 
 SCRIPTS = $(bin_SCRIPTS)

diff --git a/automake.in b/automake.in
index c341101736f169c5e6935b23acd0d970cb8adabb..acba27e63574134de8cb8b85551c3325f5967b2d 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1283,6 +1283,9 @@ sub am_variable
 # avoid typos (eg 'bni_PROGRAMS' should give error).  Returns list of
 # all values of all _HOW targets.
 #
+# FIXME this should be rewritten to be cleaner.  It should be broken
+# up into multiple functions.
+#
 # Usage is: am_install_var (OPTION..., file, HOW, where...)
 sub am_install_var
 {
@@ -1311,6 +1314,7 @@ sub am_install_var
     local (@result) = ();
 
     local ($template) = &file_contents ($file);
+    local ($clean_templ) = &file_contents ($file . '-clean');
     local ($munge);
     local ($one_name);
     foreach (@prefixes)
@@ -1321,7 +1325,13 @@ sub am_install_var
            # Append actual contents to result.
            push (@result, split (/\s+/, $contents{$one_name}));
 
-           push (@clean, $_ . $primary) if $do_clean;
+           if ($do_clean)
+           {
+               ($munge = $clean_templ) =~ s/\@DIR\@/$_/g;
+               $output_rules .= $munge;
+               push (@clean, $_ . $primary);
+           }
+
            push (@used, '$(' . $one_name . ')');
            if ($_ eq 'noinst')
            {