Beginnings of yacc support. More for C++

diff --git a/ChangeLog b/ChangeLog
index 116bf94c00b48bd046621fb2bf20b4f4630f1707..2bfa9c7cd6e8fd5df7e1a1b961142aa5a8e19a1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 15 09:12:45 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in: (seen_prog_yacc): New variable.
+       (scan_configure): Look for yacc.
+       (handle_source_transform): Skipp C++ header files.
+       (handle_source_transform): .cxx is a C++ source file.
+
 Wed Feb 14 08:36:02 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * depend.am ($(srcdir)/.deps/.P): Use "echo", not ":".

diff --git a/NEWS b/NEWS
index c2b4883516b7f4c6f116dcd83c8f0ae1ea0916ca..93c7903fa71a0158b5050c5f2d379454087c84a4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,8 +6,8 @@ New in 0.30:
 * Doesn't print anything when running
 * Beginnings of MAINT_CHARSET support
 * Can specify version in AUTOMAKE_OPTIONS
-* Most errors recognizable by Emacs' M-x next-error.
-* Added --verbose option.
+* Most errors recognizable by Emacs' M-x next-error
+* Added --verbose option
 \f
 New in 0.29:
 * Many bug fixes

diff --git a/TODO b/TODO
index 9e20f26b9faf614f3de43f523830626408bb7b5f..2d49ce2331eecf614e02e9d7879cc962301e5148 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,6 +5,10 @@ Top priorities:
 * Rewrite clean targets.
 * Expand test suite.
 
+BUGS:
+** textutils makes uninstall do uninstall-recursive twice!?!
+** 'all-am' should depend on Makefile, etc -- not 'all'
+
 Check all require_file errors to see if any should reference a line in
 Makefile.am or configure.in.
 
@@ -67,12 +71,13 @@ Maybe introduce syntax like this:
        AUTOMAKE_OPTIONS = ../ansi2knr
 ?
 
-Consider automatic support for ".y" files.
-  [ not right now; it is nice to be able to print the number of
-    expected conflicts, and we can't handle that ]
-What about ".l" files?
-Consider supporting syntax from autoconf "derived:source", eg:
+Lex, yacc support:
+* It would be nice to automatically support using bison's better features
+  to rename the output files.  This requires autoconf support
+* Consider supporting syntax from autoconf "derived:source", eg:
        y.tab.c:perly.y
+  for yacc and lex source
+* if AC_PROG_LEX used, ensure LEXLIB is in foo_LDADD
 
 Write autoconf macro to do all work necessary for automake.  Eg define
 PACKAGE, VERSION, etc.

diff --git a/automake.in b/automake.in
index 5c11e1fc9eaa51d053237dba8ea3cfac93edadb1..135df5718516abc150495389aea7a03a69f7bf72 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -109,9 +109,12 @@ $seen_prog_install = 0;
 # 1 if any scripts installed, 0 otherwise.
 $scripts_installed = 0;
 
-# Whether AC_PATH_XTRA has been seen in configure.in
+# Whether AC_PATH_XTRA has been seen in configure.in.
 $seen_path_xtra = 0;
 
+# Whether YACC variable has been seen in configure.in.
+$seen_prog_yacc = 0;
+
 # Charsets used by maintainer and in distribution.  MAINT_CHARSET is
 # handled in a funny way: if seen in the top-level Makefile.am, it is
 # used for every directory which does not specify a different value.
@@ -449,8 +452,9 @@ sub handle_source_transform
            local (@result) = ();
            foreach (@files)
            {
-               # Skip header files.
-               next if /\.h$/;
+               # Skip header files, including C++-ish ones.
+               next if /\.[hH]$/;
+               next if /\.hxx$/;
                # Skip things that look like macro references.
                next if /^\$\(.*\)$/;
                next if /^\$\{.*\}$/;
@@ -464,6 +468,7 @@ sub handle_source_transform
 
                # Transform source files into .o files.
                s/\.cc$/$obj/g;
+               s/\.cxx$/$obj/g;
                s/\.[cCmylfs]$/$obj/g;
                push (@result, $_);
 
@@ -1656,6 +1661,12 @@ sub scan_configure
        $seen_canonical = 1 if /AC_CANONICAL_(HOST|SYSTEM)/;
        $seen_path_xtra = 1 if /AC_PATH_XTRA/;
 
+       # Sometimes it is desirable to explicitly set YACC.  For
+       # instance some people don't want to use bison.
+       $seen_prog_yacc = 1 if (/AC_PROG_YACC/
+                               || /AC_SUBST\(YACC\)/
+                               || /AC_(PATH|CHECK)_PROGS?\(YACC/);
+
        # Some things required by Automake.  FIXME We only really
        # require AC_ARG_PROGRAM if any program is installed.
        $seen_make_set = 1 if /AC_PROG_MAKE_SET/;