Mercurial > octave

comparison libinterp/module.mk @ 21220:d78e45987d6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename octave::build_env namespace from octave::config * build-env-features.sh: Rename from ocgt-conf-features.sh. Update for new names. * build-env.h: Rename from oct-conf.h. Also declare features function. * build-env.in.cc: Rename from oct-conf.in.cc. * oct-conf-features.h: Delete. * libinterp/module.mk: Update. * toplev.cc, __init_gnuplot__.cc, octave.cc: Update for new names.
author John W. Eaton <jwe@octave.org>
date Sun, 07 Feb 2016 14:56:17 -0500
parents b7a191eb0c3c
children ae03a16f3343
comparison
equal deleted inserted replaced
21219:ddf0a5f3a967 21220:d78e45987d6a
40 libinterp/parse-tree/oct-parse.h \ 40 libinterp/parse-tree/oct-parse.h \
41 libinterp/version.h 41 libinterp/version.h
42 42
43 BUILT_SOURCES += \ 43 BUILT_SOURCES += \
44 $(GENERATED_MAKE_BUILTINS_INCS) \ 44 $(GENERATED_MAKE_BUILTINS_INCS) \
45 libinterp/build-env.cc \
45 libinterp/builtin-defun-decls.h \ 46 libinterp/builtin-defun-decls.h \
46 libinterp/builtins.cc \ 47 libinterp/builtins.cc \
47 libinterp/oct-conf.cc \
48 libinterp/corefcn/oct-errno.cc \ 48 libinterp/corefcn/oct-errno.cc \
49 libinterp/corefcn/oct-tex-lexer.cc \ 49 libinterp/corefcn/oct-tex-lexer.cc \
50 libinterp/corefcn/oct-tex-parser.cc \ 50 libinterp/corefcn/oct-tex-parser.cc \
51 libinterp/corefcn/oct-tex-symbols.cc \ 51 libinterp/corefcn/oct-tex-symbols.cc \
52 libinterp/operators/ops.cc \ 52 libinterp/operators/ops.cc \
71 libinterp/parse-tree/oct-parse.h 71 libinterp/parse-tree/oct-parse.h
72 72
73 ## Files that are created during build process and installed, 73 ## Files that are created during build process and installed,
74 ## BUT not distributed in tarball. 74 ## BUT not distributed in tarball.
75 LIBINTERP_BUILT_NODISTFILES = \ 75 LIBINTERP_BUILT_NODISTFILES = \
76 libinterp/build-env.cc \
77 libinterp/build-env-features.cc \
76 libinterp/corefcn/mxarray.h \ 78 libinterp/corefcn/mxarray.h \
77 libinterp/corefcn/oct-errno.cc \ 79 libinterp/corefcn/oct-errno.cc \
78 libinterp/corefcn/defaults.h \ 80 libinterp/corefcn/defaults.h \
79 libinterp/corefcn/graphics.h \ 81 libinterp/corefcn/graphics.h \
80 libinterp/builtin-defun-decls.h \ 82 libinterp/builtin-defun-decls.h \
81 libinterp/operators/ops.cc \ 83 libinterp/operators/ops.cc \
82 libinterp/oct-conf.cc \
83 libinterp/oct-conf-features.cc \
84 libinterp/version.h \ 84 libinterp/version.h \
85 $(OPT_HANDLERS) \ 85 $(OPT_HANDLERS) \
86 $(ALL_DEF_FILES) \ 86 $(ALL_DEF_FILES) \
87 libinterp/builtins.cc 87 libinterp/builtins.cc
88 88
89 libinterp_EXTRA_DIST += \ 89 libinterp_EXTRA_DIST += \
90 libinterp/DOCSTRINGS \ 90 libinterp/DOCSTRINGS \
91 libinterp/config-features.sh \ 91 libinterp/build-env.in.cc \
92 libinterp/build-env-features.sh \
92 libinterp/find-defun-files.sh \ 93 libinterp/find-defun-files.sh \
93 libinterp/gendoc.pl \ 94 libinterp/gendoc.pl \
94 libinterp/genprops.awk \ 95 libinterp/genprops.awk \
95 libinterp/mk-errno-list \ 96 libinterp/mk-errno-list \
96 libinterp/mk-pkg-add \ 97 libinterp/mk-pkg-add \
97 libinterp/mkbuiltins \ 98 libinterp/mkbuiltins \
98 libinterp/mkdefs \ 99 libinterp/mkdefs \
99 libinterp/mkops \ 100 libinterp/mkops \
100 libinterp/oct-conf.in.cc \
101 libinterp/version.in.h \ 101 libinterp/version.in.h \
102 $(LIBINTERP_BUILT_DISTFILES) 102 $(LIBINTERP_BUILT_DISTFILES)
103 103
104 octinclude_HEADERS += \ 104 octinclude_HEADERS += \
105 libinterp/corefcn/graphics-props.cc \ 105 libinterp/corefcn/graphics-props.cc \
106 libinterp/parse-tree/oct-gperf.h \ 106 libinterp/parse-tree/oct-gperf.h \
107 libinterp/builtins.h \ 107 libinterp/builtins.h \
108 libinterp/builtin-defun-decls.h \ 108 libinterp/builtin-defun-decls.h \
109 libinterp/oct-conf.h \ 109 libinterp/build-env.h \
110 libinterp/oct-conf-features.h \
111 libinterp/octave.h \ 110 libinterp/octave.h \
112 libinterp/options-usage.h \ 111 libinterp/options-usage.h \
113 $(OCTAVE_VALUE_INC) \ 112 $(OCTAVE_VALUE_INC) \
114 $(PARSE_TREE_INC) \ 113 $(PARSE_TREE_INC) \
115 $(PARSER_INC) \ 114 $(PARSER_INC) \
159 libinterp/corefcn/defaults.h \ 158 libinterp/corefcn/defaults.h \
160 libinterp/corefcn/graphics.h \ 159 libinterp/corefcn/graphics.h \
161 libinterp/operators/ops.cc \ 160 libinterp/operators/ops.cc \
162 libinterp/builtin-defun-decls.h \ 161 libinterp/builtin-defun-decls.h \
163 libinterp/builtins.cc \ 162 libinterp/builtins.cc \
164 libinterp/oct-conf.cc \ 163 libinterp/build-env.cc \
165 libinterp/oct-conf-features.cc \ 164 libinterp/build-env-features.cc \
166 libinterp/version.h 165 libinterp/version.h
167 166
168 libinterp_liboctinterp_la_LIBADD = \ 167 libinterp_liboctinterp_la_LIBADD = \
169 libinterp/octave-value/liboctave-value.la \ 168 libinterp/octave-value/liboctave-value.la \
170 libinterp/parse-tree/libparse-tree.la \ 169 libinterp/parse-tree/libparse-tree.la \
244 $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) 243 $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
245 244
246 ## Special rules: 245 ## Special rules:
247 ## Mostly for sources which must be built before rest of compilation. 246 ## Mostly for sources which must be built before rest of compilation.
248 247
249 ## oct-conf.cc must depend on Makefile. 248 ## build-env.cc must depend on Makefile.
250 ## Calling configure may change default/config values. 249 ## Calling configure may change default/config values.
251 ## However, calling configure will also regenerate the Makefiles from 250 ## However, calling configure will also regenerate the Makefiles from
252 ## Makefile.am and trigger the rules below. 251 ## Makefile.am and trigger the rules below.
253 libinterp/oct-conf.cc: libinterp/oct-conf.in.cc Makefile 252 libinterp/build-env.cc: libinterp/build-env.in.cc Makefile
254 $(AM_V_GEN)$(do_subst_config_vals) 253 $(AM_V_GEN)$(do_subst_config_vals)
255 254
256 libinterp/oct-conf-features.cc: $(top_builddir)/config.h libinterp/config-features.sh 255 libinterp/build-env-features.cc: $(top_builddir)/config.h libinterp/build-env-features.sh
257 $(AM_V_GEN)rm -f $@-t && \ 256 $(AM_V_GEN)rm -f $@-t && \
258 $(srcdir)/libinterp/config-features.sh $< > $@-t && \ 257 $(srcdir)/libinterp/build-env-features.sh $< > $@-t && \
259 $(simple_move_if_change_rule) 258 $(simple_move_if_change_rule)
260 259
261 libinterp/version.h: libinterp/version.in.h Makefile 260 libinterp/version.h: libinterp/version.in.h Makefile
262 $(AM_V_GEN)rm -f $@-t && \ 261 $(AM_V_GEN)rm -f $@-t && \
263 $(SED) < $< \ 262 $(SED) < $< \