Mercurial > octave-nkf
diff libinterp/Makefile.am @ 16174:39096b290a2f
check syntax used to enable bison push/pull parser
* acinclude.m4 (OCTAVE_PROG_BISON): Check for syntax used to enable
push/pull parser.
* common.mk (BISON_PUSH_PULL_DECL_STYLE): New variable.
* libinterp/Makefile.am (BUILT_DISTFILES): Include oct-parse.yy in the
list.
(EXTRA_DIST): Include oct-pase.in.yy in the list.
(ULT_DIST_SRC): New variable.
(SRC_DEF_FILES, TST_FILES_SRC): Use $(ULT_DIST_SRC) instead of
$(DIST_SRC).
* find-defun-files.sh: Transform .in.yy instead of .yy.
* libinterp/parse-tree/module.mk (parse-tree/oct-parse.yy):
New target and rule to substitute push-pull decl.
* oct-parse.in.yy: Rename from oct-parse.yy
Substitute %PUSH_PULL_DECL%.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 02 Mar 2013 12:26:42 -0500 |
parents | 2a4f83826024 |
children | d200b2b184c1 |
line wrap: on
line diff
--- a/libinterp/Makefile.am Sat Mar 02 07:59:25 2013 -0800 +++ b/libinterp/Makefile.am Sat Mar 02 12:26:42 2013 -0500 @@ -65,7 +65,8 @@ BUILT_DISTFILES = \ parse-tree/oct-gperf.h \ - parse-tree/oct-parse.h + parse-tree/oct-parse.h \ + parse-tree/oct-parse.yy ## Files that are created during build process and installed, ## BUT not distributed in tarball. @@ -97,6 +98,7 @@ mkdefs \ mkops \ oct-conf.in.h \ + oct-parse.in.yy \ version.in.h \ $(BUILT_DISTFILES) @@ -196,7 +198,11 @@ $(LIBOCTINTERP_LINK_OPTS) ## Section for defining and creating DEF_FILES -SRC_DEF_FILES := $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" $(DIST_SRC)) + +ULT_DIST_SRC := \ + $(filter-out parse-tree/oct-parse.yy, $(DIST_SRC)) parse-tree/oct-parse.in.yy + +SRC_DEF_FILES := $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" $(ULT_DIST_SRC)) DLDFCN_DEF_FILES = $(DLDFCN_SRC:.cc=.df) @@ -236,7 +242,7 @@ ## Rules to build test files -TST_FILES_SRC := $(shell $(top_srcdir)/build-aux/find-files-with-tests.sh "$(srcdir)" $(DIST_SRC) $(DLDFCN_SRC)) +TST_FILES_SRC := $(shell $(top_srcdir)/build-aux/find-files-with-tests.sh "$(srcdir)" $(ULT_DIST_SRC) $(DLDFCN_SRC)) TST_FILES := $(addsuffix -tst,$(TST_FILES_SRC))