From e9bff5ff396196e4ddc4f14851fb147e61220915 Mon Sep 17 00:00:00 2001 From: ellson Date: Thu, 23 Dec 2004 05:55:10 +0000 Subject: [PATCH] various --- Makefile.am | 2 +- lib/Makefile.am | 2 +- lib/expr/Makefile.am | 5 +---- tclpkg/.cvsignore | 1 + tclpkg/tcldot/Makefile.am | 36 +++++++++++++++++----------------- tclpkg/tcldot/tcldot.c | 6 +++--- tclpkg/tclpathplan/Makefile.am | 2 +- 7 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index b2c2e4746..29bbd6f40 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ html = CPL.html txt_DATA = $(txt) html_DATA = $(html) -SUBDIRS = libltdl lib plugin cmd doc +SUBDIRS = libltdl lib plugin cmd tclpkg doc doxygen: doxygen diff --git a/lib/Makefile.am b/lib/Makefile.am index 01ce026f4..430ffaccf 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = cdt graph agraph gd pathplan agutil sfio vmalloc ast circogen \ - dotgen fdpgen neatogen pack twopigen common gvc ingraphs + dotgen fdpgen neatogen pack twopigen common gvc ingraphs expr EXTRA_DIST = Makefile.old diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am index eb6a4fa80..a27266f37 100644 --- a/lib/expr/Makefile.am +++ b/lib/expr/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS = \ pkginclude_HEADERS = exgram.h exlib.h expr.h pkglib_LTLIBRARIES = libexpr.la -#noinst_LTLIBRARIES = libexprconvenience.la man_MANS = expr.3 pdf_DATA = expr.pdf @@ -19,9 +18,7 @@ libexpr_la_SOURCES = excc.c excontext.c exdata.c exerror.c \ exeval.c exexpr.c exlexname.c exopen.c exrewind.c extoken.c \ extype.c exzero.c exparse.y -#libexprconvenience_la_SOURCES = $(libexpr_la_SOURCES) - -#$(libexprconvenience_la_OBJECTS): exparse.h exparse.c exgram.h exop.h +$(libexpr_la_OBJECTS): exparse.h exparse.c exgram.h exop.h y.output: $(top_srcdir)/lib/expr/exparse.y @YACC@ -dtv $(top_srcdir)/lib/expr/exparse.y diff --git a/tclpkg/.cvsignore b/tclpkg/.cvsignore index 3dda72986..ec9be2473 100644 --- a/tclpkg/.cvsignore +++ b/tclpkg/.cvsignore @@ -1,2 +1,3 @@ Makefile.in Makefile +pkgIndex.tcl diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am index 07988d67f..bb47b1b89 100644 --- a/tclpkg/tcldot/Makefile.am +++ b/tclpkg/tcldot/Makefile.am @@ -7,17 +7,17 @@ htmldir = $(pkgdatadir)/doc/html AM_CPPFLAGS = \ -I$(top_srcdir) \ - -I$(top_srcdir)/dotneato/dotgen \ - -I$(top_srcdir)/dotneato/neatogen \ - -I$(top_srcdir)/dotneato/twopigen \ - -I$(top_srcdir)/dotneato/fdpgen \ - -I$(top_srcdir)/dotneato/circogen \ - -I$(top_srcdir)/dotneato/gvrender \ - -I$(top_srcdir)/dotneato/common \ - -I$(top_srcdir)/graph \ - -I$(top_srcdir)/cdt \ - -I$(top_srcdir)/pathplan \ - -I$(top_srcdir)/tclhandle @GD_INCLUDES@ @TCL_INCLUDES@ + -I$(top_srcdir)/lib/dotgen \ + -I$(top_srcdir)/lib/neatogen \ + -I$(top_srcdir)/lib/twopigen \ + -I$(top_srcdir)/lib/fdpgen \ + -I$(top_srcdir)/lib/circogen \ + -I$(top_srcdir)/lib/gvc \ + -I$(top_srcdir)/lib/common \ + -I$(top_srcdir)/lib/graph \ + -I$(top_srcdir)/lib/cdt \ + -I$(top_srcdir)/lib/pathplan \ + -I$(top_srcdir)/tclpkg/tclhandle @GD_INCLUDES@ @TCL_INCLUDES@ LIBS = @LIBS@ -lc @@ -35,17 +35,17 @@ pdf_DATA = $(pdf) html_DATA = $(html) endif -libtcldot_la_SOURCES = tcldot.c tkgen.c $(top_srcdir)/gdtclft/gdtclft.c +libtcldot_la_SOURCES = tcldot.c tkgen.c $(top_srcdir)/tclpkg/gdtclft/gdtclft.c libtcldot_la_LIBADD = \ $(top_builddir)/tclpkg/tclhandle/libtclhandle.la \ $(top_builddir)/tclpkg/tclstubs/libtclstubs.la \ - $(top_builddir)/dotneato/gvrender/libgvrender.la \ - $(top_builddir)/dotneato/dotgen/libdotgen.la \ - $(top_builddir)/dotneato/neatogen/libneatogen.la \ - $(top_builddir)/dotneato/twopigen/libtwopigen.la \ - $(top_builddir)/dotneato/fdpgen/libfdpgen.la \ - $(top_builddir)/dotneato/circogen/libcircogen.la + $(top_builddir)/lib/gvc/libgvc.la \ + $(top_builddir)/lib/dotgen/libdotgen.la \ + $(top_builddir)/lib/neatogen/libneatogen.la \ + $(top_builddir)/lib/twopigen/libtwopigen.la \ + $(top_builddir)/lib/fdpgen/libfdpgen.la \ + $(top_builddir)/lib/circogen/libcircogen.la if WITH_TCL all-local: pkgIndex.tcl diff --git a/tclpkg/tcldot/tcldot.c b/tclpkg/tcldot/tcldot.c index 58088a571..dbec842b0 100644 --- a/tclpkg/tcldot/tcldot.c +++ b/tclpkg/tcldot/tcldot.c @@ -1122,7 +1122,7 @@ static int graphcmd(ClientData clientData, Tcl_Interp * interp, #endif gvc->codegen = &TK_CodeGen; /* emit graph in sorted order, all nodes then all edges */ - emit_graph(gvc, EMIT_SORTED); + emit_graph(gvc, g, EMIT_SORTED); gvrender_delete_jobs(gvc); return TCL_OK; @@ -1164,7 +1164,7 @@ static int graphcmd(ClientData clientData, Tcl_Interp * interp, /* render graph to open GD structure */ gvc->codegen = &memGD_CodeGen; /* emit graph in sorted order, all nodes then all edges */ - emit_graph(gvc, 1); + emit_graph(gvc, g, 1); gvrender_delete_jobs(gvc); Tcl_AppendResult(interp, argv[2], (char *) NULL); return TCL_OK; @@ -1300,7 +1300,7 @@ static int graphcmd(ClientData clientData, Tcl_Interp * interp, } emit_reset(gvc); /* reset page numbers in postscript */ - dotneato_write_one(gvc); + dotneato_write_one(gvc, g); gvrender_delete_jobs(gvc); return TCL_OK; diff --git a/tclpkg/tclpathplan/Makefile.am b/tclpkg/tclpathplan/Makefile.am index 429e04cb7..88b81ca55 100644 --- a/tclpkg/tclpathplan/Makefile.am +++ b/tclpkg/tclpathplan/Makefile.am @@ -25,7 +25,7 @@ if WITH_TCL all-local: pkgIndex.tcl pkgIndex.tcl: libtclplan.la - sh $(top_srcdir)/mkpkgindex.sh libtclplan.la Tclpathplan $(VERSION) + sh $(top_srcdir)/tclpkg/mkpkgindex.sh libtclplan.la Tclpathplan $(VERSION) endif CLEANFILES = pkgIndex.tcl -- 2.40.0