Mercurial > octave-nkf
comparison libinterp/Makefile.am @ 16298:faaf60aa457c
use separate automake convenience library for bison and flex generated files
* libinterp/Makefile.am (DIST_SRC): Include $(PARSER_SRC).
(liboctinterp_la_LIBADD): Include parse-tree/libparser.la.
* libinterp/parse-tree/module.mk (PARSE_TREE_INC): Remove
$(PARSER_INC) from the list.
(PARSE_TREE_SRC): Remove $(PARSER_SRC) from the list.
(noinst_LTLIBRARIES): Include parse-tree/libparser.la in the list.
(parse_tree_libparser_la_SOURCES, parse_tree_libparser_la_CPPFLAGS,
parse_tree_libparser_la_CXXFLAGS): New varibles. Filter out
-Wold-style-cast from CXXFLAGS for parser convenience library.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 13 Mar 2013 14:33:14 -0400 |
parents | 05313332d541 |
children | 7612d75a559b |
comparison
equal
deleted
inserted
replaced
16297:00da706fba48 | 16298:faaf60aa457c |
---|---|
123 | 123 |
124 DIST_SRC = \ | 124 DIST_SRC = \ |
125 octave.cc \ | 125 octave.cc \ |
126 $(OCTAVE_VALUE_SRC) \ | 126 $(OCTAVE_VALUE_SRC) \ |
127 $(PARSE_TREE_SRC) \ | 127 $(PARSE_TREE_SRC) \ |
128 $(PARSER_SRC) \ | |
128 $(INTERP_CORE_SRC) \ | 129 $(INTERP_CORE_SRC) \ |
129 $(INTERPFCN_SRC) \ | 130 $(INTERPFCN_SRC) \ |
130 $(COREFCN_SRC) | 131 $(COREFCN_SRC) |
131 | 132 |
132 noinst_LTLIBRARIES = | 133 noinst_LTLIBRARIES = |
176 include link-deps.mk | 177 include link-deps.mk |
177 | 178 |
178 liboctinterp_la_LIBADD = \ | 179 liboctinterp_la_LIBADD = \ |
179 octave-value/liboctave-value.la \ | 180 octave-value/liboctave-value.la \ |
180 parse-tree/libparse-tree.la \ | 181 parse-tree/libparse-tree.la \ |
182 parse-tree/libparser.la \ | |
181 interp-core/libinterp-core.la \ | 183 interp-core/libinterp-core.la \ |
182 interpfcn/libinterpfcn.la \ | 184 interpfcn/libinterpfcn.la \ |
183 corefcn/libcorefcn.la \ | 185 corefcn/libcorefcn.la \ |
184 $(top_builddir)/liboctave/liboctave.la \ | 186 $(top_builddir)/liboctave/liboctave.la \ |
185 $(LIBOCTINTERP_LINK_DEPS) | 187 $(LIBOCTINTERP_LINK_DEPS) |