Mercurial > hg > octave-nkf
changeset 15096:909a2797935b
maint: Move interp source code without DEFUNs to interp-core/ dir.
* src/Makefile.am, interpfcn/module.mk, operators/module.mk,
parse-tree/module.mk: Update build system by moving source lists and rules
to the correct directory.
* Cell.cc, Cell.h, c-file-ptr-stream.cc, c-file-ptr-stream.h, comment-list.cc,
comment-list.h, cutils.c, cutils.h, defun-dld.h, defun-int.h, display.cc,
display.h, dynamic-ld.cc, dynamic-ld.h, gl-render.cc, gl-render.h,
gl2ps-renderer.cc, gl2ps-renderer.h, gl2ps.c, gl2ps.h, gripes.cc, gripes.h,
jit-ir.cc, jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, jit-util.cc, jit-util.h,
ls-ascii-helper.cc, ls-ascii-helper.h, ls-hdf5.cc, ls-hdf5.h, ls-mat-ascii.cc,
ls-mat-ascii.h, ls-mat4.cc, ls-mat4.h, ls-mat5.cc, ls-mat5.h, ls-oct-binary.cc,
ls-oct-binary.h, ls-utils.cc, ls-utils.h, matherr.c, mex.cc, mex.h, mexproto.h,
module.mk, mxarray.in.h, oct-errno.h, oct-errno.in.cc, oct-fstrm.cc,
oct-fstrm.h, oct-hdf5.h, oct-iostrm.cc, oct-iostrm.h, oct-lvalue.cc,
oct-lvalue.h, oct-map.cc, oct-map.h, oct-obj.cc, oct-obj.h, oct-prcstrm.cc,
oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-stdstrm.h, oct-stream.cc,
oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct.h, procstream.cc,
procstream.h, pt-jit.cc, pt-jit.h, siglist.c, siglist.h, sparse-xdiv.cc,
sparse-xdiv.h, sparse-xpow.cc, sparse-xpow.h, txt-eng-ft.cc, txt-eng-ft.h,
txt-eng.h, unwind-prot.cc, unwind-prot.h, xdiv.cc, xdiv.h, xgl2ps.c, xnorm.cc,
xnorm.h, xpow.cc, xpow.h, zfstream.cc, zfstream.h: Move from src/ dir to
src/interp-core dir.
* ops.h: Move to operators/ directory.
* octave.gperf, token.cc, token.h: Move to parse-tree directory.
line wrap: on
line diff
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# Makefile for octave's src directory +# Makefile for Octave's src directory # # Copyright (C) 1993-2012 John W. Eaton # @@ -24,10 +24,12 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libcruft/misc \ -I../liboctave -I$(top_srcdir)/liboctave \ + -Ioctave-value -I$(srcdir)/octave-value \ + -Iparse-tree -I$(srcdir)/parse-tree \ + -Ioperators -I$(srcdir)/operators \ + -Iinterp-core -I$(srcdir)/interp-core \ -Iinterpfcn -I$(srcdir)/interpfcn \ -Icorefcn \ - -Ioctave-value -I$(srcdir)/octave-value \ - -Iparse-tree -I$(srcdir)/parse-tree \ -I. -I$(srcdir) \ -I../libgnu -I$(top_srcdir)/libgnu \ @CPPFLAGS@ @@ -66,33 +68,33 @@ ## $(DEF_FILES), and building those requires all the sources ## (except builtins.cc) to be available. BUILT_SOURCES = \ - $(BUILT_SOURCES_EXTRA) \ + interp-core/mxarray.h \ + interp-core/oct-errno.cc \ interpfcn/defaults.h \ + interpfcn/graphics-props.cc \ interpfcn/graphics.h \ - interpfcn/graphics-props.cc \ + operators/ops.cc \ parse-tree/lex.cc \ - mxarray.h \ + parse-tree/oct-gperf.h \ + parse-tree/oct-parse.cc \ oct-conf.h \ - oct-errno.cc \ - oct-gperf.h \ - parse-tree/oct-parse.cc \ - ops.cc \ version.h \ + $(BUILT_SOURCES_EXTRA) \ builtins.cc BUILT_DISTFILES = \ - oct-gperf.h \ + parse-tree/oct-gperf.h \ parse-tree/oct-parse.h ## Files that are created during build process and installed, ## BUT not distributed in tarball. BUILT_NODISTFILES = \ + interp-core/mxarray.h \ + interp-core/oct-errno.cc \ interpfcn/defaults.h \ interpfcn/graphics.h \ + operators/ops.cc \ oct-conf.h \ - oct-errno.cc \ - ops.cc \ - mxarray.h \ version.h \ $(OPT_HANDLERS) \ $(OPT_INC) \ @@ -101,13 +103,10 @@ EXTRA_DIST = \ Makefile.in \ - defaults.in.h \ DOCSTRINGS \ find-defun-files.sh \ gendoc.pl \ genprops.awk \ - gl2ps.c \ - graphics.in.h \ mk-errno-list \ mk-pkg-add \ mkbuiltins \ @@ -115,136 +114,36 @@ mkoctfile.in.cc \ mkoctfile.in.sh \ mkops \ - mxarray.in.h \ oct-conf.in.h \ - oct-errno.in.cc \ octave-config.in.cc \ octave-config.in.sh \ - octave.gperf \ version.in.h \ $(BUILT_DISTFILES) -JIT_INCLUDES = \ - jit-util.h \ - jit-typeinfo.h \ - jit-ir.h \ - pt-jit.h - octinclude_HEADERS = \ - Cell.h \ - builtins.h \ - c-file-ptr-stream.h \ - comment-list.h \ - cutils.h \ - defun-dld.h \ - defun-int.h \ - display.h \ - dynamic-ld.h \ - gl-render.h \ - gl2ps.h \ - gl2ps-renderer.h \ interpfcn/graphics-props.cc \ - gripes.h \ - ls-ascii-helper.h \ - ls-hdf5.h \ - ls-mat-ascii.h \ - ls-mat4.h \ - ls-mat5.h \ - ls-oct-binary.h \ - ls-utils.h \ - mex.h \ - mexproto.h \ - oct-errno.h \ - oct-fstrm.h \ - oct-gperf.h \ - oct-hdf5.h \ - oct-iostrm.h \ - oct-lvalue.h \ - oct-map.h \ - oct-obj.h \ - oct-prcstrm.h \ - oct-procbuf.h \ - oct-stdstrm.h \ - oct-stream.h \ - oct-strstrm.h \ - oct.h \ + parse-tree/oct-gperf.h \ + builtins.h \ octave.h \ - ops.h \ - procstream.h \ - siglist.h \ - sparse-xdiv.h \ - sparse-xpow.h \ - token.h \ - txt-eng-ft.h \ - txt-eng.h \