maint: tidy the Makefile a bit.

* src/local.mk: Put yacc related variables together.
	(AUTOMAKE_OPTIONS): Move to...
	* Makefile.am: here.
	Remove an old Emacs mode request which disables Automake support.
	* src/local.mk (YACC, AM_YFLAGS): Move to...
	* Makefile.am: here, as they will be used by other local.mks.
This commit is contained in:
Akim Demaille
2012-02-14 17:27:15 +01:00
parent 360ae94ebc
commit 7726724a70
2 changed files with 13 additions and 11 deletions

View File

@@ -1,4 +1,4 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
## Process this file with automake to produce Makefile.in.
## Copyright (C) 2001-2012 Free Software Foundation, Inc.
@@ -15,6 +15,7 @@
## 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
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = po runtime-po .
@@ -27,9 +28,12 @@ EXTRA_DIST = .prev-version .version \
cfg.mk ChangeLog-1998 ChangeLog-2012 PACKAGING
## Running the bison from this tarball. To generate our own parser,
## but also to run the tests.
## but also to run the tests. Of course, you ought to keep a sane
## version of Bison nearby...
BISON = $(top_builddir)/tests/bison
BISON_IN = $(top_srcdir)/tests/bison.in
YACC = $(BISON) -y
AM_YFLAGS = -dv --warnings=all,error --report=all
# Initialization before completion by local.mk's.
AM_CFLAGS = $(WARN_CFLAGS)

View File

@@ -13,18 +13,9 @@
## 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
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...
YACC = $(BISON) -y
AM_YFLAGS = -dv --warnings=all,error --report=all
bin_PROGRAMS = src/bison
bin_SCRIPTS = $(YACC_SCRIPT)
EXTRA_SCRIPTS = src/yacc
src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS)
src_bison_SOURCES = \
@@ -114,6 +105,13 @@ BUILT_SOURCES += \
src/scan-gram.c \
src/scan-skel.c
## ------ ##
## yacc. ##
## ------ ##
bin_SCRIPTS = $(YACC_SCRIPT)
EXTRA_SCRIPTS = src/yacc
MOSTLYCLEANFILES += src/yacc
src/yacc: