* automake.in (&handle_languages): `ext-compile.am' and

`depend2.am' are now equivalent for generic rules: output only the
latter.
* ext-compile.am: Remove.

diff --git a/ChangeLog b/ChangeLog
index b8d52ca71e88f144d61460489c4c5bdf72a39d82..080f0af7a7961cbf14d919e9b89d8bf0542a49cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-08  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&handle_languages): `ext-compile.am' and
+       `depend2.am' are now equivalent for generic rules: output only the
+       latter.
+       * ext-compile.am: Remove.
+
 2001-05-08  Akim Demaille  <akim@epita.fr>
 
        Note: This patch breaks Automake.  Repaired within two patches.
@@ -80,7 +87,7 @@
 
        * automake.texi (Dist): Document distcheck-hook.
 
-       * tests/confh4.test: Updated to reflect DEFS change.
+       * tests/confh4.test: Update to reflect DEFS change.
        For PR automake/132.
 
        Fix for PR automake/132:

diff --git a/Makefile.am b/Makefile.am
index bc535a7f688e1727fc87dd34e77ffee23bb95308..152646e9b81c2ade09909c3578608d7a8d421177 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,8 @@ amdir = $(pkgdatadir)/am
 
 dist_am_DATA = ansi2knr.am check.am clean-hdr.am clean.am compile.am \
 configure.am data.am dejagnu.am depend.am depend2.am distdir.am \
-ext-compile.am footer.am header-vars.am header.am install.am java.am \
-lex.am library.am libs.am libtool.am lisp.am ltlib.am ltlibrary.am \
+footer.am header-vars.am header.am install.am java.am lex.am \
+library.am libs.am libtool.am lisp.am ltlib.am ltlibrary.am \
 mans-vars.am mans.am multilib.am program.am progs.am python.am \
 remake-hdr.am scripts.am subdirs.am tags.am texi-vers.am texibuild.am \
 texinfos.am yacc.am

diff --git a/Makefile.in b/Makefile.in
index 4b2d010615d17c92bc18ef3bf1d47af8f72a2550..66466940446cb28a7cc29469b6c53f1540d23c1a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,8 +85,8 @@ amdir = $(pkgdatadir)/am
 
 dist_am_DATA = ansi2knr.am check.am clean-hdr.am clean.am compile.am \
 configure.am data.am dejagnu.am depend.am depend2.am distdir.am \
-ext-compile.am footer.am header-vars.am header.am install.am java.am \
-lex.am library.am libs.am libtool.am lisp.am ltlib.am ltlibrary.am \
+footer.am header-vars.am header.am install.am java.am lex.am \
+library.am libs.am libtool.am lisp.am ltlib.am ltlibrary.am \
 mans-vars.am mans.am multilib.am program.am progs.am python.am \
 remake-hdr.am scripts.am subdirs.am tags.am texi-vers.am texibuild.am \
 texinfos.am yacc.am

diff --git a/automake.in b/automake.in
index 55e829ab391a776eeefa17bff7da8d2b195bf1eb..405faf017d5835618cbe283ef386a5a4afb9d534 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1398,42 +1398,35 @@ sub handle_languages
          if (! $output_flag
              && $lang->flags eq 'CFLAGS'
              && defined $options{'subdir-objects'});
+       my $AMDEP = (($use_dependencies && $lang->autodep ne 'no')
+                    ? 'AMDEP' : 'FALSE');
 
        my %transform = ('EXT'     => $ext,
                         'PFX'     => $pfx,
                         'FPFX'    => $fpfx,
                         'LIBTOOL' => $seen_libtool,
-                        'AMDEP'   => $use_dependencies ? 'AMDEP' : 'FALSE',
+                        'AMDEP'   => $AMDEP,
                         '-c'      => $lang->compile_flag || '',
                         '-o'      => $output_flag);
 
-       # First include code for ordinary objects.
-       {
-         my %transform = (%transform,
-                          'GENERIC'   => 1,
-
-                          'BASE'      => '$*',
-                          'SOURCE'    => '$<',
-                          'OBJ'       => '$@',
-                          'OBJOBJ'    => '$@',
-                          'LTOBJ'     => '$@',
-
-                          'COMPILE'   => '$(' . $lang->compiler . ')',
-                          'LTCOMPILE' => '$(LT' . $lang->compiler . ')');
-
-
-         # Generate the appropriate rules for this extension.  If
-         # dependency tracking was requested, and this extension
-         # supports it, then we don't generate the rule here.
-         if ($use_dependencies && $lang->autodep ne 'no')
-           {
-             $output_rules .= file_contents ('depend2', %transform);
-           }
-         elsif (defined $lang->compile)
-           {
-             $output_rules .= file_contents ('ext-compile', %transform);
-           }
-       }
+       # Generate the appropriate rules for this extension.
+       if ($use_dependencies && $lang->autodep ne 'no'
+           || defined $lang->compile)
+         {
+           $output_rules .=
+             file_contents ('depend2',
+                            %transform,
+                            'GENERIC'   => 1,
+
+                            'BASE'      => '$*',
+                            'SOURCE'    => '$<',
+                            'OBJ'       => '$@',
+                            'OBJOBJ'    => '$@',
+                            'LTOBJ'     => '$@',
+
+                            'COMPILE'   => '$(' . $lang->compiler . ')',
+                            'LTCOMPILE' => '$(LT' . $lang->compiler . ')');
+         }
 
        # Then handle files with specific flags.
         if ($lang->autodep ne 'no')
@@ -1459,19 +1452,20 @@ sub handle_languages
                # Generate a transform which will turn suffix targets in
                # depend2.am into real targets for the particular objects we
                # are building.
-               $output_rules .= &file_contents ('depend2',
-                                                (%transform,
-                                                 'GENERIC'   => 0,
-
-                                                 'BASE'      => $obj,
-                                                 'SOURCE'    => $source,
-                                                 'OBJ'       => "$obj.o",
-                                                 'OBJOBJ'    => "$obj.obj",
-                                                 'LTOBJ'     => "$obj.lo",
-
-                                                 'COMPILE'   => $obj_compile,
-                                                 'LTCOMPILE' => $obj_ltcompile))
-             }
+               $output_rules .=
+                 file_contents ('depend2',
+                                (%transform,
+                                 'GENERIC'   => 0,
+
+                                 'BASE'      => $obj,
+                                 'SOURCE'    => $source,
+                                 'OBJ'       => "$obj.o",
+                                 'OBJOBJ'    => "$obj.obj",
+                                 'LTOBJ'     => "$obj.lo",
+
+                                 'COMPILE'   => $obj_compile,
+                                 'LTCOMPILE' => $obj_ltcompile))
+               }
          }
 
        # The rest of the loop is done once per language.

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index bc535a7f688e1727fc87dd34e77ffee23bb95308..152646e9b81c2ade09909c3578608d7a8d421177 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -15,8 +15,8 @@ amdir = $(pkgdatadir)/am
 
 dist_am_DATA = ansi2knr.am check.am clean-hdr.am clean.am compile.am \
 configure.am data.am dejagnu.am depend.am depend2.am distdir.am \
-ext-compile.am footer.am header-vars.am header.am install.am java.am \
-lex.am library.am libs.am libtool.am lisp.am ltlib.am ltlibrary.am \
+footer.am header-vars.am header.am install.am java.am lex.am \
+library.am libs.am libtool.am lisp.am ltlib.am ltlibrary.am \
 mans-vars.am mans.am multilib.am program.am progs.am python.am \
 remake-hdr.am scripts.am subdirs.am tags.am texi-vers.am texibuild.am \
 texinfos.am yacc.am