Don't apply the default %destructor or %printer to the error token,

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3c9e5695b848b443017389f190f0be971a988c6d..1a00d5c7f2b1fe0899381a9f84e68a666d3b3b87 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301  USA
 
-DEFS = @DEFS@ \
-  -DPKGDATADIR=\"$(pkgdatadir)\" \
-  -DLOCALEDIR=\"$(datadir)/locale\"
+DEFS += -DPKGDATADIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(datadir)/locale\"
 
 AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib
@@ -33,7 +31,7 @@ bin_PROGRAMS = bison
 bin_SCRIPTS = $(YACC_SCRIPT)
 EXTRA_SCRIPTS = yacc
 
-bison_SOURCES =                                  \
+bison_SOURCES =                                          \
        LR0.c LR0.h                               \
        assoc.c assoc.h                           \
        closure.c closure.h                       \
@@ -41,6 +39,7 @@ bison_SOURCES =                                 \
        conflicts.c conflicts.h                   \
        derives.c derives.h                       \
        files.c files.h                           \
+       flex-scanner.h                            \
        getargs.c getargs.h                       \
        gram.c gram.h                             \
        lalr.h lalr.c                             \
@@ -54,9 +53,11 @@ bison_SOURCES =                                \
        print_graph.c print_graph.h               \
        reader.c reader.h                         \
        reduce.c reduce.h                         \
+       revision.c revision.h                     \
        relation.c relation.h                     \
-       scan-gram.l                               \
-       scan-skel.l                               \
+       scan-code.h scan-code-c.c                 \
+       scan-gram.h scan-gram-c.c                 \
+       scan-skel.h scan-skel-c.c                 \
        state.c state.h                           \
        symlist.c symlist.h                       \
        symtab.c symtab.h                         \
@@ -66,14 +67,62 @@ bison_SOURCES =                               \
        vcg.c vcg.h                               \
        vcg_defaults.h
 
-BUILT_SOURCES = scan-skel.c scan-gram.c parse-gram.c parse-gram.h
+EXTRA_bison_SOURCES = scan-code.l scan-skel.l scan-gram.l
+
+BUILT_SOURCES =                                        \
+parse-gram.c parse-gram.h                      \
+revision.c                                     \
+scan-code.c                                    \
+scan-skel.c                                    \
+scan-gram.c
 
 MOSTLYCLEANFILES = yacc
 
 yacc:
        echo '#! /bin/sh' >$@
-       echo 'exec $(bindir)/bison -y "$$@"' >>$@
+       echo "exec '$(bindir)/bison' -y \"$$@\"" >>$@
        chmod a+x $@
 
 echo:
        echo $(bison_SOURCES) $(noinst_HEADERS)
+
+revision.c: $(top_srcdir)/configure $(top_srcdir)/ChangeLog
+       case "$(VERSION)" in \
+         *+*) sed -n \
+           's/^\$$\(Id.*\)\$$$$/const char *revision = "\1\\n";/p' \
+           $(top_srcdir)/ChangeLog \
+           ;; \
+         *) echo 'const char *revision = "";' \
+           ;; \
+       esac >$@
+
+# The following rule is not designed to be portable,
+# and relies on tools that not everyone has.
+
+# Most functions in src/*.c should have static scope.
+# Any that don't must be marked with `extern', but `main'
+# and `usage' are exceptions.  They're always extern, but
+# don't need to be marked.
+#
+# The second nm|grep checks for file-scope variables with `extern' scope.
+sc_tight_scope: $(all_programs)
+       @t=exceptions-$$$$;                                             \
+       trap 's=$$?; rm -f $$t; exit $$s' 0 1 2 13 15;                  \
+       ( printf '^main$$\n^usage$$\n';                                 \
+         grep -h -A1 '^extern .*[^;]$$' $(SOURCES)                     \
+           | grep -vE '^(extern |--)' |sed 's/^/^/;s/ .*/$$/' ) > $$t; \
+       if nm -e *.$(OBJEXT)                                            \
+           | sed -n 's/.* T //p'                                       \
+           | grep -Ev -f $$t; then                                     \
+         echo 'the above functions should have static scope' 1>&2;     \
+         exit 1;                                                       \
+       fi;                                                             \
+       ( printf '^program_name$$\n';                                   \
+         sed -n 's/^extern .*[* ]\([a-zA-Z_][a-zA-Z_0-9]*\);$$/^\1$$/p' \
+           $$(ls $(SOURCES) | grep '\.h$$') /dev/null) > $$t;          \
+       if nm -e *.$(OBJEXT)                                            \
+           | sed -n 's/.* [BD] //p'                                    \
+           | grep -Ev -f $$t; then                                     \
+         echo 'the above variables should have static scope' 1>&2;     \
+         exit 1;                                                       \
+       fi