Reworked 'all' target handling.

diff --git a/automake.in b/automake.in
index ebc442bbe2226c2e6d9ead8a61e2474e93918096..252cac4dcb98b58dd2ea9e458b3c8474d61479d8 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -73,7 +73,7 @@ $output_directory = '.';
 
 @info = ();
 @dvi = ();
-@all = ('${ALL}');
+@all = ();
 @check = ();
 @clean = ();
 
@@ -232,7 +232,7 @@ sub generate_makefile
     $recursive_install = 0;
     @info = ();
     @dvi = ();
-    @all = ('${ALL}');
+    @all = ();
     @check = ();
     @clean = ();
 
@@ -402,6 +402,7 @@ sub handle_programs
        push (@uninstall, 'uninstall-programs');
        push (@clean, 'programs');
        push (@installdirs, '$(bindir)');
+       push (@all, '$(PROGRAMS)');
     }
     if ($libprograms)
     {
@@ -410,6 +411,7 @@ sub handle_programs
        push (@uninstall, 'uninstall-libprograms');
        push (@clean, 'libprograms');
        push (@installdirs, '$(libexecdir)');
+       push (@all, '$(LIBPROGRAMS)');
     }
 
     # Handle linking.
@@ -464,6 +466,7 @@ sub handle_libraries
     push (@install_exec, 'install-libraries');
     push (@uninstall, 'uninstall-libraries');
     push (@clean, 'libraries');
+    push (@all, '$(LIBFILES)');
 }
 
 # Handle scripts.
@@ -478,6 +481,7 @@ sub handle_scripts
        push (@uninstall, 'uninstall-scripts');
        push (@clean, 'scripts');
        push (@installdirs, '$(bindir)');
+       push (@all, '$(SCRIPTS)');
     }
 
     if ($libscripts)
@@ -487,6 +491,7 @@ sub handle_scripts
        push (@uninstall, 'uninstall-libscripts');
        push (@clean, 'libscripts');
        push (@installdirs, '$(libexecdir');
+       push (@all, '$(LIBSCRIPTS)');
     }
 }