Mercurial > octave-dspies

annotate libinterp/parse-tree/module.mk @ 18977:7761c281aac0 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix botched merge
author John W. Eaton <jwe@octave.org>
date Fri, 01 Aug 2014 14:06:35 -0400
parents d8abf813c69f
children fe505ff21d5b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15057
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
1 EXTRA_DIST += \
15096
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
2 parse-tree/module.mk \
17378
813523c2b581 build: Use convenience library to build tex-parser so "old-style cast" warning can be disabled.
Rik <rik@octave.org>
parents: 16321
diff changeset
3 parse-tree/oct-parse.in.yy \
15096
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
4 parse-tree/octave.gperf
15057
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
5
15281
03ef3a183129 build: Use INC rather than INCLUDES for consistent naming in libinterp Makefile.am.
Rik <rik@octave.org>
parents: 15258
diff changeset
6 PARSER_INC = \
15085
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
7 parse-tree/lex.h \
16321
7612d75a559b distribute parser header files omitted in changeset faaf60aa457c
John W. Eaton <jwe@octave.org>
parents: 16298
diff changeset
8 parse-tree/parse.h
15085
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
9
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
10 PARSER_SRC = \
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
11 parse-tree/lex.ll \
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
12 parse-tree/oct-parse.yy
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
13
15281
03ef3a183129 build: Use INC rather than INCLUDES for consistent naming in libinterp Makefile.am.
Rik <rik@octave.org>
parents: 15258
diff changeset
14 PARSE_TREE_INC = \
15057
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
15 parse-tree/pt-all.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
16 parse-tree/pt-arg-list.h \
16237
70f465930546 rearrange class heirarchy for tree_cell and tree_matrix
John W. Eaton <jwe@octave.org>
parents: 16174
diff changeset
17 parse-tree/pt-array-list.h \
15057
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
18 parse-tree/pt-assign.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
19 parse-tree/pt-binop.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
20 parse-tree/pt-bp.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
21 parse-tree/pt-cbinop.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
22 parse-tree/pt-cell.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
23 parse-tree/pt-check.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
24 parse-tree/pt-cmd.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
25 parse-tree/pt-colon.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
26 parse-tree/pt-const.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
27 parse-tree/pt-decl.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
28 parse-tree/pt-eval.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
29 parse-tree/pt-except.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
30 parse-tree/pt-exp.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
31 parse-tree/pt-fcn-handle.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
32 parse-tree/pt-id.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
33 parse-tree/pt-idx.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
34 parse-tree/pt-jump.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
35 parse-tree/pt-loop.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
36 parse-tree/pt-mat.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
37 parse-tree/pt-misc.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
38 parse-tree/pt-pr-code.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
39 parse-tree/pt-select.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
40 parse-tree/pt-stmt.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
41 parse-tree/pt-unop.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
42 parse-tree/pt-walk.h \
15085
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
43 parse-tree/pt.h \
16298
faaf60aa457c use separate automake convenience library for bison and flex generated files
John W. Eaton <jwe@octave.org>
parents: 16237
diff changeset
44 parse-tree/token.h
15057
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
45
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
46 PARSE_TREE_SRC = \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
47 parse-tree/pt-arg-list.cc \
16237
70f465930546 rearrange class heirarchy for tree_cell and tree_matrix
John W. Eaton <jwe@octave.org>
parents: 16174
diff changeset
48 parse-tree/pt-array-list.cc \
15057
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
49 parse-tree/pt-assign.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
50 parse-tree/pt-binop.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
51 parse-tree/pt-bp.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
52 parse-tree/pt-cbinop.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
53 parse-tree/pt-cell.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
54 parse-tree/pt-check.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
55 parse-tree/pt-cmd.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
56 parse-tree/pt-colon.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
57 parse-tree/pt-const.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
58 parse-tree/pt-decl.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
59 parse-tree/pt-eval.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
60 parse-tree/pt-except.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
61 parse-tree/pt-exp.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
62 parse-tree/pt-fcn-handle.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
63 parse-tree/pt-id.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
64 parse-tree/pt-idx.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
65 parse-tree/pt-jump.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
66 parse-tree/pt-loop.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
67 parse-tree/pt-mat.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
68 parse-tree/pt-misc.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
69 parse-tree/pt-pr-code.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
70 parse-tree/pt-select.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
71 parse-tree/pt-stmt.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
72 parse-tree/pt-unop.cc \
15085
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
73 parse-tree/pt.cc \
16298
faaf60aa457c use separate automake convenience library for bison and flex generated files
John W. Eaton <jwe@octave.org>
parents: 16237
diff changeset
74 parse-tree/token.cc
15057
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
75
15096
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
76 ## Special rules for sources which must be built before rest of compilation.
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
77
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
78 ## Don't use a pipeline to process gperf output since if gperf
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
79 ## is missing but sed is not, the exit status of the pipeline
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
80 ## will still be success and we will end up creating an empty
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
81 ## oct-gperf.h file.
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
82 parse-tree/oct-gperf.h: parse-tree/octave.gperf
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
83 $(GPERF) -t -C -D -G -L C++ -Z octave_kw_hash $< > $@-t1
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
84 $(SED) 's,lookup\[,gperf_lookup[,' < $@-t1 > $@-t
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
85 mv $@-t $@
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
86 rm -f $@-t1
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
87
16174
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
88 parse-tree/oct-parse.yy: parse-tree/oct-parse.in.yy
18974
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 17378
diff changeset
89 case "$(BISON_API_PREFIX_DECL_STYLE)" in \
18977
7761c281aac0 fix botched merge
John W. Eaton <jwe@octave.org>
parents: 18974
diff changeset
90 *api*) api_prefix_decl='%define api.prefix "octave_"'; ;; \
18974
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 17378
diff changeset
91 *name*) api_prefix_decl='%name-prefix="octave_"'; ;; \
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 17378
diff changeset
92 esac; \
16174
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
93 case "$(BISON_PUSH_PULL_DECL_STYLE)" in \
18974
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 17378
diff changeset
94 *quote*) quote='"' ;; \
16174
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
95 *) quote="" ;; \
18974
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 17378
diff changeset
96 esac; \
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 17378
diff changeset
97 case "$(BISON_PUSH_PULL_DECL_STYLE)" in \
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 17378
diff changeset
98 *dash*) push_pull_decl="%define api.push-pull $${quote}both$${quote}"; ;; \
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 17378
diff changeset
99 *underscore*) push_pull_decl="%define api.push_pull $${quote}both$${quote}"; ;; \
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 17378
diff changeset
100 esac; \
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 17378
diff changeset
101 $(SED) -e "s/%PUSH_PULL_DECL%/$$push_pull_decl/" \
d8abf813c69f handle changes in bison 3.x
John W. Eaton <jwe@octave.org>
parents: 17378
diff changeset
102 -e "s/%API_PREFIX_DECL%/$$api_prefix_decl/" $< > $@-t
16174
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
103 mv $@-t $@
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
104
16298
faaf60aa457c use separate automake convenience library for bison and flex generated files
John W. Eaton <jwe@octave.org>
parents: 16237
diff changeset
105 noinst_LTLIBRARIES += \
faaf60aa457c use separate automake convenience library for bison and flex generated files
John W. Eaton <jwe@octave.org>
parents: 16237
diff changeset
106 parse-tree/libparse-tree.la \
faaf60aa457c use separate automake convenience library for bison and flex generated files
John W. Eaton <jwe@octave.org>
parents: 16237
diff changeset
107 parse-tree/libparser.la
15107
03381a36f70d generate convenience libraries for new parse-tree and interpfcn subdirectories
John W. Eaton <jwe@octave.org>
parents: 15096
diff changeset
108
03381a36f70d generate convenience libraries for new parse-tree and interpfcn subdirectories
John W. Eaton <jwe@octave.org>
parents: 15096
diff changeset
109 parse_tree_libparse_tree_la_SOURCES = $(PARSE_TREE_SRC)
15258
cd8248cc6020 Use -DOCTINTERP_DLL when compiling convenience libaries in libinterp.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15195
diff changeset
110 parse_tree_libparse_tree_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS)
16298
faaf60aa457c use separate automake convenience library for bison and flex generated files
John W. Eaton <jwe@octave.org>
parents: 16237
diff changeset
111
faaf60aa457c use separate automake convenience library for bison and flex generated files
John W. Eaton <jwe@octave.org>
parents: 16237
diff changeset
112 parse_tree_libparser_la_SOURCES = $(PARSER_SRC)
faaf60aa457c use separate automake convenience library for bison and flex generated files
John W. Eaton <jwe@octave.org>
parents: 16237
diff changeset
113 parse_tree_libparser_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS)
faaf60aa457c use separate automake convenience library for bison and flex generated files
John W. Eaton <jwe@octave.org>
parents: 16237
diff changeset
114 parse_tree_libparser_la_CXXFLAGS = \
faaf60aa457c use separate automake convenience library for bison and flex generated files
John W. Eaton <jwe@octave.org>
parents: 16237
diff changeset
115 $(filter-out -Wold-style-cast, $(AM_CXXFLAGS))