automake
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

99-ordering-changes.patch


From: Akim Demaille
Subject: 99-ordering-changes.patch
Date: Sun, 01 Apr 2001 21:56:29 +0200

Index: automake.in
--- automake.in Thu, 29 Mar 2001 01:43:06 +0200 akim (am/f/39_automake.i 1.229 
755)
+++ automake.in Thu, 29 Mar 2001 01:45:21 +0200 akim (am/f/39_automake.i 1.229 
755)
@@ -1290,8 +1290,58 @@ sub get_object_extension
 # Call finish function for each language that was used.
 sub handle_languages
 {
-    my ($ltcompile, $ltlink) = &libtool_compiler;
+    if ($use_dependencies)
+    {
+       # Include auto-dep code.  Don't include it if DEP_FILES would
+       # be empty.
+       if (&saw_sources_p (0) && keys %dep_files)
+       {
+           my $config_aux_dir_specified = ($config_aux_dir ne '.'
+                                           && $config_aux_dir ne '');
+
+           # Set $require_file_found{'depcomp'} if the depcomp file exists,
+           # before calling require_config_file on `depcomp'.  This makes
+           # require_file_internal skip its buggy existence test that would
+           # make automake fail (with `required file `lib/depcomp' not found')
+           # when AC_CONFIG_AUX_DIR is not set.  See tests/subdir4.test.
+           my $depcomp_dir = ($config_aux_dir_specified ? $config_aux_dir
+                              : '.');
+           $require_file_found{'depcomp'} = 1 if -f "$depcomp_dir/depcomp";
+
+           # Set location of depcomp.
+           my $prefix = ($config_aux_dir_specified ? $config_aux_dir
+                         : '$(top_srcdir)');
+
+           &define_variable ('depcomp', "\$(SHELL) $prefix/depcomp");
+
+           &require_config_file ($FOREIGN, 'depcomp');
+
+           my @deplist = sort keys %dep_files;
+
+           # We define this as a conditional variable because BSD
+           # make can't handle backslashes for continuing comments on
+           # the following line.
+           &define_pretty_variable ('DEP_FILES', 'AMDEP_TRUE', @deplist);
+
+           # Generate each `include' individually.  Irix 6 make will
+           # not properly include several files resulting from a
+           # variable expansion; generating many separate includes
+           # seems safest.
+           $output_rules .= "\n";
+           foreach my $iter (@deplist)
+           {
+               $output_rules .= '@AMDEP_TRUE@@_am_include@ ' . $iter . "\n";
+           }
+
+           $output_rules .= &file_contents ('depend');
+       }
+    }
+    else
+    {
+       &define_variable ('depcomp', '');
+    }

+    my ($ltcompile, $ltlink) = &libtool_compiler;
     my %done;

     # Is the c linker needed?
@@ -1383,56 +1433,6 @@ sub handle_languages
                          $ltlink . '$(CCLD) $(AM_CFLAGS) $(CFLAGS) 
$(AM_LDFLAGS) $(LDFLAGS) -o $@');
     }

-    if ($use_dependencies)
-    {
-       # Include auto-dep code.  Don't include it if DEP_FILES would
-       # be empty.
-       if (&saw_sources_p (0) && keys %dep_files)
-       {
-           my $config_aux_dir_specified = ($config_aux_dir ne '.'
-                                           && $config_aux_dir ne '');
-
-           # Set $require_file_found{'depcomp'} if the depcomp file exists,
-           # before calling require_config_file on `depcomp'.  This makes
-           # require_file_internal skip its buggy existence test that would
-           # make automake fail (with `required file `lib/depcomp' not found')
-           # when AC_CONFIG_AUX_DIR is not set.  See tests/subdir4.test.
-           my $depcomp_dir = ($config_aux_dir_specified ? $config_aux_dir
-                              : '.');
-           $require_file_found{'depcomp'} = 1 if -f "$depcomp_dir/depcomp";
-
-           # Set location of depcomp.
-           my $prefix = ($config_aux_dir_specified ? $config_aux_dir
-                         : '$(top_srcdir)');
-
-           &define_variable ('depcomp', "\$(SHELL) $prefix/depcomp");
-
-           &require_config_file ($FOREIGN, 'depcomp');
-
-           my @deplist = sort keys %dep_files;
-
-           # We define this as a conditional variable because BSD
-           # make can't handle backslashes for continuing comments on
-           # the following line.
-           &define_pretty_variable ('DEP_FILES', 'AMDEP_TRUE', @deplist);
-
-           # Generate each `include' individually.  Irix 6 make will
-           # not properly include several files resulting from a
-           # variable expansion; generating many separate includes
-           # seems safest.
-           $output_rules .= "\n";
-           foreach my $iter (@deplist)
-           {
-               $output_rules .= '@AMDEP_TRUE@@_am_include@ ' . $iter . "\n";
-           }
-
-           $output_rules .= &file_contents ('depend');
-       }
-    }
-    else
-    {
-       &define_variable ('depcomp', '');
-    }

     foreach my $lang (values %languages)
     {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]