Mercurial > octave-nkf
diff libinterp/parse-tree/module.mk @ 20362:0ce7d8303152
eliminate recursive make invocations in liboctave and libinterp directories
* libinterp/module.mk: New file created from libinterp/Makefile.am.
* liboctave/module.mk: New file created from liboctave/Makefile.am.
* libinterp/Makefile.am, liboctave/Makefile.am: Delete.
* configure.ac (AC_CONFIG_FILES): Remove libinterp/Makefile and
liboctave/Makefile from the list.
* Makefile.am (SUBDIRS): Remove liboctave and libinterp from the list.
(BUILT_DISTFILES, BUILT_NODISTFILES, EXTRA_DIST, DIST_SRC,
octinclude_HEADERS, nodist_octinclude_HEADERS): Initialize as empty.
Include liboctave/module.mk liboctave/link-deps.mk,
libinterp/module.mk, and libinterp/link-deps.mk.
* doc/module.mk, libgui/link-deps.mk, libinterp/corefcn/module.mk,
libinterp/dldfcn/config-module.awk, libinterp/link-deps.mk,
libinterp/mkops, libinterp/octave-value/module.mk,
libinterp/operators/module.mk, libinterp/parse-tree/module.mk,
libinterp/template-inst/module.mk, liboctave/array/module.mk,
liboctave/cruft/Faddeeva/module.mk, liboctave/cruft/amos/module.mk,
liboctave/cruft/blas-xtra/module.mk, liboctave/cruft/daspk/module.mk,
liboctave/cruft/dasrt/module.mk, liboctave/cruft/dassl/module.mk,
liboctave/cruft/fftpack/module.mk,
liboctave/cruft/lapack-xtra/module.mk, liboctave/cruft/misc/module.mk,
liboctave/cruft/module.mk, liboctave/cruft/odepack/module.mk,
liboctave/cruft/ordered-qz/module.mk,
liboctave/cruft/quadpack/module.mk, liboctave/cruft/ranlib/module.mk,
liboctave/cruft/slatec-err/module.mk,
liboctave/cruft/slatec-fn/module.mk, liboctave/numeric/module.mk,
liboctave/operators/mk-ops.awk, liboctave/operators/module.mk,
liboctave/operators/sparse-mk-ops.awk, liboctave/system/module.mk,
liboctave/util/module.mk: Update for non-recursive build.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 10 Jul 2015 13:28:33 -0400 |
| parents | 2350fc8ba960 |
| children | 9b44691a3520 |
line wrap: on
line diff
--- a/libinterp/parse-tree/module.mk Thu Jul 09 13:55:58 2015 -0400 +++ b/libinterp/parse-tree/module.mk Fri Jul 10 13:28:33 2015 -0400 @@ -1,81 +1,81 @@ EXTRA_DIST += \ - parse-tree/module.mk \ - parse-tree/oct-parse.in.yy \ - parse-tree/octave.gperf + libinterp/parse-tree/module.mk \ + libinterp/parse-tree/oct-parse.in.yy \ + libinterp/parse-tree/octave.gperf PARSER_INC = \ - parse-tree/lex.h \ - parse-tree/parse.h + libinterp/parse-tree/lex.h \ + libinterp/parse-tree/parse.h PARSER_SRC = \ - parse-tree/lex.ll \ - parse-tree/oct-parse.yy + libinterp/parse-tree/lex.ll \ + libinterp/parse-tree/oct-parse.yy PARSE_TREE_INC = \ - parse-tree/pt-all.h \ - parse-tree/pt-arg-list.h \ - parse-tree/pt-array-list.h \ - parse-tree/pt-assign.h \ - parse-tree/pt-binop.h \ - parse-tree/pt-bp.h \ - parse-tree/pt-cbinop.h \ - parse-tree/pt-cell.h \ - parse-tree/pt-check.h \ - parse-tree/pt-classdef.h \ - parse-tree/pt-cmd.h \ - parse-tree/pt-colon.h \ - parse-tree/pt-const.h \ - parse-tree/pt-decl.h \ - parse-tree/pt-eval.h \ - parse-tree/pt-except.h \ - parse-tree/pt-exp.h \ - parse-tree/pt-fcn-handle.h \ - parse-tree/pt-funcall.h \ - parse-tree/pt-id.h \ - parse-tree/pt-idx.h \ - parse-tree/pt-jump.h \ - parse-tree/pt-loop.h \ - parse-tree/pt-mat.h \ - parse-tree/pt-misc.h \ - parse-tree/pt-pr-code.h \ - parse-tree/pt-select.h \ - parse-tree/pt-stmt.h \ - parse-tree/pt-unop.h \ - parse-tree/pt-walk.h \ - parse-tree/pt.h \ - parse-tree/token.h + libinterp/parse-tree/pt-all.h \ + libinterp/parse-tree/pt-arg-list.h \ + libinterp/parse-tree/pt-array-list.h \ + libinterp/parse-tree/pt-assign.h \ + libinterp/parse-tree/pt-binop.h \ + libinterp/parse-tree/pt-bp.h \ + libinterp/parse-tree/pt-cbinop.h \ + libinterp/parse-tree/pt-cell.h \ + libinterp/parse-tree/pt-check.h \ + libinterp/parse-tree/pt-classdef.h \ + libinterp/parse-tree/pt-cmd.h \ + libinterp/parse-tree/pt-colon.h \ + libinterp/parse-tree/pt-const.h \ + libinterp/parse-tree/pt-decl.h \ + libinterp/parse-tree/pt-eval.h \ + libinterp/parse-tree/pt-except.h \ + libinterp/parse-tree/pt-exp.h \ + libinterp/parse-tree/pt-fcn-handle.h \ + libinterp/parse-tree/pt-funcall.h \ + libinterp/parse-tree/pt-id.h \ + libinterp/parse-tree/pt-idx.h \ + libinterp/parse-tree/pt-jump.h \ + libinterp/parse-tree/pt-loop.h \ + libinterp/parse-tree/pt-mat.h \ + libinterp/parse-tree/pt-misc.h \ + libinterp/parse-tree/pt-pr-code.h \ + libinterp/parse-tree/pt-select.h \ + libinterp/parse-tree/pt-stmt.h \ + libinterp/parse-tree/pt-unop.h \ + libinterp/parse-tree/pt-walk.h \ + libinterp/parse-tree/pt.h \ + libinterp/parse-tree/token.h PARSE_TREE_SRC = \ - parse-tree/pt-arg-list.cc \ - parse-tree/pt-array-list.cc \ - parse-tree/pt-assign.cc \ - parse-tree/pt-binop.cc \ - parse-tree/pt-bp.cc \ - parse-tree/pt-cbinop.cc \ - parse-tree/pt-cell.cc \ - parse-tree/pt-check.cc \ - parse-tree/pt-classdef.cc \ - parse-tree/pt-cmd.cc \ - parse-tree/pt-colon.cc \ - parse-tree/pt-const.cc \ - parse-tree/pt-decl.cc \ - parse-tree/pt-eval.cc \ - parse-tree/pt-except.cc \ - parse-tree/pt-exp.cc \ - parse-tree/pt-fcn-handle.cc \ - parse-tree/pt-funcall.cc \ - parse-tree/pt-id.cc \ - parse-tree/pt-idx.cc \ - parse-tree/pt-jump.cc \ - parse-tree/pt-loop.cc \ - parse-tree/pt-mat.cc \ - parse-tree/pt-misc.cc \ - parse-tree/pt-pr-code.cc \ - parse-tree/pt-select.cc \ - parse-tree/pt-stmt.cc \ - parse-tree/pt-unop.cc \ - parse-tree/pt.cc \ - parse-tree/token.cc + libinterp/parse-tree/pt-arg-list.cc \ + libinterp/parse-tree/pt-array-list.cc \ + libinterp/parse-tree/pt-assign.cc \ + libinterp/parse-tree/pt-binop.cc \ + libinterp/parse-tree/pt-bp.cc \ + libinterp/parse-tree/pt-cbinop.cc \ + libinterp/parse-tree/pt-cell.cc \ + libinterp/parse-tree/pt-check.cc \ + libinterp/parse-tree/pt-classdef.cc \ + libinterp/parse-tree/pt-cmd.cc \ + libinterp/parse-tree/pt-colon.cc \ + libinterp/parse-tree/pt-const.cc \ + libinterp/parse-tree/pt-decl.cc \ + libinterp/parse-tree/pt-eval.cc \ + libinterp/parse-tree/pt-except.cc \ + libinterp/parse-tree/pt-exp.cc \ + libinterp/parse-tree/pt-fcn-handle.cc \ + libinterp/parse-tree/pt-funcall.cc \ + libinterp/parse-tree/pt-id.cc \ + libinterp/parse-tree/pt-idx.cc \ + libinterp/parse-tree/pt-jump.cc \ + libinterp/parse-tree/pt-loop.cc \ + libinterp/parse-tree/pt-mat.cc \ + libinterp/parse-tree/pt-misc.cc \ + libinterp/parse-tree/pt-pr-code.cc \ + libinterp/parse-tree/pt-select.cc \ + libinterp/parse-tree/pt-stmt.cc \ + libinterp/parse-tree/pt-unop.cc \ + libinterp/parse-tree/pt.cc \ + libinterp/parse-tree/token.cc ## Special rules for sources which must be built before rest of compilation. @@ -83,26 +83,34 @@ ## is missing but sed is not, the exit status of the pipeline ## will still be success and we will end up creating an empty ## oct-gperf.h file. -parse-tree/oct-gperf.h: parse-tree/octave.gperf +libinterp/parse-tree/oct-gperf.h: libinterp/parse-tree/octave.gperf $(AM_V_GEN)rm -f $@-t $@t1 $@ && \ $(GPERF) -t -C -D -G -L C++ -Z octave_kw_hash $< > $@-t1 && \ $(SED) 's,lookup\[,gperf_lookup[,' < $@-t1 > $@-t && \ mv $@-t $@ && \ rm -f $@-t1 -parse-tree/oct-parse.h: parse-tree/oct-parse.cc +libinterp/parse-tree/oct-parse.h: libinterp/parse-tree/oct-parse.cc -parse-tree/oct-parse.yy: parse-tree/oct-parse.in.yy +libinterp/parse-tree/oct-parse.yy: libinterp/parse-tree/oct-parse.in.yy $(AM_V_GEN)$(call subst-bison-api-decls,octave_) noinst_LTLIBRARIES += \ - parse-tree/libparse-tree.la \ - parse-tree/libparser.la + libinterp/parse-tree/libparse-tree.la \ + libinterp/parse-tree/libparser.la + +libinterp_parse_tree_libparse_tree_la_SOURCES = $(PARSE_TREE_SRC) + +libinterp_parse_tree_libparse_tree_la_CPPFLAGS = $(libinterp_liboctinterp_la_CPPFLAGS) -parse_tree_libparse_tree_la_SOURCES = $(PARSE_TREE_SRC) -parse_tree_libparse_tree_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS) +libinterp_parse_tree_libparse_tree_la_CFLAGS = $(AM_CFLAGS) \ +$(WARN_CFLAGS) + +libinterp_parse_tree_libparse_tree_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) -parse_tree_libparser_la_SOURCES = $(PARSER_SRC) -parse_tree_libparser_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS) -parse_tree_libparser_la_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))