Mercurial > hg > octave-nkf
changeset 16892:68fc671a9339
maint: Collapse interpfcn and interpfcn-core directories into corefcn directory.
* libgui/src/module.mk: Remove -I references to interp-core, interpfcn, add
reference to corefcn.
* libinterp/Makefile.am: Remove -I references to interp-core, interpfcn, add
reference to corefcn.
* libinterp/corefcn/module.mk: Add files from interp-core, interpfcn to
build system. Copy over special rules from module.mk files in interp-core
andd interpfcn.
* src/Makefile.am: Replace references to interp-core, interpfcn with those
to corefcn.
* libinterp/corefcn/Cell.cc, libinterp/corefcn/Cell.h,
libinterp/corefcn/action-container.h, libinterp/corefcn/c-file-ptr-stream.cc,
libinterp/corefcn/c-file-ptr-stream.h, libinterp/corefcn/comment-list.cc,
libinterp/corefcn/comment-list.h, libinterp/corefcn/cutils.c,
libinterp/corefcn/cutils.h, libinterp/corefcn/data.cc,
libinterp/corefcn/data.h, libinterp/corefcn/debug.cc,
libinterp/corefcn/debug.h, libinterp/corefcn/defaults.cc,
libinterp/corefcn/defaults.in.h, libinterp/corefcn/defun-dld.h,
libinterp/corefcn/defun-int.h, libinterp/corefcn/defun.cc,
libinterp/corefcn/defun.h, libinterp/corefcn/dirfns.cc,
libinterp/corefcn/dirfns.h, libinterp/corefcn/display.cc,
libinterp/corefcn/display.h, libinterp/corefcn/dynamic-ld.cc,
libinterp/corefcn/dynamic-ld.h, libinterp/corefcn/error.cc,
libinterp/corefcn/error.h, libinterp/corefcn/event-queue.h,
libinterp/corefcn/file-io.cc, libinterp/corefcn/file-io.h,
libinterp/corefcn/gl-render.cc, libinterp/corefcn/gl-render.h,
libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/gl2ps-renderer.h,
libinterp/corefcn/gl2ps.c, libinterp/corefcn/gl2ps.h,
libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h,
libinterp/corefcn/gripes.cc, libinterp/corefcn/gripes.h,
libinterp/corefcn/help.cc, libinterp/corefcn/help.h,
libinterp/corefcn/hook-fcn.cc, libinterp/corefcn/hook-fcn.h,
libinterp/corefcn/input.cc, libinterp/corefcn/input.h,
libinterp/corefcn/jit-ir.cc, libinterp/corefcn/jit-ir.h,
libinterp/corefcn/jit-typeinfo.cc, libinterp/corefcn/jit-typeinfo.h,
libinterp/corefcn/jit-util.cc, libinterp/corefcn/jit-util.h,
libinterp/corefcn/load-path.cc, libinterp/corefcn/load-path.h,
libinterp/corefcn/load-save.cc, libinterp/corefcn/load-save.h,
libinterp/corefcn/ls-ascii-helper.cc, libinterp/corefcn/ls-ascii-helper.h,
libinterp/corefcn/ls-hdf5.cc, libinterp/corefcn/ls-hdf5.h,
libinterp/corefcn/ls-mat-ascii.cc, libinterp/corefcn/ls-mat-ascii.h,
libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/ls-mat4.h,
libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/ls-mat5.h,
libinterp/corefcn/ls-oct-ascii.cc, libinterp/corefcn/ls-oct-ascii.h,
libinterp/corefcn/ls-oct-binary.cc, libinterp/corefcn/ls-oct-binary.h,
libinterp/corefcn/ls-utils.cc, libinterp/corefcn/ls-utils.h,
libinterp/corefcn/matherr.c, libinterp/corefcn/mex.cc, libinterp/corefcn/mex.h,
libinterp/corefcn/mexproto.h, libinterp/corefcn/mxarray.in.h,
libinterp/corefcn/oct-errno.h, libinterp/corefcn/oct-errno.in.cc,
libinterp/corefcn/oct-fstrm.cc, libinterp/corefcn/oct-fstrm.h,
libinterp/corefcn/oct-hdf5.h, libinterp/corefcn/oct-hist.cc,
libinterp/corefcn/oct-hist.h, libinterp/corefcn/oct-iostrm.cc,
libinterp/corefcn/oct-iostrm.h, libinterp/corefcn/oct-lvalue.cc,
libinterp/corefcn/oct-lvalue.h, libinterp/corefcn/oct-map.cc,
libinterp/corefcn/oct-map.h, libinterp/corefcn/oct-obj.cc,
libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-prcstrm.cc,
libinterp/corefcn/oct-prcstrm.h, libinterp/corefcn/oct-procbuf.cc,
libinterp/corefcn/oct-procbuf.h, libinterp/corefcn/oct-stdstrm.h,
libinterp/corefcn/oct-stream.cc, libinterp/corefcn/oct-stream.h,
libinterp/corefcn/oct-strstrm.cc, libinterp/corefcn/oct-strstrm.h,
libinterp/corefcn/oct.h, libinterp/corefcn/octave-link.cc,
libinterp/corefcn/octave-link.h, libinterp/corefcn/pager.cc,
libinterp/corefcn/pager.h, libinterp/corefcn/pr-output.cc,
libinterp/corefcn/pr-output.h, libinterp/corefcn/procstream.cc,
libinterp/corefcn/procstream.h, libinterp/corefcn/profiler.cc,
libinterp/corefcn/profiler.h, libinterp/corefcn/pt-jit.cc,
libinterp/corefcn/pt-jit.h, libinterp/corefcn/sighandlers.cc,
libinterp/corefcn/sighandlers.h, libinterp/corefcn/siglist.c,
libinterp/corefcn/siglist.h, libinterp/corefcn/sparse-xdiv.cc,
libinterp/corefcn/sparse-xdiv.h, libinterp/corefcn/sparse-xpow.cc,
libinterp/corefcn/sparse-xpow.h, libinterp/corefcn/symtab.cc,
libinterp/corefcn/symtab.h, libinterp/corefcn/sysdep.cc,
libinterp/corefcn/sysdep.h, libinterp/corefcn/toplev.cc,
libinterp/corefcn/toplev.h, libinterp/corefcn/txt-eng-ft.cc,
libinterp/corefcn/txt-eng-ft.h, libinterp/corefcn/txt-eng.h,
libinterp/corefcn/unwind-prot.cc, libinterp/corefcn/unwind-prot.h,
libinterp/corefcn/utils.cc, libinterp/corefcn/utils.h,
libinterp/corefcn/variables.cc, libinterp/corefcn/variables.h,
libinterp/corefcn/workspace-element.h, libinterp/corefcn/xdiv.cc,
libinterp/corefcn/xdiv.h, libinterp/corefcn/xgl2ps.c,
libinterp/corefcn/xnorm.cc, libinterp/corefcn/xnorm.h,
libinterp/corefcn/xpow.cc, libinterp/corefcn/xpow.h,
libinterp/corefcn/zfstream.cc, libinterp/corefcn/zfstream.h:
Files moved from interp-core and interpfcn directories.
* libinterp/interp-core/Cell.cc, libinterp/interp-core/Cell.h,
libinterp/interp-core/action-container.h,
libinterp/interp-core/c-file-ptr-stream.cc,
libinterp/interp-core/c-file-ptr-stream.h,
libinterp/interp-core/comment-list.cc, libinterp/interp-core/comment-list.h,
libinterp/interp-core/cutils.c, libinterp/interp-core/cutils.h,
libinterp/interp-core/defun-dld.h, libinterp/interp-core/defun-int.h,
libinterp/interp-core/display.cc, libinterp/interp-core/display.h,
libinterp/interp-core/dynamic-ld.cc, libinterp/interp-core/dynamic-ld.h,
libinterp/interp-core/event-queue.h, libinterp/interp-core/gl-render.cc,
libinterp/interp-core/gl-render.h, libinterp/interp-core/gl2ps-renderer.cc,
libinterp/interp-core/gl2ps-renderer.h, libinterp/interp-core/gl2ps.c,
libinterp/interp-core/gl2ps.h, libinterp/interp-core/gripes.cc,
libinterp/interp-core/gripes.h, libinterp/interp-core/jit-ir.cc,
libinterp/interp-core/jit-ir.h, libinterp/interp-core/jit-typeinfo.cc,
libinterp/interp-core/jit-typeinfo.h, libinterp/interp-core/jit-util.cc,
libinterp/interp-core/jit-util.h, libinterp/interp-core/ls-ascii-helper.cc,
libinterp/interp-core/ls-ascii-helper.h, libinterp/interp-core/ls-hdf5.cc,
libinterp/interp-core/ls-hdf5.h, libinterp/interp-core/ls-mat-ascii.cc,
libinterp/interp-core/ls-mat-ascii.h, libinterp/interp-core/ls-mat4.cc,
libinterp/interp-core/ls-mat4.h, libinterp/interp-core/ls-mat5.cc,
libinterp/interp-core/ls-mat5.h, libinterp/interp-core/ls-oct-binary.cc,
libinterp/interp-core/ls-oct-binary.h, libinterp/interp-core/ls-utils.cc,
libinterp/interp-core/ls-utils.h, libinterp/interp-core/matherr.c,
libinterp/interp-core/mex.cc, libinterp/interp-core/mex.h,
libinterp/interp-core/mexproto.h, libinterp/interp-core/module.mk,
libinterp/interp-core/mxarray.in.h, libinterp/interp-core/oct-errno.h,
libinterp/interp-core/oct-errno.in.cc, libinterp/interp-core/oct-fstrm.cc,
libinterp/interp-core/oct-fstrm.h, libinterp/interp-core/oct-hdf5.h,
libinterp/interp-core/oct-iostrm.cc, libinterp/interp-core/oct-iostrm.h,
libinterp/interp-core/oct-lvalue.cc, libinterp/interp-core/oct-lvalue.h,
libinterp/interp-core/oct-map.cc, libinterp/interp-core/oct-map.h,
libinterp/interp-core/oct-obj.cc, libinterp/interp-core/oct-obj.h,
libinterp/interp-core/oct-prcstrm.cc, libinterp/interp-core/oct-prcstrm.h,
libinterp/interp-core/oct-procbuf.cc, libinterp/interp-core/oct-procbuf.h,
libinterp/interp-core/oct-stdstrm.h, libinterp/interp-core/oct-stream.cc,
libinterp/interp-core/oct-stream.h, libinterp/interp-core/oct-strstrm.cc,
libinterp/interp-core/oct-strstrm.h, libinterp/interp-core/oct.h,
libinterp/interp-core/procstream.cc, libinterp/interp-core/procstream.h,
libinterp/interp-core/pt-jit.cc, libinterp/interp-core/pt-jit.h,
libinterp/interp-core/siglist.c, libinterp/interp-core/siglist.h,
libinterp/interp-core/sparse-xdiv.cc, libinterp/interp-core/sparse-xdiv.h,
libinterp/interp-core/sparse-xpow.cc, libinterp/interp-core/sparse-xpow.h,
libinterp/interp-core/txt-eng-ft.cc, libinterp/interp-core/txt-eng-ft.h,
libinterp/interp-core/txt-eng.h, libinterp/interp-core/unwind-prot.cc,
libinterp/interp-core/unwind-prot.h, libinterp/interp-core/xdiv.cc,
libinterp/interp-core/xdiv.h, libinterp/interp-core/xgl2ps.c,
libinterp/interp-core/xnorm.cc, libinterp/interp-core/xnorm.h,
libinterp/interp-core/xpow.cc, libinterp/interp-core/xpow.h,
libinterp/interp-core/zfstream.cc, libinterp/interp-core/zfstream.h,
libinterp/interpfcn/data.cc, libinterp/interpfcn/data.h,
libinterp/interpfcn/debug.cc, libinterp/interpfcn/debug.h,
libinterp/interpfcn/defaults.cc, libinterp/interpfcn/defaults.in.h,
libinterp/interpfcn/defun.cc, libinterp/interpfcn/defun.h,
libinterp/interpfcn/dirfns.cc, libinterp/interpfcn/dirfns.h,
libinterp/interpfcn/error.cc, libinterp/interpfcn/error.h,
libinterp/interpfcn/file-io.cc, libinterp/interpfcn/file-io.h,
libinterp/interpfcn/graphics.cc, libinterp/interpfcn/graphics.in.h,
libinterp/interpfcn/help.cc, libinterp/interpfcn/help.h,
libinterp/interpfcn/hook-fcn.cc, libinterp/interpfcn/hook-fcn.h,
libinterp/interpfcn/input.cc, libinterp/interpfcn/input.h,
libinterp/interpfcn/load-path.cc, libinterp/interpfcn/load-path.h,
libinterp/interpfcn/load-save.cc, libinterp/interpfcn/load-save.h,
libinterp/interpfcn/ls-oct-ascii.cc, libinterp/interpfcn/ls-oct-ascii.h,
libinterp/interpfcn/module.mk, libinterp/interpfcn/oct-hist.cc,
libinterp/interpfcn/oct-hist.h, libinterp/interpfcn/octave-link.cc,
libinterp/interpfcn/octave-link.h, libinterp/interpfcn/pager.cc,
libinterp/interpfcn/pager.h, libinterp/interpfcn/pr-output.cc,
libinterp/interpfcn/pr-output.h, libinterp/interpfcn/profiler.cc,
libinterp/interpfcn/profiler.h, libinterp/interpfcn/sighandlers.cc,
libinterp/interpfcn/sighandlers.h, libinterp/interpfcn/symtab.cc,
libinterp/interpfcn/symtab.h, libinterp/interpfcn/sysdep.cc,
libinterp/interpfcn/sysdep.h, libinterp/interpfcn/toplev.cc,
libinterp/interpfcn/toplev.h, libinterp/interpfcn/utils.cc,
libinterp/interpfcn/utils.h, libinterp/interpfcn/variables.cc,
libinterp/interpfcn/variables.h, libinterp/interpfcn/workspace-element.h:
deleted files.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 03 Jul 2013 17:43:48 -0700 |
parents | 486c3e2731ff |
children | 8fbc09eded8c |
files | libgui/src/module.mk libinterp/Makefile.am libinterp/corefcn/Cell.cc libinterp/corefcn/Cell.h libinterp/corefcn/action-container.h libinterp/corefcn/c-file-ptr-stream.cc libinterp/corefcn/c-file-ptr-stream.h libinterp/corefcn/comment-list.cc libinterp/corefcn/comment-list.h libinterp/corefcn/cutils.c libinterp/corefcn/cutils.h libinterp/corefcn/data.cc libinterp/corefcn/data.h libinterp/corefcn/debug.cc libinterp/corefcn/debug.h libinterp/corefcn/defaults.cc libinterp/corefcn/defaults.in.h libinterp/corefcn/defun-dld.h libinterp/corefcn/defun-int.h libinterp/corefcn/defun.cc libinterp/corefcn/defun.h libinterp/corefcn/dirfns.cc libinterp/corefcn/dirfns.h libinterp/corefcn/display.cc libinterp/corefcn/display.h libinterp/corefcn/dynamic-ld.cc libinterp/corefcn/dynamic-ld.h libinterp/corefcn/error.cc libinterp/corefcn/error.h libinterp/corefcn/event-queue.h libinterp/corefcn/file-io.cc libinterp/corefcn/file-io.h libinterp/corefcn/gl-render.cc libinterp/corefcn/gl-render.h libinterp/corefcn/gl2ps-renderer.cc libinterp/corefcn/gl2ps-renderer.h libinterp/corefcn/gl2ps.c libinterp/corefcn/gl2ps.h libinterp/corefcn/graphics.cc libinterp/corefcn/graphics.in.h libinterp/corefcn/gripes.cc libinterp/corefcn/gripes.h libinterp/corefcn/help.cc libinterp/corefcn/help.h libinterp/corefcn/hook-fcn.cc libinterp/corefcn/hook-fcn.h libinterp/corefcn/input.cc libinterp/corefcn/input.h libinterp/corefcn/jit-ir.cc libinterp/corefcn/jit-ir.h libinterp/corefcn/jit-typeinfo.cc libinterp/corefcn/jit-typeinfo.h libinterp/corefcn/jit-util.cc libinterp/corefcn/jit-util.h libinterp/corefcn/load-path.cc libinterp/corefcn/load-path.h libinterp/corefcn/load-save.cc libinterp/corefcn/load-save.h libinterp/corefcn/ls-ascii-helper.cc libinterp/corefcn/ls-ascii-helper.h libinterp/corefcn/ls-hdf5.cc libinterp/corefcn/ls-hdf5.h libinterp/corefcn/ls-mat-ascii.cc libinterp/corefcn/ls-mat-ascii.h libinterp/corefcn/ls-mat4.cc libinterp/corefcn/ls-mat4.h libinterp/corefcn/ls-mat5.cc libinterp/corefcn/ls-mat5.h libinterp/corefcn/ls-oct-ascii.cc libinterp/corefcn/ls-oct-ascii.h libinterp/corefcn/ls-oct-binary.cc libinterp/corefcn/ls-oct-binary.h libinterp/corefcn/ls-utils.cc libinterp/corefcn/ls-utils.h libinterp/corefcn/matherr.c libinterp/corefcn/mex.cc libinterp/corefcn/mex.h libinterp/corefcn/mexproto.h libinterp/corefcn/module.mk libinterp/corefcn/mxarray.in.h libinterp/corefcn/oct-errno.h libinterp/corefcn/oct-errno.in.cc libinterp/corefcn/oct-fstrm.cc libinterp/corefcn/oct-fstrm.h libinterp/corefcn/oct-hdf5.h libinterp/corefcn/oct-hist.cc libinterp/corefcn/oct-hist.h libinterp/corefcn/oct-iostrm.cc libinterp/corefcn/oct-iostrm.h libinterp/corefcn/oct-lvalue.cc libinterp/corefcn/oct-lvalue.h libinterp/corefcn/oct-map.cc libinterp/corefcn/oct-map.h libinterp/corefcn/oct-obj.cc libinterp/corefcn/oct-obj.h libinterp/corefcn/oct-prcstrm.cc libinterp/corefcn/oct-prcstrm.h libinterp/corefcn/oct-procbuf.cc libinterp/corefcn/oct-procbuf.h libinterp/corefcn/oct-stdstrm.h libinterp/corefcn/oct-stream.cc libinterp/corefcn/oct-stream.h libinterp/corefcn/oct-strstrm.cc libinterp/corefcn/oct-strstrm.h libinterp/corefcn/oct.h libinterp/corefcn/octave-link.cc libinterp/corefcn/octave-link.h libinterp/corefcn/pager.cc libinterp/corefcn/pager.h libinterp/corefcn/pr-output.cc libinterp/corefcn/pr-output.h libinterp/corefcn/procstream.cc libinterp/corefcn/procstream.h libinterp/corefcn/profiler.cc libinterp/corefcn/profiler.h libinterp/corefcn/pt-jit.cc libinterp/corefcn/pt-jit.h libinterp/corefcn/sighandlers.cc libinterp/corefcn/sighandlers.h libinterp/corefcn/siglist.c libinterp/corefcn/siglist.h libinterp/corefcn/sparse-xdiv.cc libinterp/corefcn/sparse-xdiv.h libinterp/corefcn/sparse-xpow.cc libinterp/corefcn/sparse-xpow.h libinterp/corefcn/symtab.cc libinterp/corefcn/symtab.h libinterp/corefcn/sysdep.cc libinterp/corefcn/sysdep.h libinterp/corefcn/toplev.cc libinterp/corefcn/toplev.h libinterp/corefcn/txt-eng-ft.cc libinterp/corefcn/txt-eng-ft.h libinterp/corefcn/txt-eng.h libinterp/corefcn/unwind-prot.cc libinterp/corefcn/unwind-prot.h libinterp/corefcn/utils.cc libinterp/corefcn/utils.h libinterp/corefcn/variables.cc libinterp/corefcn/variables.h libinterp/corefcn/workspace-element.h libinterp/corefcn/xdiv.cc libinterp/corefcn/xdiv.h libinterp/corefcn/xgl2ps.c libinterp/corefcn/xnorm.cc libinterp/corefcn/xnorm.h libinterp/corefcn/xpow.cc libinterp/corefcn/xpow.h libinterp/corefcn/zfstream.cc libinterp/corefcn/zfstream.h libinterp/interp-core/Cell.cc libinterp/interp-core/Cell.h libinterp/interp-core/action-container.h libinterp/interp-core/c-file-ptr-stream.cc libinterp/interp-core/c-file-ptr-stream.h libinterp/interp-core/comment-list.cc libinterp/interp-core/comment-list.h libinterp/interp-core/cutils.c libinterp/interp-core/cutils.h libinterp/interp-core/defun-dld.h libinterp/interp-core/defun-int.h libinterp/interp-core/display.cc libinterp/interp-core/display.h libinterp/interp-core/dynamic-ld.cc libinterp/interp-core/dynamic-ld.h libinterp/interp-core/event-queue.h libinterp/interp-core/gl-render.cc libinterp/interp-core/gl-render.h libinterp/interp-core/gl2ps-renderer.cc libinterp/interp-core/gl2ps-renderer.h libinterp/interp-core/gl2ps.c libinterp/interp-core/gl2ps.h libinterp/interp-core/gripes.cc libinterp/interp-core/gripes.h libinterp/interp-core/jit-ir.cc libinterp/interp-core/jit-ir.h libinterp/interp-core/jit-typeinfo.cc libinterp/interp-core/jit-typeinfo.h libinterp/interp-core/jit-util.cc libinterp/interp-core/jit-util.h libinterp/interp-core/ls-ascii-helper.cc libinterp/interp-core/ls-ascii-helper.h libinterp/interp-core/ls-hdf5.cc libinterp/interp-core/ls-hdf5.h libinterp/interp-core/ls-mat-ascii.cc libinterp/interp-core/ls-mat-ascii.h libinterp/interp-core/ls-mat4.cc libinterp/interp-core/ls-mat4.h libinterp/interp-core/ls-mat5.cc libinterp/interp-core/ls-mat5.h libinterp/interp-core/ls-oct-binary.cc libinterp/interp-core/ls-oct-binary.h libinterp/interp-core/ls-utils.cc libinterp/interp-core/ls-utils.h libinterp/interp-core/matherr.c libinterp/interp-core/mex.cc libinterp/interp-core/mex.h libinterp/interp-core/mexproto.h libinterp/interp-core/module.mk libinterp/interp-core/mxarray.in.h libinterp/interp-core/oct-errno.h libinterp/interp-core/oct-errno.in.cc libinterp/interp-core/oct-fstrm.cc libinterp/interp-core/oct-fstrm.h libinterp/interp-core/oct-hdf5.h libinterp/interp-core/oct-iostrm.cc libinterp/interp-core/oct-iostrm.h libinterp/interp-core/oct-lvalue.cc libinterp/interp-core/oct-lvalue.h libinterp/interp-core/oct-map.cc libinterp/interp-core/oct-map.h libinterp/interp-core/oct-obj.cc libinterp/interp-core/oct-obj.h libinterp/interp-core/oct-prcstrm.cc libinterp/interp-core/oct-prcstrm.h libinterp/interp-core/oct-procbuf.cc libinterp/interp-core/oct-procbuf.h libinterp/interp-core/oct-stdstrm.h libinterp/interp-core/oct-stream.cc libinterp/interp-core/oct-stream.h libinterp/interp-core/oct-strstrm.cc libinterp/interp-core/oct-strstrm.h libinterp/interp-core/oct.h libinterp/interp-core/procstream.cc libinterp/interp-core/procstream.h libinterp/interp-core/pt-jit.cc libinterp/interp-core/pt-jit.h libinterp/interp-core/siglist.c libinterp/interp-core/siglist.h libinterp/interp-core/sparse-xdiv.cc libinterp/interp-core/sparse-xdiv.h libinterp/interp-core/sparse-xpow.cc libinterp/interp-core/sparse-xpow.h libinterp/interp-core/txt-eng-ft.cc libinterp/interp-core/txt-eng-ft.h libinterp/interp-core/txt-eng.h libinterp/interp-core/unwind-prot.cc libinterp/interp-core/unwind-prot.h libinterp/interp-core/xdiv.cc libinterp/interp-core/xdiv.h libinterp/interp-core/xgl2ps.c libinterp/interp-core/xnorm.cc libinterp/interp-core/xnorm.h libinterp/interp-core/xpow.cc libinterp/interp-core/xpow.h libinterp/interp-core/zfstream.cc libinterp/interp-core/zfstream.h libinterp/interpfcn/data.cc libinterp/interpfcn/data.h libinterp/interpfcn/debug.cc libinterp/interpfcn/debug.h libinterp/interpfcn/defaults.cc libinterp/interpfcn/defaults.in.h libinterp/interpfcn/defun.cc libinterp/interpfcn/defun.h libinterp/interpfcn/dirfns.cc libinterp/interpfcn/dirfns.h libinterp/interpfcn/error.cc libinterp/interpfcn/error.h libinterp/interpfcn/file-io.cc libinterp/interpfcn/file-io.h libinterp/interpfcn/graphics.cc libinterp/interpfcn/graphics.in.h libinterp/interpfcn/help.cc libinterp/interpfcn/help.h libinterp/interpfcn/hook-fcn.cc libinterp/interpfcn/hook-fcn.h libinterp/interpfcn/input.cc libinterp/interpfcn/input.h libinterp/interpfcn/load-path.cc libinterp/interpfcn/load-path.h libinterp/interpfcn/load-save.cc libinterp/interpfcn/load-save.h libinterp/interpfcn/ls-oct-ascii.cc libinterp/interpfcn/ls-oct-ascii.h libinterp/interpfcn/module.mk libinterp/interpfcn/oct-hist.cc libinterp/interpfcn/oct-hist.h libinterp/interpfcn/octave-link.cc libinterp/interpfcn/octave-link.h libinterp/interpfcn/pager.cc libinterp/interpfcn/pager.h libinterp/interpfcn/pr-output.cc libinterp/interpfcn/pr-output.h libinterp/interpfcn/profiler.cc libinterp/interpfcn/profiler.h libinterp/interpfcn/sighandlers.cc libinterp/interpfcn/sighandlers.h libinterp/interpfcn/symtab.cc libinterp/interpfcn/symtab.h libinterp/interpfcn/sysdep.cc libinterp/interpfcn/sysdep.h libinterp/interpfcn/toplev.cc libinterp/interpfcn/toplev.h libinterp/interpfcn/utils.cc libinterp/interpfcn/utils.h libinterp/interpfcn/variables.cc libinterp/interpfcn/variables.h libinterp/interpfcn/workspace-element.h src/Makefile.am |
diffstat | 153 files changed, 221 insertions(+), 250 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/module.mk +++ b/libgui/src/module.mk @@ -177,8 +177,7 @@ -I$(top_srcdir)/liboctave/util \ -I$(top_builddir)/libinterp -I$(top_srcdir)/libinterp \ -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \ - -I$(top_builddir)/libinterp/interp-core -I$(top_srcdir)/libinterp/interp-core \ - -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ + -I$(top_builddir)/libinterp/corefcn -I$(top_srcdir)/libinterp/corefcn \ -I$(top_srcdir)/libinterp/octave-value src_libgui_src_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
--- a/libinterp/Makefile.am +++ b/libinterp/Makefile.am @@ -33,9 +33,7 @@ -I$(srcdir)/octave-value \ -I$(srcdir)/operators \ -Iparse-tree -I$(srcdir)/parse-tree \ - -Iinterp-core -I$(srcdir)/interp-core \ - -Iinterpfcn -I$(srcdir)/interpfcn \ - -Icorefcn \ + -Icorefcn -I$(srcdir)/corefcn \ -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu AM_CFLAGS += $(WARN_CFLAGS) @@ -48,11 +46,11 @@ ## $(DEF_FILES), and building those requires all the sources ## (except builtins.cc) to be available. BUILT_SOURCES = \ - interp-core/mxarray.h \ - interp-core/oct-errno.cc \ - interpfcn/defaults.h \ - interpfcn/graphics-props.cc \ - interpfcn/graphics.h \ + corefcn/mxarray.h \ + corefcn/oct-errno.cc \ + corefcn/defaults.h \ + corefcn/graphics-props.cc \ + corefcn/graphics.h \ operators/ops.cc \ parse-tree/lex.cc \ parse-tree/oct-gperf.h \ @@ -71,10 +69,10 @@ ## 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 \ + corefcn/mxarray.h \ + corefcn/oct-errno.cc \ + corefcn/defaults.h \ + corefcn/graphics.h \ builtin-defun-decls.h \ operators/ops.cc \ oct-conf.h \ @@ -103,7 +101,7 @@ $(BUILT_DISTFILES) octinclude_HEADERS = \ - interpfcn/graphics-props.cc \ + corefcn/graphics-props.cc \ parse-tree/oct-gperf.h \ builtins.h \ builtin-defun-decls.h \ @@ -112,13 +110,12 @@ $(PARSE_TREE_INC) \ $(PARSER_INC) \ $(OPERATORS_INC) \ - $(INTERP_CORE_INC) \ - $(INTERPFCN_INC) + $(COREFCN_INC) nodist_octinclude_HEADERS = \ - interp-core/mxarray.h \ - interpfcn/defaults.h \ - interpfcn/graphics.h \ + corefcn/mxarray.h \ + corefcn/defaults.h \ + corefcn/graphics.h \ oct-conf.h \ version.h @@ -127,8 +124,6 @@ $(OCTAVE_VALUE_SRC) \ $(PARSE_TREE_SRC) \ $(PARSER_SRC) \ - $(INTERP_CORE_SRC) \ - $(INTERPFCN_SRC) \ $(COREFCN_SRC) noinst_LTLIBRARIES = @@ -137,8 +132,6 @@ include octave-value/module.mk include operators/module.mk include template-inst/module.mk -include interp-core/module.mk -include interpfcn/module.mk include corefcn/module.mk include dldfcn/module.mk @@ -161,10 +154,10 @@ $(TEMPLATE_INST_SRC) nodist_liboctinterp_la_SOURCES = \ - interp-core/mxarray.h \ - interp-core/oct-errno.cc \ - interpfcn/defaults.h \ - interpfcn/graphics.h \ + corefcn/mxarray.h \ + corefcn/oct-errno.cc \ + corefcn/defaults.h \ + corefcn/graphics.h \ operators/ops.cc \ builtin-defun-decls.h \ builtins.cc \ @@ -181,8 +174,6 @@ octave-value/liboctave-value.la \ parse-tree/libparse-tree.la \ parse-tree/libparser.la \ - interp-core/libinterp-core.la \ - interpfcn/libinterpfcn.la \ corefcn/libcorefcn.la \ $(top_builddir)/liboctave/liboctave.la \ $(LIBOCTINTERP_LINK_DEPS) @@ -365,7 +356,7 @@ CLEANFILES = \ $(DLDFCN_PKG_ADD_FILE) \ - interpfcn/graphics-props.cc \ + corefcn/graphics-props.cc \ parse-tree/oct-parse.output DISTCLEANFILES = \
rename from libinterp/interp-core/c-file-ptr-stream.cc rename to libinterp/corefcn/c-file-ptr-stream.cc
rename from libinterp/interp-core/c-file-ptr-stream.h rename to libinterp/corefcn/c-file-ptr-stream.h
--- a/libinterp/corefcn/module.mk +++ b/libinterp/corefcn/module.mk @@ -1,5 +1,10 @@ EXTRA_DIST += \ - corefcn/module.mk + corefcn/module.mk \ + corefcn/defaults.in.h \ + corefcn/gl2ps.c \ + corefcn/graphics.in.h \ + corefcn/mxarray.in.h \ + corefcn/oct-errno.in.cc ## Options functions for Fortran packages like LSODE, DASPK. ## These are generated automagically by configure and Perl. @@ -24,7 +29,101 @@ $(OPT_INC) : %.h : %.in $(MAKE) -C $(top_builddir)/liboctave/numeric $(@F) +JIT_INC = \ + corefcn/jit-util.h \ + corefcn/jit-typeinfo.h \ + corefcn/jit-ir.h \ + corefcn/pt-jit.h + +COREFCN_INC = \ + corefcn/Cell.h \ + corefcn/action-container.h \ + corefcn/c-file-ptr-stream.h \ + corefcn/comment-list.h \ + corefcn/cutils.h \ + corefcn/data.h \ + corefcn/debug.h \ + corefcn/defun-dld.h \ + corefcn/defun-int.h \ + corefcn/defun.h \ + corefcn/dirfns.h \ + corefcn/display.h \ + corefcn/dynamic-ld.h \ + corefcn/error.h \ + corefcn/event-queue.h \ + corefcn/file-io.h \ + corefcn/gl-render.h \ + corefcn/gl2ps-renderer.h \ + corefcn/gl2ps.h \ + corefcn/gripes.h \ + corefcn/help.h \ + corefcn/hook-fcn.h \ + corefcn/input.h \ + corefcn/load-path.h \ + corefcn/load-save.h \ + corefcn/ls-ascii-helper.h \ + corefcn/ls-hdf5.h \ + corefcn/ls-mat-ascii.h \ + corefcn/ls-mat4.h \ + corefcn/ls-mat5.h \ + corefcn/ls-oct-ascii.h \ + corefcn/ls-oct-binary.h \ + corefcn/ls-utils.h \ + corefcn/mex.h \ + corefcn/mexproto.h \ + corefcn/mxarray.in.h \ + corefcn/oct-errno.h \ + corefcn/oct-fstrm.h \ + corefcn/oct-hdf5.h \ + corefcn/oct-hist.h \ + corefcn/oct-iostrm.h \ + corefcn/oct-lvalue.h \ + corefcn/oct-map.h \ + corefcn/oct-obj.h \ + corefcn/oct-prcstrm.h \ + corefcn/oct-procbuf.h \ + corefcn/oct-stdstrm.h \ + corefcn/oct-stream.h \ + corefcn/oct-strstrm.h \ + corefcn/oct.h \ + corefcn/octave-link.h \ + corefcn/pager.h \ + corefcn/pr-output.h \ + corefcn/procstream.h \ + corefcn/profiler.h \ + corefcn/sighandlers.h \ + corefcn/siglist.h \ + corefcn/sparse-xdiv.h \ + corefcn/sparse-xpow.h \ + corefcn/symtab.h \ + corefcn/sysdep.h \ + corefcn/toplev.h \ + corefcn/txt-eng-ft.h \ + corefcn/txt-eng.h \ + corefcn/unwind-prot.h \ + corefcn/utils.h \ + corefcn/variables.h \ + corefcn/workspace-element.h \ + corefcn/xdiv.h \ + corefcn/xnorm.h \ + corefcn/xpow.h \ + corefcn/zfstream.h \ + $(JIT_INC) + +JIT_SRC = \ + corefcn/jit-util.cc \ + corefcn/jit-typeinfo.cc \ + corefcn/jit-ir.cc \ + corefcn/pt-jit.cc + +C_COREFCN_SRC = \ + corefcn/cutils.c \ + corefcn/matherr.c \ + corefcn/siglist.c \ + corefcn/xgl2ps.c + COREFCN_SRC = \ + corefcn/Cell.cc \ corefcn/__contourc__.cc \ corefcn/__dispatch__.cc \ corefcn/__lin_interpn__.cc \ @@ -35,20 +134,31 @@ corefcn/betainc.cc \ corefcn/bitfcns.cc \ corefcn/bsxfun.cc \ + corefcn/c-file-ptr-stream.cc \ corefcn/cellfun.cc \ corefcn/colloc.cc \ + corefcn/comment-list.cc \ corefcn/conv2.cc \ corefcn/daspk.cc \ corefcn/dasrt.cc \ corefcn/dassl.cc \ + corefcn/data.cc \ + corefcn/debug.cc \ + corefcn/defaults.cc \ + corefcn/defun.cc \ corefcn/det.cc \ + corefcn/dirfns.cc \ + corefcn/display.cc \ corefcn/dlmread.cc \ corefcn/dot.cc \ + corefcn/dynamic-ld.cc \ corefcn/eig.cc \ corefcn/ellipj.cc \ + corefcn/error.cc \ corefcn/fft.cc \ corefcn/fft2.cc \ corefcn/fftn.cc \ + corefcn/file-io.cc \ corefcn/filter.cc \ corefcn/find.cc \ corefcn/gammainc.cc \ @@ -57,11 +167,28 @@ corefcn/getpwent.cc \ corefcn/getrusage.cc \ corefcn/givens.cc \ + corefcn/gl-render.cc \ + corefcn/gl2ps-renderer.cc \ + corefcn/graphics.cc \ + corefcn/gripes.cc \ + corefcn/help.cc \ corefcn/hess.cc \ corefcn/hex2num.cc \ + corefcn/hook-fcn.cc \ + corefcn/input.cc \ corefcn/inv.cc \ corefcn/kron.cc \ + corefcn/load-path.cc \ + corefcn/load-save.cc \ corefcn/lookup.cc \ + corefcn/ls-ascii-helper.cc \ + corefcn/ls-hdf5.cc \ + corefcn/ls-mat-ascii.cc \ + corefcn/ls-mat4.cc \ + corefcn/ls-mat5.cc \ + corefcn/ls-oct-ascii.cc \ + corefcn/ls-oct-binary.cc \ + corefcn/ls-utils.cc \ corefcn/lsode.cc \ corefcn/lu.cc \ corefcn/luinc.cc \ @@ -69,9 +196,25 @@ corefcn/matrix_type.cc \ corefcn/max.cc \ corefcn/md5sum.cc \ + corefcn/mex.cc \ corefcn/mgorth.cc \ corefcn/nproc.cc \ + corefcn/oct-fstrm.cc \ + corefcn/oct-hist.cc \ + corefcn/oct-iostrm.cc \ + corefcn/oct-lvalue.cc \ + corefcn/oct-map.cc \ + corefcn/oct-obj.cc \ + corefcn/oct-prcstrm.cc \ + corefcn/oct-procbuf.cc \ + corefcn/oct-stream.cc \ + corefcn/oct-strstrm.cc \ + corefcn/octave-link.cc \ + corefcn/pager.cc \ corefcn/pinv.cc \ + corefcn/pr-output.cc \ + corefcn/procstream.cc \ + corefcn/profiler.cc \ corefcn/quad.cc \ corefcn/quadcc.cc \ corefcn/qz.cc \ @@ -79,6 +222,9 @@ corefcn/rcond.cc \ corefcn/regexp.cc \ corefcn/schur.cc \ + corefcn/sighandlers.cc \ + corefcn/sparse-xdiv.cc \ + corefcn/sparse-xpow.cc \ corefcn/sparse.cc \ corefcn/spparms.cc \ corefcn/sqrtm.cc \ @@ -88,10 +234,61 @@ corefcn/sub2ind.cc \ corefcn/svd.cc \ corefcn/syl.cc \ + corefcn/symtab.cc \ corefcn/syscalls.cc \ + corefcn/sysdep.cc \ corefcn/time.cc \ + corefcn/toplev.cc \ corefcn/tril.cc \ - corefcn/typecast.cc + corefcn/txt-eng-ft.cc \ + corefcn/typecast.cc \ + corefcn/unwind-prot.cc \ + corefcn/utils.cc \ + corefcn/variables.cc \ + corefcn/xdiv.cc \ + corefcn/xnorm.cc \ + corefcn/xpow.cc \ + corefcn/zfstream.cc \ + $(JIT_SRC) \ + $(C_COREFCN_SRC) + +## FIXME: Automake does not support per-object rules. +## These rules could be emulated by creating a new convenience +## library and using per-library rules. Or we can just live +## without the rule since there haven't been any problems. (09/18/2012) +#display.df display.lo: CPPFLAGS += $(X11_FLAGS) + +## Special rules for sources which must be built before rest of compilation. + +## defaults.h and graphics.h must depend on Makefile. Calling configure +## may change default/config values. However, calling configure will also +## regenerate the Makefiles from Makefile.am and trigger the rules below. +corefcn/defaults.h: corefcn/defaults.in.h Makefile + @$(do_subst_default_vals) + +corefcn/graphics.h: corefcn/graphics.in.h genprops.awk Makefile + $(AWK) -f $(srcdir)/genprops.awk $< > $@-t + mv $@-t $@ + +corefcn/graphics-props.cc: corefcn/graphics.in.h genprops.awk Makefile + $(AWK) -v emit_graphics_props=1 -f $(srcdir)/genprops.awk $< > $@-t + mv $@-t $@ + +corefcn/oct-errno.cc: corefcn/oct-errno.in.cc Makefile + if test -n "$(PERL)"; then \ + $(srcdir)/mk-errno-list --perl "$(PERL)" < $< > $@-t; \ + elif test -n "$(PYTHON)"; then \ + $(srcdir)/mk-errno-list --python "$(PYTHON)" < $< > $@-t; \ + else \ + $(SED) '/@SYSDEP_ERRNO_LIST@/D' $< > $@-t; \ + fi + mv $@-t $@ + +corefcn/mxarray.h: corefcn/mxarray.in.h Makefile + $(SED) < $< \ + -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically from $(<F) by Make.|" \ + -e "s|%OCTAVE_IDX_TYPE%|${OCTAVE_IDX_TYPE}|" > $@-t + mv $@-t $@ noinst_LTLIBRARIES += corefcn/libcorefcn.la
deleted file mode 100644 --- a/libinterp/interp-core/module.mk +++ /dev/null @@ -1,140 +0,0 @@ -EXTRA_DIST += \ - interp-core/module.mk \ - interp-core/gl2ps.c \ - interp-core/mxarray.in.h \ - interp-core/oct-errno.in.cc - -JIT_INC = \ - interp-core/jit-util.h \ - interp-core/jit-typeinfo.h \ - interp-core/jit-ir.h \ - interp-core/pt-jit.h - -INTERP_CORE_INC = \ - interp-core/Cell.h \ - interp-core/action-container.h \ - interp-core/c-file-ptr-stream.h \ - interp-core/comment-list.h \ - interp-core/cutils.h \ - interp-core/defun-dld.h \ - interp-core/defun-int.h \ - interp-core/display.h \ - interp-core/dynamic-ld.h \ - interp-core/event-queue.h \ - interp-core/gl-render.h \ - interp-core/gl2ps-renderer.h \ - interp-core/gl2ps.h \ - interp-core/gripes.h \ - interp-core/ls-ascii-helper.h \ - interp-core/ls-hdf5.h \ - interp-core/ls-mat-ascii.h \ - interp-core/ls-mat4.h \ - interp-core/ls-mat5.h \ - interp-core/ls-oct-binary.h \ - interp-core/ls-utils.h \ - interp-core/mex.h \ - interp-core/mexproto.h \ - interp-core/mxarray.in.h \ - interp-core/oct-errno.h \ - interp-core/oct-fstrm.h \ - interp-core/oct-hdf5.h \ - interp-core/oct-iostrm.h \ - interp-core/oct-lvalue.h \ - interp-core/oct-map.h \ - interp-core/oct-obj.h \ - interp-core/oct-prcstrm.h \ - interp-core/oct-procbuf.h \ - interp-core/oct-stdstrm.h \ - interp-core/oct-stream.h \ - interp-core/oct-strstrm.h \ - interp-core/oct.h \ - interp-core/procstream.h \ - interp-core/siglist.h \ - interp-core/sparse-xdiv.h \ - interp-core/sparse-xpow.h \ - interp-core/txt-eng-ft.h \ - interp-core/txt-eng.h \ - interp-core/unwind-prot.h \ - interp-core/xdiv.h \ - interp-core/xnorm.h \ - interp-core/xpow.h \ - interp-core/zfstream.h \ - $(JIT_INC) - -JIT_SRC = \ - interp-core/jit-util.cc \ - interp-core/jit-typeinfo.cc \ - interp-core/jit-ir.cc \ - interp-core/pt-jit.cc - -C_INTERP_CORE_SRC = \ - interp-core/cutils.c \ - interp-core/matherr.c \ - interp-core/siglist.c \ - interp-core/xgl2ps.c - -INTERP_CORE_SRC = \ - interp-core/Cell.cc \ - interp-core/c-file-ptr-stream.cc \ - interp-core/comment-list.cc \ - interp-core/display.cc \ - interp-core/dynamic-ld.cc \ - interp-core/gl-render.cc \ - interp-core/gl2ps-renderer.cc \ - interp-core/gripes.cc \ - interp-core/ls-ascii-helper.cc \ - interp-core/ls-hdf5.cc \ - interp-core/ls-mat-ascii.cc \ - interp-core/ls-mat4.cc \ - interp-core/ls-mat5.cc \ - interp-core/ls-oct-binary.cc \ - interp-core/ls-utils.cc \ - interp-core/mex.cc \ - interp-core/oct-fstrm.cc \ - interp-core/oct-iostrm.cc \ - interp-core/oct-lvalue.cc \ - interp-core/oct-map.cc \ - interp-core/oct-obj.cc \ - interp-core/oct-prcstrm.cc \ - interp-core/oct-procbuf.cc \ - interp-core/oct-stream.cc \ - interp-core/oct-strstrm.cc \ - interp-core/procstream.cc \ - interp-core/sparse-xdiv.cc \ - interp-core/sparse-xpow.cc \ - interp-core/txt-eng-ft.cc \ - interp-core/unwind-prot.cc \ - interp-core/xdiv.cc \ - interp-core/xnorm.cc \ - interp-core/xpow.cc \ - interp-core/zfstream.cc \ - $(JIT_SRC) \ - $(C_INTERP_CORE_SRC) - -## FIXME: Automake does not support per-object rules. -## These rules could be emulated by creating a new convenience -## library and using per-library rules. Or we can just live -## without the rule since there haven't been any problems. (09/18/2012) -#display.df display.lo: CPPFLAGS += $(X11_FLAGS) - -## Special rules for sources which must be built before rest of compilation. -interp-core/oct-errno.cc: interp-core/oct-errno.in.cc Makefile - if test -n "$(PERL)"; then \ - $(srcdir)/mk-errno-list --perl "$(PERL)" < $< > $@-t; \ - elif test -n "$(PYTHON)"; then \ - $(srcdir)/mk-errno-list --python "$(PYTHON)" < $< > $@-t; \ - else \ - $(SED) '/@SYSDEP_ERRNO_LIST@/D' $< > $@-t; \ - fi - mv $@-t $@ - -interp-core/mxarray.h: interp-core/mxarray.in.h Makefile - $(SED) < $< \ - -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically from $(<F) by Make.|" \ - -e "s|%OCTAVE_IDX_TYPE%|${OCTAVE_IDX_TYPE}|" > $@-t - mv $@-t $@ - -noinst_LTLIBRARIES += interp-core/libinterp-core.la - -interp_core_libinterp_core_la_SOURCES = $(INTERP_CORE_SRC) -interp_core_libinterp_core_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS)
deleted file mode 100644 --- a/libinterp/interpfcn/module.mk +++ /dev/null @@ -1,76 +0,0 @@ -EXTRA_DIST += \ - interpfcn/module.mk \ - interpfcn/defaults.in.h \ - interpfcn/graphics.in.h - -INTERPFCN_INC = \ - interpfcn/data.h \ - interpfcn/debug.h \ - interpfcn/defun.h \ - interpfcn/dirfns.h \ - interpfcn/error.h \ - interpfcn/file-io.h \ - interpfcn/help.h \ - interpfcn/hook-fcn.h \ - interpfcn/input.h \ - interpfcn/load-path.h \ - interpfcn/load-save.h \ - interpfcn/ls-oct-ascii.h \ - interpfcn/octave-link.h \ - interpfcn/oct-hist.h \ - interpfcn/pager.h \ - interpfcn/pr-output.h \ - interpfcn/profiler.h \ - interpfcn/sighandlers.h \ - interpfcn/symtab.h \ - interpfcn/sysdep.h \ - interpfcn/toplev.h \ - interpfcn/utils.h \ - interpfcn/variables.h \ - interpfcn/workspace-element.h - -INTERPFCN_SRC = \ - interpfcn/data.cc \ - interpfcn/debug.cc \ - interpfcn/defaults.cc \ - interpfcn/defun.cc \ - interpfcn/dirfns.cc \ - interpfcn/error.cc \ - interpfcn/file-io.cc \ - interpfcn/graphics.cc \ - interpfcn/help.cc \ - interpfcn/hook-fcn.cc \ - interpfcn/input.cc \ - interpfcn/load-path.cc \ - interpfcn/load-save.cc \ - interpfcn/ls-oct-ascii.cc \ - interpfcn/octave-link.cc \ - interpfcn/oct-hist.cc \ - interpfcn/pager.cc \ - interpfcn/pr-output.cc \ - interpfcn/profiler.cc \ - interpfcn/sighandlers.cc \ - interpfcn/symtab.cc \ - interpfcn/sysdep.cc \ - interpfcn/toplev.cc \ - interpfcn/utils.cc \ - interpfcn/variables.cc - -## defaults.h and graphics.h must depend on Makefile. Calling configure -## may change default/config values. However, calling configure will also -## regenerate the Makefiles from Makefile.am and trigger the rules below. -interpfcn/defaults.h: interpfcn/defaults.in.h Makefile - @$(do_subst_default_vals) - -interpfcn/graphics.h: interpfcn/graphics.in.h genprops.awk Makefile - $(AWK) -f $(srcdir)/genprops.awk $< > $@-t - mv $@-t $@ - -interpfcn/graphics-props.cc: interpfcn/graphics.in.h genprops.awk Makefile - $(AWK) -v emit_graphics_props=1 -f $(srcdir)/genprops.awk $< > $@-t - mv $@-t $@ - -noinst_LTLIBRARIES += interpfcn/libinterpfcn.la - -interpfcn_libinterpfcn_la_SOURCES = $(INTERPFCN_SRC) -interpfcn_libinterpfcn_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS)
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,7 @@ -I$(top_srcdir)/liboctave/system \ -I$(top_srcdir)/liboctave/util \ -I$(top_srcdir)/libinterp \ - -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ + -I$(top_builddir)/libinterp/corefcn -I$(top_srcdir)/libinterp/corefcn \ -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu AM_CFLAGS += $(WARN_CFLAGS)