Mercurial > octave-nkf
view run-octave.in @ 15272:dd794aa84232
additional changes for merger of libcruft with liboctave
* libgui/src/Makefile.am (AM_CPPFLAGS): Include
-I../../liboctave/numeric, -I../../liboctave/operators,
--I$(srcdir)/../../liboctave/array,
--I$(srcdir)/../../liboctave/numeric,
--I$(srcdir)/../../liboctave/operators,
--I$(srcdir)/../../liboctave/system, and
-I$(srcdir)/../../liboctave/util in the list.
* libinterp/link-deps.mk (LIBOCTINTERP_LINK_DEPS): Delete
$(GNULIB_LINK_DEPS) from the list.
* liboctave/Makefile.am (liboctae_la_LIBADD): Include
cruft/ranlib/libranlib.la and ../libgnu/libgnu.la in the list.
* liboctave/cruft/link-deps.mk: Delete.
* liboctave/cruft/Makefile.am (noinst_LTLIBRARIES): Rename from
octlib_LTLIBRARIES. Don't include link-deps.mk.
(libcruft_la_LIBADD, libcruft_current, libcruft_revision,
libcruft_age, libcruft_la_LDFLAGS): Delete.
Build libranlib.la in ranlib subdirectory.
* module.mk (ranlib_libranlib_la_SOURCES): Rename from libranlib_la_SOURCES.
* liboctave/link-deps.mk: Don't include
$(top_srcdir)/liboctave/cruft/link-deps.mk.
(GNULIB_LINK_DEPS): Move definition here from
liboctave/cruft/link-deps.mk.
(LIBOCTAVE_LINK_DEPS): Include $(FLIBS) in the list.
Don't add $(LIBCRUFT_LINK_DEPS) to LIBOCTAVE_LINK_DEPS.
Don't add $(LIBCRUFT_LINK_OPTS) to LIBOCTAVE_LINK_OPTS.
* liboctave/operators/module.mk: Use correct names for mk-ops.awk
script and mx-ops, vx-ops, and sparse-mx-ops files.
* src/Makefile.am (AM_CPPFLAGS): Include
-I$(srcdir)/../liboctave/array, -I$(srcdir)/../liboctave/numeric, and
-I$(srcdir)/../liboctave/util in the list.
Include -I$(srcdir)/../liboctave/cruft/misc in the list, not
-I$(srcdir)/../libcruft/misc.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 01 Sep 2012 10:46:45 -0400 |
parents | 7880fa9d676f |
children | 5187c3ea5a68 |
line wrap: on
line source
#! /bin/sh ## ## run-octave -- run Octave in the build tree. ## ## Copyright (C) 2006-2012 John W. Eaton ## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the ## Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but WITHOUT ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. AWK=%AWK% FIND=%FIND% SED=%SED% # FIXME -- is there a better way to handle the possibility of spaces # in these names? top_srcdir='%abs_top_srcdir%' builddir='%builddir%' d1="$top_srcdir/scripts" d2="$builddir/scripts" d3="$builddir/libinterp" d1_list=`$FIND "$d1" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'` d2_list=`$FIND "$d2" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'` d3_list=`$FIND "$d3" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'` d1_path=`echo "$d1_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` d2_path=`echo "$d2_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` d3_path=`echo "$d3_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` octave_executable="$builddir/src/octave" LOADPATH="$d1_path:$d2_path:$d3_path" IMAGEPATH="$top_srcdir/scripts/image" DOCFILE="$builddir/doc/interpreter/doc-cache" TEXIMACROSFILE="$top_srcdir/doc/interpreter/macros.texi" INFOFILE="$top_srcdir/doc/interpreter/octave.info" ## Checking for string equality below with prepended x's in order to ## handle problems with empty strings. if [ $# -gt 0 ]; then if [ "x$1" = "x-g" ]; then driver="gdb --args" shift elif [ "x$1" = "x-gud" ]; then ## Frontends for gdb (e.g. Emacs's GUD mode) need --annotate=3 driver="gdb --annotate=3 --args" shift elif [ "x$1" = "x-valgrind" ]; then driver="valgrind --tool=memcheck" shift elif [ "x$1" = "x-strace" ]; then driver="strace -o octave.trace" shift elif [ "x$1" = "x-cli" ]; then octave_executable="$builddir/src/octave-cli" shift fi fi OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \ OCTAVE_DEFAULT_QT_SETTINGS="$top_srcdir/libgui/default-qt-settings" \ exec $builddir/libtool --mode=execute $driver \ "$octave_executable" --no-init-path --path="$LOADPATH" \ --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" \ --texi-macros-file="$TEXIMACROSFILE" --info-file="$INFOFILE" "$@"