Mercurial > octave

diff libinterp/parse-tree/module.mk @ 21023:ec532a439c6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rework method of disabling warnings from GCC * configure.ac: Check for GCC's #pragma GCC diagnostic feature. * libinterp/module.mk, libinterp/corefcn/module.mk, libinterp/parse-tree/module.mk: Eliminate separate libraries for TeX and Octave parsers. * oct-tex-lexer.in.ll, oct-tex-parser.in.yy, lex.ll, oct-parse.in.yy: Use GCC #pragma GCC diagnostic feature to more selectively disable warnings in generated code. * libgui/module.mk (rcc-command): Use GCC #pragma GCC diagnostic feature to more selectively disable warnings in generated code.
author John W. Eaton <jwe@octave.org>
date Thu, 31 Dec 2015 17:06:36 -0500
parents 9b44691a3520
children ae03a16f3343
line wrap: on
line diff
--- a/libinterp/parse-tree/module.mk	Thu Dec 31 13:45:43 2015 -0500
+++ b/libinterp/parse-tree/module.mk	Thu Dec 31 17:06:36 2015 -0500
@@ -1,12 +1,6 @@
-PARSER_INC = \
+PARSE_TREE_INC = \
   libinterp/parse-tree/lex.h \
-  libinterp/parse-tree/parse.h
-
-PARSER_SRC = \
-  libinterp/parse-tree/lex.ll \
-  libinterp/parse-tree/oct-parse.yy
-
-PARSE_TREE_INC = \
+  libinterp/parse-tree/parse.h \
   libinterp/parse-tree/pt-all.h \
   libinterp/parse-tree/pt-arg-list.h \
   libinterp/parse-tree/pt-array-list.h \
@@ -41,6 +35,8 @@
   libinterp/parse-tree/token.h
 
 PARSE_TREE_SRC = \
+  libinterp/parse-tree/lex.ll \
+  libinterp/parse-tree/oct-parse.yy \
   libinterp/parse-tree/pt-arg-list.cc \
   libinterp/parse-tree/pt-array-list.cc \
   libinterp/parse-tree/pt-assign.cc \
@@ -91,25 +87,16 @@
 	$(AM_V_GEN)$(call subst-bison-api-decls,octave_)
 
 noinst_LTLIBRARIES += \
-  libinterp/parse-tree/libparse-tree.la \
-  libinterp/parse-tree/libparser.la
+  libinterp/parse-tree/libparse-tree.la
 
 libinterp_parse_tree_libparse_tree_la_SOURCES = $(PARSE_TREE_SRC)
 
 libinterp_parse_tree_libparse_tree_la_CPPFLAGS = $(libinterp_liboctinterp_la_CPPFLAGS)
 
-libinterp_parse_tree_libparse_tree_la_CFLAGS = $(AM_CFLAGS)	\
-$(WARN_CFLAGS)
+libinterp_parse_tree_libparse_tree_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
 
 libinterp_parse_tree_libparse_tree_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
 
-libinterp_parse_tree_libparser_la_SOURCES = $(PARSER_SRC)
-
-libinterp_parse_tree_libparser_la_CPPFLAGS = $(libinterp_liboctinterp_la_CPPFLAGS)
-
-libinterp_parse_tree_libparser_la_CXXFLAGS = \
-  $(filter-out -Wold-style-cast, $(AM_CXXFLAGS))
-
 libinterp_EXTRA_DIST += \
   libinterp/parse-tree/oct-parse.in.yy \
   libinterp/parse-tree/octave.gperf