various

diff --git a/Makefile.am b/Makefile.am
index b2c2e4746e132d08e7f2a28e89528d09329adfcb..29bbd6f40ed87d996d7e9e05c3faf24d9dd760eb 100644 (file)
--- 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 01ce026f4da5a02cc63b571ec36eeedda2ced414..430ffaccfff606fb4db83b315bcd2763b4ea30f0 100644 (file)
--- 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 eb6a4fa802e61ac9d0526264ca9f43d1fd4f9d89..a27266f37eb4bbda50c1e08a744c36d190988c3c 100644 (file)
--- 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 3dda72986fc5af262451a760393b3a7065938c80..ec9be2473c9dc4041f47f2f16781120bd90fce4c 100644 (file)
--- 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 07988d67fb30f25b74a1f87caa4c38b442a6ea4e..bb47b1b89825a7cac4244366d58c5d58e436bcb4 100644 (file)
--- 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 58088a571ec5ee9a3bf5a52673939a4578b2ce2a..dbec842b017c050002ea920e212515266ecafd54 100644 (file)
--- 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 429e04cb78ba44df58f47297e4be1db5b4594a32..88b81ca55ca2f918947a6ad7c1d4416c6a05667f 100644 (file)
--- 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