Merge remote-tracking branch 'origin/maint'

[bison.git] / src / local.mk

diff --git a/src/local.mk b/src/local.mk
index 7272b5df9b85ab010e0a7d7d21c18dfca7c15b08..a8c28394052b8a7534b5d17bb359138dd142cb46 100644 (file)
--- a/src/local.mk
+++ b/src/local.mk
@@ -1,35 +1,23 @@
-## Copyright (C) 2001-2011 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/>.
-
-AUTOMAKE_OPTIONS = subdir-objects
-
-AM_CPPFLAGS += -I$(top_srcdir)/lib
-# Find builddir/src/scan-code.c etc.
-AM_CPPFLAGS += -I$(top_builddir)
+# 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/>.
 
 LDADD = lib/libbison.a $(LIBINTL)
 
-# Use our own Bison to build the parser.  Of course, you ought to
-# keep a sane version of Bison nearby...
-BISON = tests/bison
-YACC = $(BISON) -y
-AM_YFLAGS = -dv --warnings=all,error --report=all
-
 bin_PROGRAMS = src/bison
-bin_SCRIPTS = $(YACC_SCRIPT)
-EXTRA_SCRIPTS = src/yacc
+# Prettify Automake-computed names of compiled objects.
+src_bison_SHORTNAME = bison
 
 src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS)
 src_bison_SOURCES =                             \
@@ -75,7 +63,6 @@ src_bison_SOURCES =                             \
   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                               \
@@ -119,11 +106,18 @@ BUILT_SOURCES +=                                \
   src/scan-gram.c                               \
   src/scan-skel.c
 
+
+## ------ ##
+## yacc.  ##
+## ------ ##
+
+bin_SCRIPTS = $(YACC_SCRIPT)
+EXTRA_SCRIPTS = 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 $@