- no more username in output.

- creator always "graphviz"
- pass in lt_preload_symbols from code using libgvc - avoiding problems with --enable-static
- clean out various bits of dead code

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 6c2126d4785d6e0d88e6410d8704fe28dcf85426..a70f70440bdb8e758060fa9be04422b1dba5ce6f 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -51,7 +51,7 @@ endif
 man_MANS = dot.1 
 pdf_DATA = dot.1.pdf
 
-dot_SOURCES = dot.c
+dot_SOURCES = dot.c no_builtins.c
 dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la
 
 install-data-hook:
@@ -79,7 +79,7 @@ dot.1.pdf: $(srcdir)/dot.1
 # Workaround is to link explicity to the .libs/libxxx.a
 # A better approach is probably to provide an explicit list of builtins
 # like $(top_srcdir)/lib/gvc/dot_builtins.c
-dot_static_SOURCES = dot.c $(top_srcdir)/lib/gvc/no_demand_loading.c
+dot_static_SOURCES = dot.c dot_builtins.c no_demand_loading.c
 dot_static_LDFLAGS = -export-dynamic -dlpreopen self -export-symbols-regex '.*_LTX_library'
 dot_static_LDADD = \
        $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
@@ -91,12 +91,12 @@ dot_static_LDADD = \
        $(top_builddir)/lib/cdt/libcdt_C.la \
                $(GTS_LIBS) $(ICONV_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 
-dot_builtins_SOURCES = dot.c $(top_srcdir)/lib/gvc/dot_builtins.c $(top_srcdir)/lib/gvc/no_demand_loading.c
+dot_builtins_SOURCES = dot.c dot_builtins.c no_demand_loading.c
 dot_builtins_LDADD = \
        $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
        $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
        $(top_builddir)/plugin/core/libgvplugin_core.la \
-       $(top_builddir)/lib/gvc/libgvc_builtins.la \
+       $(top_builddir)/lib/gvc/libgvc.la \
        $(top_builddir)/lib/pathplan/libpathplan.la \
        $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
        $(top_builddir)/lib/cdt/libcdt.la \

diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c
index ca455f395646a775e562583c00682eec9b3d4467..edf59b2b3cab2cf80286e7269d6ddb8331978ff6 100644 (file)
--- a/cmd/dot/dot.c
+++ b/cmd/dot/dot.c
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#include "builddate.h"
 #include "gvc.h"
 
 #ifndef WIN32_DLL
@@ -55,12 +54,6 @@ __declspec(dllimport) boolean MemTest;
 # include <sys/fpu.h>
 #endif
 
-char *Info[] = {
-    "Graphviz",                        /* Program */
-    VERSION,                   /* Version */
-    BUILDDATE                  /* Build Date */
-};
-
 static GVC_t *Gvc;
 static graph_t * G;
 
@@ -193,7 +186,7 @@ int main(int argc, char **argv)
 
 #endif
 
-    Gvc = gvNEWcontext(Info, gvUsername(), lt_preloaded_symbols);
+    Gvc = gvNEWcontext(lt_preloaded_symbols);
     gvParseArgs(Gvc, argc, argv);
 
 #ifndef WIN32

diff --git a/cmd/dot/no_demand_loading.c b/cmd/dot/no_demand_loading.c
new file mode 100644 (file)
index 0000000..7490a02
--- /dev/null
+++ b/cmd/dot/no_demand_loading.c
@@ -0,0 +1,17 @@
+/* $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             *
+**********************************************************/
+
+const int Demand_Loading = 0;