provide a separate libgvc_builtins for when builtins are required

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 3e31334a85ff29f587fb4625b30c42c7c4fb2033..4fbd260042ae258cf732de82d7fc26f462624d6f 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -22,7 +22,7 @@ endif
 man_MANS = dot.1 
 pdf_DATA = dot.pdf
 
-dot_SOURCES = dot.c dot_builtins.c
+dot_SOURCES = dot.c
 dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la
 
 install-data-hook:
@@ -49,7 +49,7 @@ dot_static_LDADD = \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_dot_layout.a \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_neato_layout.a \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_usershape_gd.a \
-       $(top_builddir)/lib/gvc/.libs/libgvc.a \
+       $(top_builddir)/lib/gvc/.libs/libgvc_builtins.a \
        $(top_builddir)/lib/pathplan/.libs/libpathplan.a \
        $(top_builddir)/lib/pack/.libs/libpack.a \
        $(top_builddir)/lib/graph/.libs/libgraph.a \

diff --git a/cmd/dot/Makefile.old b/cmd/dot/Makefile.old
index 3f236708f7c19603c923c06928c650a384270189..df7c653aecec0bcf5d9a05979ef4881e5d3e5032 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 $(PLUGS) \
+LIBS = -L$(LOC_LIB)/gvc -lgvc_builtins $(PLUGS) \
        -L$(LOC_LIB)/common -lcommon \
-       -L$(LOC_LIB)/gvc -lgvc $(PLUGS) \
+       -L$(LOC_LIB)/gvc -lgvc_builtins $(PLUGS) \
        -L$(LOC_LIB)/neatogen -lneatogen \
        -L$(LOC_LIB)/dotgen -ldotgen \
        -L$(LOC_LIB)/circogen -lcircogen \
@@ -41,7 +41,7 @@ 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.a \
+         $(LOC_LIB)/gvc/libgvc_builtins.a \
           $(LOC_LIB)/twopigen/libtwopigen.a \
          $(LOC_LIB)/circogen/libcircogen.a
 

diff --git a/cmd/dot/dot_builtins.c b/cmd/dot/dot_builtins.c
deleted file mode 100644 (file)
index 1b3889c..0000000
--- a/cmd/dot/dot_builtins.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $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/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index a0987940f19216db498d49d64c4c88b4d4f70f3c..9373be3f4ae5c05f936c33a9fd27c20c1c8fc2d7 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -19,19 +19,22 @@ pkginclude_HEADERS = gvc.h gvcext.h gvplugin.h gvcjob.h gvcint.h \
        gvplugin_device.h \
        gvplugin_usershape.h
 noinst_HEADERS = gvcproc.h
-pkglib_LTLIBRARIES = libgvc.la
+pkglib_LTLIBRARIES = libgvc.la libgvc_builtins.la
 pkgconfig_DATA = libgvc.pc
 
-libgvc_la_LDFLAGS = -version-info @VERSION_INFO@
+libgvc_builtins_la_LDFLAGS = -version-info @VERSION_INFO@
+libgvc_la_LDFLAGS = ${libgvc_builtins_la_LDFLAGS} -no-undefined
 
-libgvc_la_SOURCES = gvrender.c gvlayout.c gvtextlayout.c gvdevice.c \
+libgvc_builtins_la_SOURCES = gvrender.c gvlayout.c gvtextlayout.c gvdevice.c \
        gvcontext.c gvjobs.c gvevent.c gvplugin.c gvconfig.c gvusershape.c \
        gvc.c
+libgvc_la_SOURCES = ${libgvc_builtins_la_SOURCES} no_builtins.c
 
-libgvc_la_LIBADD = \
+libgvc_builtins_la_LIBADD = \
        $(top_builddir)/lib/common/libcommon.la \
        $(top_builddir)/lib/graph/libgraph.la \
        $(top_builddir)/lib/pathplan/libpathplan.la \
        @GD_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@
+libgvc_la_LIBADD = ${libgvc_builtins_la_LIBADD}
 
 EXTRA_DIST = Makefile.old

diff --git a/lib/gvc/Makefile.old b/lib/gvc/Makefile.old
index 1cc7520936fe3b3ceaed190d75f2f2a4d560332a..36e292ef26d70651ee79ce5e8a77ebd76bab6768 100644 (file)
--- a/lib/gvc/Makefile.old
+++ b/lib/gvc/Makefile.old
@@ -23,18 +23,25 @@ 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
 
-libgvc.a : $(OBJS)
+EXTRA_OBJS = no_builtins.o
+
+libgvc_builtins.a : $(OBJS)
+       $(RM) libgvc_builtins.a
+       $(AR) cr libgvc_builtins.a $(OBJS)
+       $(RANLIB) libgvc_builtins.a
+
+libgvc.a : $(OBJS) $(EXTRA_OBJS)
        $(RM) libgvc.a
-       $(AR) cr libgvc.a $(OBJS)
+       $(AR) cr libgvc.a $(OBJS) $(EXTRA_OBJS)
        $(RANLIB) libgvc.a
 
-install: libgvc.a 
+install: libgvc.a libgvc_builtins.a
        $(MKPATH) $(INCDIR)
        $(INSTALL) $(INST_HDRS) $(INCDIR)
        $(MKPATH) $(LIBDIR)
-       $(INSTALL) libgvc.a $(LIBDIR)
+       $(INSTALL) libgvc.a libgvc_builtins.a $(LIBDIR)
 
-$(OBJS) : $(INST_HDRS) $(NOINST_HDRS)
+$(OBJS) $(EXTRA_OBJS): $(INST_HDRS) $(NOINST_HDRS)
 
 clean:
        $(RM) core *.o

diff --git a/lib/gvc/gvc.h b/lib/gvc/gvc.h
index a14244b1cf9077acd68938ebd0fdfcdd847d75c5..99ce33280dc177f1af52f0375a4f8860b7adb06f 100644 (file)
--- a/lib/gvc/gvc.h
+++ b/lib/gvc/gvc.h
@@ -89,11 +89,6 @@ extern int gvFreeLayout(GVC_t *gvc, graph_t *g);
 /* Clean up graphviz context */
 extern int gvFreeContext(GVC_t *gvc);
 
-#ifndef BUILTINS
-const lt_symlist_t lt_preloaded_symbols[] = {{0,0,},};
-#define BUILTINS
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/tclpkg/gv/gv.i b/tclpkg/gv/gv.i
index 0c3f9229bf913f0b2032fb59e383c4c83df25973..25da815f12c43e0ae4f072af184230b271027c05 100644 (file)
--- a/tclpkg/gv/gv.i
+++ b/tclpkg/gv/gv.i
@@ -16,7 +16,6 @@
 
 %module gv
 %{
-#define BUILTINS
 #include "gvc.h"
 %}