Merge remote-tracking branch 'origin/maint'

[bison.git] / src / local.mk

diff --git a/src/local.mk b/src/local.mk
index 111f16e156cd06ecc87206763af1d1dc4a883113..53a878e02e09d3d893d40477489f25663e094505 100644 (file)
--- a/src/local.mk
+++ b/src/local.mk
@@ -1,119 +1,121 @@
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-## Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 

-## 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
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-AM_CPPFLAGS += -I$(top_srcdir)/lib
-# Find builddir/src/scan-code.c etc.
-AM_CPPFLAGS += -I$(top_builddir)
-
-LDADD = $(top_builddir)/lib/libbison.a $(LIBINTL)
-
-# Use our own Bison to build the parser.  Of course, you ought to
-# keep a sane version of Bison nearby...
-YACC = $(top_builddir)/tests/bison -y
-AM_YFLAGS = -dv --warnings=all,error --report=all
+LDADD = lib/libbison.a $(LIBINTL)

 
 bin_PROGRAMS = src/bison
 
 bin_PROGRAMS = src/bison

-bin_SCRIPTS = $(YACC_SCRIPT)
-EXTRA_SCRIPTS = src/yacc

 
 src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS)
 
 src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS)

-src_bison_SOURCES =                            \
-  src/LR0.c                                    \
-  src/LR0.h                                    \
-  src/assoc.c                                  \
-  src/assoc.h                                  \
-  src/closure.c                                        \
-  src/closure.h                                        \
-  src/complain.c                               \
-  src/complain.h                               \
-  src/conflicts.c                              \
-  src/conflicts.h                              \
-  src/derives.c                                        \
-  src/derives.h                                        \
-  src/files.c                                  \
-  src/files.h                                  \
-  src/flex-scanner.h                           \
-  src/getargs.c                                        \
-  src/getargs.h                                        \
-  src/gram.c                                   \
-  src/gram.h                                   \
-  src/graphviz.c                               \
-  src/graphviz.h                               \
-  src/lalr.c                                   \
-  src/lalr.h                                   \
-  src/location.c                               \
-  src/location.h                               \
-  src/main.c                                   \
-  src/muscle_tab.c                             \
-  src/muscle_tab.h                             \
-  src/nullable.c                               \
-  src/nullable.h                               \
-  src/output.c                                 \
-  src/output.h                                 \
-  src/parse-gram.h                             \
-  src/parse-gram.y                             \
-  src/print-xml.c                              \
-  src/print-xml.h                              \
-  src/print.c                                  \
-  src/print.h                                  \
-  src/print_graph.c                            \
-  src/print_graph.h                            \
-  src/reader.c                                 \
-  src/reader.h                                 \
-  src/reduce.c                                 \
-  src/reduce.h                                 \
-  src/relation.c                               \
-  src/relation.h                               \
-  src/scan-code-c.c                            \
-  src/scan-code.h                              \
-  src/scan-gram-c.c                            \
-  src/scan-gram.h                              \
-  src/scan-skel-c.c                            \
-  src/scan-skel.h                              \
-  src/state.c                                  \
-  src/state.h                                  \
-  src/symlist.c                                        \
-  src/symlist.h                                        \
-  src/symtab.c                                 \
-  src/symtab.h                                 \
-  src/system.h                                 \
-  src/tables.c                                 \
-  src/tables.h                                 \
-  src/uniqstr.c                                        \
+src_bison_SOURCES =                             \
+  src/AnnotationList.c                          \
+  src/AnnotationList.h                          \
+  src/InadequacyList.c                          \
+  src/InadequacyList.h                          \
+  src/LR0.c                                     \
+  src/LR0.h                                     \
+  src/Sbitset.c                                 \
+  src/Sbitset.h                                 \
+  src/assoc.c                                   \
+  src/assoc.h                                   \
+  src/closure.c                                 \
+  src/closure.h                                 \
+  src/complain.c                                \
+  src/complain.h                                \
+  src/conflicts.c                               \
+  src/conflicts.h                               \
+  src/derives.c                                 \
+  src/derives.h                                 \
+  src/files.c                                   \
+  src/files.h                                   \
+  src/flex-scanner.h                            \
+  src/getargs.c                                 \
+  src/getargs.h                                 \
+  src/gram.c                                    \
+  src/gram.h                                    \
+  src/graphviz.c                                \
+  src/graphviz.h                                \
+  src/lalr.c                                    \
+  src/lalr.h                                    \
+  src/ielr.c                                    \
+  src/ielr.h                                    \
+  src/location.c                                \
+  src/location.h                                \
+  src/main.c                                    \
+  src/muscle-tab.c                              \
+  src/muscle-tab.h                              \
+  src/named-ref.c                               \
+  src/named-ref.h                               \
+  src/nullable.c                                \
+  src/nullable.h                                \
+  src/output.c                                  \
+  src/output.h                                  \
+  src/parse-gram.y                              \
+  src/print-xml.c                               \
+  src/print-xml.h                               \
+  src/print.c                                   \
+  src/print.h                                   \
+  src/print_graph.c                             \
+  src/print_graph.h                             \
+  src/reader.c                                  \
+  src/reader.h                                  \
+  src/reduce.c                                  \
+  src/reduce.h                                  \
+  src/relation.c                                \
+  src/relation.h                                \
+  src/scan-code-c.c                             \
+  src/scan-code.h                               \
+  src/scan-gram-c.c                             \
+  src/scan-gram.h                               \
+  src/scan-skel-c.c                             \
+  src/scan-skel.h                               \
+  src/state.c                                   \
+  src/state.h                                   \
+  src/symlist.c                                 \
+  src/symlist.h                                 \
+  src/symtab.c                                  \
+  src/symtab.h                                  \
+  src/system.h                                  \
+  src/tables.c                                  \
+  src/tables.h                                  \
+  src/uniqstr.c                                 \

   src/uniqstr.h
 
   src/uniqstr.h
 

-EXTRA_src_bison_SOURCES =                      \
-  src/scan-code.l                              \
-  src/scan-gram.l                              \
+EXTRA_src_bison_SOURCES =                       \
+  src/scan-code.l                               \
+  src/scan-gram.l                               \

   src/scan-skel.l
 
   src/scan-skel.l
 

-BUILT_SOURCES +=                               \
-  src/parse-gram.c                             \
-  src/parse-gram.h                             \
-  src/scan-code.c                              \
-  src/scan-gram.c                              \
+BUILT_SOURCES +=                                \
+  src/parse-gram.c                              \
+  src/parse-gram.h                              \
+  src/scan-code.c                               \
+  src/scan-gram.c                               \

   src/scan-skel.c
 
   src/scan-skel.c
 

+
+## ------ ##
+## yacc.  ##
+## ------ ##
+
+bin_SCRIPTS = $(YACC_SCRIPT)
+EXTRA_SCRIPTS = src/yacc

 MOSTLYCLEANFILES += src/yacc
 
 src/yacc:
 MOSTLYCLEANFILES += src/yacc
 
 src/yacc:

-       rm -f $@ $@.tmp
-       echo '#! /bin/sh' >$@.tmp
-       echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@.tmp
-       chmod a+x $@.tmp
-       mv $@.tmp $@
+       $(AM_V_GEN)rm -f $@ $@.tmp
+       $(AM_V_at)echo '#! /bin/sh' >$@.tmp
+       $(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@.tmp
+       $(AM_V_at)chmod a+x $@.tmp
+       $(AM_V_at)mv $@.tmp $@