ansi2knr fixes

diff --git a/ChangeLog b/ChangeLog
index 0c44144a63de324eb7aadb3c80ce82c248c1b461..7ec4edadb6b194ee68c1156a10073d02048bdf55 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Fri Nov  8 09:49:09 1996  Tom Tromey  <tromey@cygnus.com>
 
+       * compile-kr.am ($(OBJECTS)): Removed.
+
+       * automake.in (get_object_extension): Define ANSI2KNR.  Push onto
+       @all if ansi2knr is in this directory.
+
        * configure.in: Don't run AC_ARG_PROGRAM, AC_PROG_MAKE_SET.
 
        * m4/init.m4: Run AM_SANITY_CHECK.

diff --git a/TODO b/TODO
index b5cffdea8151c833d6d5cfc98edbdbd19affc1ed..1cef398ac6a1236d5e7e706683824f532742882d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -145,9 +145,6 @@ Then user must use "make -k check".  This is probably more natural.
 
 Consider: "cvs" option adds some cvs-specific rules?
 
-"Cygnus"-specific features:
-* don't force info files into srcdir; ditto lex/yacc output
-
 Automake: devo/inet/Makefile.am has "all-local".  "install" depends on
 "all", but the local installs get run before the stuff in "all".  Gross.
 

diff --git a/automake.in b/automake.in
index c5920474db19a31726d35af651252e9dad296534..9200e962dbb170cdb15bf169028ce42f10fa1307 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -643,9 +643,18 @@ sub get_object_extension
            # Make sure ansi2knr can be found: if no path specified,
            # specify "./".
            local ($apath) = $options{'ansi2knr'};
-           $apath = './' . $apath
-               unless $apath =~ /\//;
-           &define_variable ("ANSI2KNR", $apath);
+           if ($apath =~ /\//)
+           {
+               # Found in another directory.
+               &define_variable ("ANSI2KNR", $apath);
+           }
+           else
+           {
+               # Substitution from AM_C_PROTOTYPES.  This makes it be
+               # built only when necessary.
+               &define_configure_variable ('ANSI2KNR');
+               push (@all, '$(ANSI2KNR)');
+           }
 
            $output_rules .= &file_contents ('compile-kr');
            $output_rules .= &file_contents ('clean-kr');

diff --git a/compile-kr.am b/compile-kr.am
index 23ec073ca290a13e78ef18c36e5efacf642a88cb..46c75593fb529bb2a3d420535e2bc8c29bc567e7 100644 (file)
--- a/compile-kr.am
+++ b/compile-kr.am
@@ -28,5 +28,3 @@
        @echo $(COMPILE) -c $*._c
        @rm -f _$*.c
        @ln $*._c _$*.c && $(COMPILE) -c _$*.c && mv _$*.o $@ && rm _$*.c
-
-$(OBJECTS): $(ANSI2KNR)