From: ellson Date: Wed, 30 Jul 2008 20:53:08 +0000 (+0000) Subject: have SparseMatrix.h #include to minimize further changes X-Git-Tag: LAST_LIBGRAPH~32^2~3745 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23a226ccb746dc0226451ac2380e2dadb8fa4508;p=graphviz have SparseMatrix.h #include to minimize further changes remove mm2gv which was mistakenly added to cvs --- diff --git a/cmd/tools/matrix_market.c b/cmd/tools/matrix_market.c index 36052af24..a3e4c23f9 100644 --- a/cmd/tools/matrix_market.c +++ b/cmd/tools/matrix_market.c @@ -1,4 +1,3 @@ -#include #include #include #include "SparseMatrix.h" diff --git a/cmd/tools/mm2gv b/cmd/tools/mm2gv deleted file mode 100755 index cd6f4395c..000000000 --- a/cmd/tools/mm2gv +++ /dev/null @@ -1,131 +0,0 @@ -#! /bin/sh - -# mm2gv - temporary wrapper script for .libs/mm2gv -# Generated by ltmain.sh - GNU libtool 1.5.24 (1.1220.2.456 2007/06/24 02:25:32) -# -# The mm2gv program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='/bin/sed -e 1s/^X//' -sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' - -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command="(cd /home/ellson/FIX/Linux.x86_64/build/graphviz2/cmd/tools; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/home/ellson/bin:/home/ellson/FIX/Linux.x86_64/bin:/usr/lib64/qt-3.3/bin:/usr/kerberos/bin:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/bin:/bin\"; export PATH; /usr/bin/gcc -g -O2 -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math -o \$progdir/\$file mm2gv.o matrix_market.o mmio.o -L/home/ellson/FIX/Linux.x86_64/lib ../../lib/gvc/.libs/libgvc.so ../../lib/ingraphs/.libs/libingraphs_C.a ../../lib/sparse/.libs/libsparse_C.a ../../plugin/neato_layout/.libs/libgvplugin_neato_layout.so /home/ellson/FIX/Linux.x86_64/build/graphviz2/lib/gvc/.libs/libgvc.so -lexpat /usr/lib64/libltdl.so -ldl -lz /home/ellson/FIX/Linux.x86_64/build/graphviz2/lib/graph/.libs/libgraph.so /home/ellson/FIX/Linux.x86_64/build/graphviz2/lib/cdt/.libs/libcdt.so /home/ellson/FIX/Linux.x86_64/build/graphviz2/lib/pathplan/.libs/libpathplan.so -lgts -lglib-2.0 -lm -Wl,--rpath -Wl,/home/ellson/FIX/Linux.x86_64/build/graphviz2/lib/gvc/.libs -Wl,--rpath -Wl,/home/ellson/FIX/Linux.x86_64/build/graphviz2/plugin/neato_layout/.libs -Wl,--rpath -Wl,/home/ellson/FIX/Linux.x86_64/build/graphviz2/lib/graph/.libs -Wl,--rpath -Wl,/home/ellson/FIX/Linux.x86_64/build/graphviz2/lib/cdt/.libs -Wl,--rpath -Wl,/home/ellson/FIX/Linux.x86_64/build/graphviz2/lib/pathplan/.libs -Wl,--rpath -Wl,/home/ellson/FIX/Linux.x86_64/lib -Wl,--rpath -Wl,/home/ellson/FIX/Linux.x86_64/lib/graphviz ) " - -# This environment variable determines our operation mode. -if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then - # install mode needs the following variable: - notinst_deplibs=' ../../lib/gvc/libgvc.la ../../plugin/neato_layout/libgvplugin_neato_layout.la /home/ellson/FIX/Linux.x86_64/build/graphviz2/lib/gvc/libgvc.la /home/ellson/FIX/Linux.x86_64/build/graphviz2/lib/graph/libgraph.la /home/ellson/FIX/Linux.x86_64/build/graphviz2/lib/cdt/libcdt.la /home/ellson/FIX/Linux.x86_64/build/graphviz2/lib/pathplan/libpathplan.la' -else - # When we are sourced in execute mode, $file and $echo are already set. - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - echo="echo" - file="$0" - # Make sure echo works. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : - else - # Restart under the correct shell, and then maybe $echo will work. - exec /bin/sh "$0" --no-reexec ${1+"$@"} - fi - fi - - # Find the directory that this script lives in. - thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "x$thisdir" = "x$file" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'` - while test -n "$file"; do - destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - - # If there was a directory component, then change thisdir. - if test "x$destdir" != "x$file"; then - case "$destdir" in - [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; - *) thisdir="$thisdir/$destdir" ;; - esac - fi - - file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'` - done - - # Try to get the absolute directory name. - absdir=`cd "$thisdir" && pwd` - test -n "$absdir" && thisdir="$absdir" - - program=lt-'mm2gv' - progdir="$thisdir/.libs" - - if test ! -f "$progdir/$program" || \ - { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \ - test "X$file" != "X$progdir/$program"; }; then - - file="$$-$program" - - if test ! -d "$progdir"; then - mkdir "$progdir" - else - rm -f "$progdir/$file" - fi - - # relink executable if necessary - if test -n "$relink_command"; then - if relink_command_output=`eval $relink_command 2>&1`; then : - else - echo "$relink_command_output" >&2 - rm -f "$progdir/$file" - exit 1 - fi - fi - - mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null || - { rm -f "$progdir/$program"; - mv -f "$progdir/$file" "$progdir/$program"; } - rm -f "$progdir/$file" - fi - - if test -f "$progdir/$program"; then - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - # Run the actual program with our arguments. - - exec "$progdir/$program" ${1+"$@"} - - $echo "$0: cannot exec $program $*" - exit 1 - fi - else - # The program doesn't exist. - $echo "$0: error: \`$progdir/$program' does not exist" 1>&2 - $echo "This script is just a wrapper for $program." 1>&2 - echo "See the libtool documentation for more information." 1>&2 - exit 1 - fi -fi diff --git a/cmd/tools/mm2gv.c b/cmd/tools/mm2gv.c index e64971ece..9393d775a 100644 --- a/cmd/tools/mm2gv.c +++ b/cmd/tools/mm2gv.c @@ -1,4 +1,3 @@ -#include #include #include #include