custom libgvc_dot_builtins for Makefile.old only (drop libgvc_builtins for Makefile...

diff --git a/Config.mk b/Config.mk
index addb5ae6b7b5466028b46f87a7f4f5d622ef2763..a37b9eb7cf3988e039dfe99ee1f5b86eba980e49 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -57,3 +57,8 @@ TK_INCDIR=$(TKDIR)/include
 
 VERSION=2.5
 VERSION=2.5
+VERSION=2.5
+VERSION=2.5
+VERSION=2.5
+VERSION=2.5
+VERSION=2.5

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 4fbd260042ae258cf732de82d7fc26f462624d6f..97c72b59948b219437aee7e88782daf2a71b5bce 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -57,6 +57,6 @@ dot_static_LDADD = \
        $(top_builddir)/lib/gd/.libs/libgvgd.a \
        @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @MATH_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@
 
-EXTRA_DIST = Makefile.old dot.1 dot.pdf dot_builtins_oldmake.c
+EXTRA_DIST = Makefile.old dot.1 dot.pdf
 
 DISTCLEANFILES = dot.pdf

diff --git a/cmd/dot/Makefile.old b/cmd/dot/Makefile.old
index df7c653aecec0bcf5d9a05979ef4881e5d3e5032..32f8ec8407ebd69998b66b4b430da24ac364d2b5 100644 (file)
--- a/cmd/dot/Makefile.old
+++ b/cmd/dot/Makefile.old
@@ -22,9 +22,9 @@ XLIBS = -L$(LOC_LIB)/pathplan -lpathplan \
 
 PLUGS = -L$(LOC_PLUG) -lgvplugin_dot_layout -lgvplugin_neato_layout -lgvplugin_usershape_gd
 
-LIBS = -L$(LOC_LIB)/gvc -lgvc_builtins $(PLUGS) \
+LIBS = -L$(LOC_LIB)/gvc -lgvc_dot_builtins $(PLUGS) \
        -L$(LOC_LIB)/common -lcommon \
-       -L$(LOC_LIB)/gvc -lgvc_builtins $(PLUGS) \
+       -L$(LOC_LIB)/gvc -lgvc_dot_builtins $(PLUGS) \
        -L$(LOC_LIB)/neatogen -lneatogen \
        -L$(LOC_LIB)/dotgen -ldotgen \
        -L$(LOC_LIB)/circogen -lcircogen \
@@ -41,11 +41,11 @@ DOTLIBS = $(LOC_LIB)/common/libcommon.a \
           $(LOC_LIB)/plugin/libgvplugin_dot_layout.a \
           $(LOC_LIB)/plugin/libgvplugin_neato_layout.a \
           $(LOC_LIB)/plugin/libgvplugin_usershape_gd.a \
-         $(LOC_LIB)/gvc/libgvc_builtins.a \
+         $(LOC_LIB)/gvc/libgvc_dot_builtins.a \
           $(LOC_LIB)/twopigen/libtwopigen.a \
          $(LOC_LIB)/circogen/libcircogen.a
 
-OBJS = dot.o dot_builtins_oldmake.o
+OBJS = dot.o
 
 all : dot
 
@@ -56,9 +56,6 @@ dot : $(OBJS) $(DOTLIBS)
 dot.o : dot.c
        $(CC) -c $(CCFLAGS) $(DEFINES) $(INCS) dot.c
 
-dot_builtins_oldmake.o : dot_builtins_oldmake.c
-       $(CC) -c $(CCFLAGS) $(DEFINES) $(INCS) dot_builtins_oldmake.c
-
 install: all
        $(MKPATH) $(BINDIR)
        $(INSTALL) dot $(BINDIR)

diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c
index 7238055cd48b8d23b5752d508442262cbfa05985..6ba014a9bc506dc0b50526e402752b587170a365 100644 (file)
--- a/cmd/dot/dot.c
+++ b/cmd/dot/dot.c
@@ -18,6 +18,10 @@
  * Written by Stephen North and Eleftherios Koutsofios.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "gvc.h"
 #include "globals.h"
 

diff --git a/lib/gvc/Makefile.old b/lib/gvc/Makefile.old
index 36e292ef26d70651ee79ce5e8a77ebd76bab6768..f8436bd57169cd2fa718b58b07c57297f869f176 100644 (file)
--- a/lib/gvc/Makefile.old
+++ b/lib/gvc/Makefile.old
@@ -23,23 +23,23 @@ NOINST_HDRS = gvcproc.h
 OBJS = gvrender.o gvlayout.o gvdevice.o gvcontext.o gvjobs.o \
        gvplugin.o gvconfig.o gvevent.o gvtextlayout.o gvusershape.o gvc.o
 
-EXTRA_OBJS = no_builtins.o
+EXTRA_OBJS = no_builtins.o dot_builtins.o
 
-libgvc_builtins.a : $(OBJS)
+libgvc_dot_builtins.a : $(OBJS) dot_builtins.o
        $(RM) libgvc_builtins.a
-       $(AR) cr libgvc_builtins.a $(OBJS)
+       $(AR) cr libgvc_builtins.a $(OBJS) dot_builtins.o
        $(RANLIB) libgvc_builtins.a
 
-libgvc.a : $(OBJS) $(EXTRA_OBJS)
+libgvc.a : $(OBJS) no_builtins.o
        $(RM) libgvc.a
-       $(AR) cr libgvc.a $(OBJS) $(EXTRA_OBJS)
+       $(AR) cr libgvc.a $(OBJS) no_builtins.o
        $(RANLIB) libgvc.a
 
 install: libgvc.a libgvc_builtins.a
        $(MKPATH) $(INCDIR)
        $(INSTALL) $(INST_HDRS) $(INCDIR)
        $(MKPATH) $(LIBDIR)
-       $(INSTALL) libgvc.a libgvc_builtins.a $(LIBDIR)
+       $(INSTALL) libgvc.a libgvc_dot_builtins.a $(LIBDIR)
 
 $(OBJS) $(EXTRA_OBJS): $(INST_HDRS) $(NOINST_HDRS)
 

diff --git a/cmd/dot/dot_builtins_oldmake.c b/lib/gvc/dot_builtins.c
similarity index 100%
rename from cmd/dot/dot_builtins_oldmake.c
rename to lib/gvc/dot_builtins.c

diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c
index b4f7de6fd21dedba7e88f752ec4ee80b706300f2..09cd2ca3964289865fe44d4a8d2e08a352860dd0 100644 (file)
--- a/lib/gvc/gvc.c
+++ b/lib/gvc/gvc.c
@@ -14,6 +14,10 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "types.h"
 #include "graph.h"
 #include "const.h"

diff --git a/lib/gvc/no_builtins.c b/lib/gvc/no_builtins.c
new file mode 100644 (file)
index 0000000..1b3889c
--- /dev/null
+++ b/lib/gvc/no_builtins.c
@@ -0,0 +1,20 @@
+/* $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"
+
+const lt_symlist_t lt_preloaded_symbols[] = { { 0, 0 } };
+

diff --git a/rpm_notes.txt b/rpm_notes.txt
index ba528bbc979b32acef978545a9db0979cc8cf66d..a80330b091a3c36cd65e4a16039098745fc49f35 100644 (file)
--- a/rpm_notes.txt
+++ b/rpm_notes.txt
@@ -4,6 +4,7 @@ Requires
        webdot
        doxygen
        R
+       ImageMagick
 
 Require - but just use dot's stdin/stdout simplisticly
        perl-GraphViz