Fix some glitches in old make related files

diff --git a/Config.mk b/Config.mk
index 9d9b8df715140ed20f7ae0c721f75b08db33c4fd..80a0b387056f23a0f5cb7be10ce5934c5be5b48c 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -4,7 +4,7 @@
 ARCH=linux.i386
 
 # specify root directory for installation
-INSTALLROOT=/usr/local/graphviz
+INSTALLROOT=/home/erg/src/gviz/build/linux.i386
 
 # specify where to find tcl >= 8.0
 TCLDIR=/usr/common/tcl8.3.3
@@ -51,3 +51,4 @@ TK_LIBDIR=$(TKDIR)/lib
 # location of tk.h
 TK_INCDIR=$(TKDIR)/include
 
+VERSION=2.5

diff --git a/cmd/dot/dot_builtins_oldmake.c b/cmd/dot/dot_builtins_oldmake.c
new file mode 100644 (file)
index 0000000..fd2a986
--- /dev/null
+++ b/cmd/dot/dot_builtins_oldmake.c
@@ -0,0 +1,28 @@
+/* $Id$ $Revision$ */
+/* vim:set shiftwidth=4 ts=8: */
+
+/**********************************************************
+*      This software is part of the graphviz package      *
+*                http://www.graphviz.org/                 *
+*                                                         *
+*            Copyright (c) 1994-2004 AT&T Corp.           *
+*                and is licensed under the                *
+*            Common Public License, Version 1.0           *
+*                      by AT&T Corp.                      *
+*                                                         *
+*        Information and Software Systems Research        *
+*              AT&T Research, Florham Park NJ             *
+**********************************************************/
+
+#include "gvplugin.h"
+
+extern gvplugin_library_t *gvplugin_dot_layout_LTX_library;
+extern gvplugin_library_t *gvplugin_neato_layout_LTX_library;
+extern gvplugin_library_t *gvplugin_usershape_gd_LTX_library;
+
+const lt_symlist_t lt_preloaded_symbols[] = {
+       { "gvplugin_dot_layout_LTX_library", (void*)(&gvplugin_dot_layout_LTX_library) },
+       { "gvplugin_neato_layout_LTX_library", (void*)(&gvplugin_neato_layout_LTX_library) },
+       { "gvplugin_usershape_gd_LTX_library", (void*)(&gvplugin_usershape_gd_LTX_library) },
+       { 0, 0 }
+};

diff --git a/cmd/tools/Makefile.old b/cmd/tools/Makefile.old
index f82d64f744ef49d4ac798fe44252788ef509a857..c0edf42d207ecf66c9473b6bbfc333392c87705f 100644 (file)
--- a/cmd/tools/Makefile.old
+++ b/cmd/tools/Makefile.old
@@ -22,7 +22,7 @@ DNINCS = -I$(LOC_LIB)/pack -I$(LOC_LIB)/neatogen  \
          -I$(LOC_LIB)/common -I$(LOC_LIB)
 
 LIBS =  -L$(LOC_LIB)/graph -lgraph -L$(LOC_LIB)/cdt -lcdt
-PLUGS = -L$(LOC_PLUG) -lgvplugin_layout
+PLUGS = -L$(LOC_PLUG) -lgvplugin_dot_layout -lgvplugin_neato_layout -lgvplugin_usershape_gd
 
 DNLIBS = -L$(LOC_LIB)/gvc -lgvc $(PLUGS) \
         -L$(LOC_LIB)/common -lcommon \

diff --git a/config.h.old b/config.h.old
index bf9667ba96decb1662874a9e7a9fc0e05efe45a6..9e32934450641ad972bf9dd9d940cae27de4369c 100644 (file)
--- a/config.h.old
+++ b/config.h.old
@@ -16,6 +16,7 @@
 #define HAVE_DRAND48   1       /* drand48() in default lib(s) */
 #define HAVE_FENV_H    1       /* #include <fenv.h> ok */
 #define HAVE_FEENABLEEXCEPT    1       /* feenableexcept() in default lib(s) */
+#define HAVE_FESETENV  1       /* fesetenv() in default lib(s) */
 #define HAVE_LRAND48   1       /* lrand48() in default lib(s) */
 #define HAVE_SRAND48   1       /* srand48() in default lib(s) */
 #undef HAVE_SINCOS             /* sincos() not in default lib(s) */
@@ -33,7 +34,7 @@
 #define HAVE_LIMITS_H  1       /* #include <limits.h> ok */
 #define HAVE_MALLOC_H  1       /* #include <malloc.h> ok */
 #undef HAVE_NDIR_H             /* #include <ndir.h> not ok */
-#define HAVE_NETDB_H    1   /* #include <netdb.h> ok */
+#define HAVE_NETDB_H   1       /* #include <netdb.h> ok */
 #define HAVE_SEARCH_H  1       /* #include <search.h> ok */
 #define HAVE_STDARG_H  1       /* #include <stdarg.h> ok */
 #define HAVE_STDDEF_H  1       /* #include <stddef.h> ok */
@@ -44,7 +45,7 @@
 #define HAVE_TERMIOS_H 1       /* #include <termios.h> ok */
 #define HAVE_UNISTD_H  1       /* #include <unistd.h> ok */
 #define HAVE_VALUES_H  1       /* #include <values.h> ok */
-#define HAVE_SYS_SOCKET_H   1   /* #include <sys/socket.h> ok */
+#define HAVE_SYS_SOCKET_H      1       /* #include <sys/socket.h> ok */
 #define HAVE_SYS_STAT_H        1       /* #include <sys/stat.h> ok */
 #define HAVE_SYS_SELECT_H      1       /* #include <sys/select.h> ok */
 #undef HAVE_SYS_FPU_H          /* #include <sys/fpu.h> not ok */
@@ -68,6 +69,10 @@
 /* Define if <iconv.h> defines iconv_t. */
 #define HAVE_ICONV_T_DEF 1
 
+/*******************************************************************/
+/* Undefine if you don't want the libgd features or don't have the */
+/* necessary 3rd party library.                                    */
+/*******************************************************************/
 /* Define if the GD library has the GD_FONTCONFIG feature */
 #define HAVE_GD_FONTCONFIG 1
 
@@ -83,6 +88,9 @@
 /* Define if the GD library has the GD_PNG feature */
 #define HAVE_GD_PNG 1
 
+/*******************************************************************/
+/* Undefine if you don't have the necessary 3rd party library.     */
+/*******************************************************************/
 /* Define if you have the jpeg library (-ljpeg).  */
 #define        HAVE_LIBJPEG    1
 
@@ -111,6 +119,9 @@
 /* At present, the xpm library isn't really used */
 /* #define HAVE_LIBXPM       1 */
 
+/*******************************************************************/
+/* The following usually aren't changed.                           */
+/*******************************************************************/
 /* Set to 0 if you don't want the old codegens */
 #define ENABLE_CODEGENS 1