* automake.in (handle_source_transform): Add a pfx to used_pfx

only if it's conditional or non-empty, to reduce the number of
empty variables.  Emit _OBJECS variable based on program name if
no SOURCES were explicitly specified.

diff --git a/ChangeLog b/ChangeLog
index bfbc408a8624478f0e379a099c34c31f06460598..d81a83106ab538cdf8d38ee94e9f0670a65d4196 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-04-10  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * automake.in (handle_source_transform): Add a pfx to used_pfx
+       only if it's conditional or non-empty, to reduce the number of
+       empty variables.  Emit _OBJECS variable based on program name if
+       no SOURCES were explicitly specified.
+
        * remake-hdr.am: Create the stamp file before the header file,
        and just rename it after, so that the timestamps will be correct.
        Reported by Marc Horowitz <marc@mit.edu>

diff --git a/Makefile.in b/Makefile.in
index 4dda13adb3bc6d6d4196153e8eee275db5229b88..f48afe5868b75c04ddea570bbed9aaed020613d3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,6 +100,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =  automake aclocal
 SCRIPTS =  $(bin_SCRIPTS)
 
+DIST_SOURCES = 
 TEXI2DVI = texi2dvi
 INFO_DEPS = automake.info
 DVIS = automake.dvi
@@ -114,7 +115,7 @@ mdate-sh missing mkinstalldirs stamp-vti texinfo.tex version.texi \
 ylwrap
 
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP_ENV = --best
 all: all-redirect

diff --git a/automake.in b/automake.in
index e311c33525e1bb6b6c8c900405592565dba5a285..69f65b3f9e419c58da25013d5287678d751c3899 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1212,10 +1212,6 @@ sub handle_source_transform
        local ($var) = $prefix . $one_file . "_SOURCES";
        if (&variable_defined ($var))
        {
-           # Keep track of which prefixes we saw.
-           $used_pfx{$xpfx} = 1
-               unless $prefix =~ /EXTRA_/;
-
            push (@sources, '$(' . $prefix . $one_file . "_SOURCES)");
            push (@objects, '$(' . $xpfx . $one_file . "_OBJECTS)")
                unless $prefix =~ /EXTRA_/;
@@ -1242,10 +1238,21 @@ sub handle_source_transform
                        unless $prefix =~ /EXTRA_/;
                }
 
+               # Keep track of which prefixes we saw.
+               $used_pfx{$xpfx} = 1
+                   unless $prefix =~ /EXTRA_/;
+
                next;
            }
        }
 
+       # Avoid defining needless variables.
+       next if (scalar @files == 0);
+
+       # Keep track of which prefixes we saw.
+       $used_pfx{$xpfx} = 1
+           unless $prefix =~ /EXTRA_/;
+
        ($temp, @result) = &handle_single_transform_list ($obj, @files);
        $linker = $temp if $linker eq '';
        &define_pretty_variable ($xpfx . $one_file . "_OBJECTS", '', @result)
@@ -1260,6 +1267,10 @@ sub handle_source_transform
        push (@dist_sources, $unxformed . '.c');
        push (@objects, $unxformed . $obj);
        push (@files, $unxformed . '.c');
+
+       ($temp, @result) = &handle_single_transform_list ($obj, @files);
+       $linker = $temp if $linker eq '';
+       &define_pretty_variable ($one_file . "_OBJECTS", '', @result)
     }
     else
     {

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 6451e21c6001ffb9022f2ac683a4cb04f2539ae2..437ba4f93351599369b2d31517864d23b1482059 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -78,12 +78,13 @@ termios.m4 winsz.m4
 EXTRA_DIST = $(m4data_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
+DIST_SOURCES = 
 DATA =  $(m4data_DATA)
 
 DIST_COMMON =  $(m4data_DATA) Makefile.am Makefile.in
 
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP_ENV = --best
 all: all-redirect