--- graphviz-2.2.1/tools/expr/Makefile.am.orig	2005-01-13 01:54:20 +0500
+++ graphviz-2.2.1/tools/expr/Makefile.am	2006-10-18 22:24:40 +0600
@@ -19,6 +19,13 @@
 	exeval.c exexpr.c exlexname.c exopen.c exrewind.c extoken.c \
 	extype.c exzero.c exparse.y
 
+libexpr_la_LIBADD = \
+	$(top_builddir)/cdt/libcdt.la \
+	$(top_builddir)/dotneato/common/libcommon.la \
+	$(top_builddir)/tools/ast/libast.la \
+	$(top_builddir)/tools/sfio/libsfio.la \
+	$(top_builddir)/tools/vmalloc/libvmalloc.la
+
 libexprconvenience_la_SOURCES = $(libexpr_la_SOURCES)
 
 $(libexprconvenience_la_OBJECTS): exparse.h exparse.c exgram.h exop.h
--- graphviz-2.2.1/tkspline/Makefile.am.orig	2004-09-09 03:27:30 +0600
+++ graphviz-2.2.1/tkspline/Makefile.am	2006-10-18 22:38:56 +0600
@@ -23,7 +23,7 @@
 endif
 
 libtkspline_la_SOURCES = tkspline.c
-libtkspline_la_LIBADD = \
+libtkspline_la_LIBADD = -ltcl \
 	$(top_builddir)/tkstubs/libtkstubs.la \
 	$(top_builddir)/tclstubs/libtclstubs.la 
 
--- graphviz-2.2.1/tclpathplan/Makefile.am.orig	2004-09-09 03:27:30 +0600
+++ graphviz-2.2.1/tclpathplan/Makefile.am	2006-10-18 22:40:14 +0600
@@ -16,7 +16,7 @@
 
 libtclplan_la_SOURCES = find_ints.c intersect.c makecw.c tclpathplan.c wrapper.c
 
-libtclplan_la_LIBADD = \
+libtclplan_la_LIBADD = -ltcl \
 	$(top_builddir)/tclhandle/libtclhandle.la \
 	$(top_builddir)/pathplan/libpathplan.la \
 	$(top_builddir)/tclstubs/libtclstubs.la
--- graphviz-2.2.1/tcldot/Makefile.am.orig	2004-12-10 18:10:06 +0500
+++ graphviz-2.2.1/tcldot/Makefile.am	2006-10-18 22:41:12 +0600
@@ -37,7 +37,7 @@
 
 libtcldot_la_SOURCES = tcldot.c tkgen.c $(top_srcdir)/gdtclft/gdtclft.c
 
-libtcldot_la_LIBADD = \
+libtcldot_la_LIBADD = -ltcl \
 	$(top_builddir)/tclhandle/libtclhandle.la \
 	$(top_builddir)/tclstubs/libtclstubs.la \
 	$(top_builddir)/dotneato/gvrender/libgvrender.la \
--- graphviz-2.2.1/gdtclft/Makefile.am.orig	2004-09-09 03:27:30 +0600
+++ graphviz-2.2.1/gdtclft/Makefile.am	2006-10-18 22:42:02 +0600
@@ -23,7 +23,7 @@
 endif
 
 libgdtclft_la_SOURCES = gdtclft.c
-libgdtclft_la_LIBADD = \
+libgdtclft_la_LIBADD = -ltcl \
 	$(top_builddir)/tclhandle/libtclhandle.la \
 	$(top_builddir)/tclstubs/libtclstubs.la @GD_LIBS@
 
--- graphviz-2.2.1/dotneato/twopigen/Makefile.am.orig	2004-08-13 04:29:42 +0600
+++ graphviz-2.2.1/dotneato/twopigen/Makefile.am	2006-10-18 22:33:01 +0600
@@ -18,6 +18,8 @@
 
 libtwopigen_la_SOURCES = twopiinit.c circle.c
 
-libtwopigen_la_LIBADD = $(top_builddir)/dotneato/neatogen/libneatogen.la
+libtwopigen_la_LIBADD = \
+	$(top_builddir)/dotneato/neatogen/libneatogen.la \
+	$(top_builddir)/dotneato/common/libcommon.la
 
 EXTRA_DIST = Makefile.old
--- graphviz-2.2.1/dotneato/pack/Makefile.am.orig	2004-07-26 22:52:07 +0600
+++ graphviz-2.2.1/dotneato/pack/Makefile.am	2006-10-18 22:30:23 +0600
@@ -18,6 +18,7 @@
 pdf_DATA = pack.pdf
 
 libpack_la_SOURCES = ccomps.c pack.c
+libpack_la_LIBADD = $(top_builddir)/dotneato/common/libcommon.la
 
 .3.pdf:
 	groff -Tps -man $< | ps2pdf - - >$@
--- graphviz-2.2.1/dotneato/neatogen/Makefile.am.orig	2004-12-10 18:10:06 +0500
+++ graphviz-2.2.1/dotneato/neatogen/Makefile.am	2006-10-18 22:26:20 +0600
@@ -25,6 +25,7 @@
 	conjgrad.c pca.c closest.c bfs.c constraint.c
 
 libneatogen_la_LIBADD = \
+	$(top_builddir)/dotneato/common/libcommon.la \
 	$(top_builddir)/dotneato/pack/libpack.la \
 	$(top_builddir)/pathplan/libpathplan.la \
 	$(top_builddir)/graph/libgraph.la
--- graphviz-2.2.1/dotneato/dotgen/Makefile.am.orig	2004-12-10 18:10:06 +0500
+++ graphviz-2.2.1/dotneato/dotgen/Makefile.am	2006-10-18 22:16:36 +0600
@@ -20,6 +20,7 @@
 
 libdotgen_la_LIBADD = \
 	$(top_builddir)/pathplan/libpathplan.la \
-	$(top_builddir)/graph/libgraph.la
+	$(top_builddir)/graph/libgraph.la \
+	$(top_builddir)/dotneato/common/libcommon.la
 
 EXTRA_DIST = Makefile.old
--- graphviz-2.2.1/dotneato/common/Makefile.am.orig	2004-09-15 04:27:43 +0600
+++ graphviz-2.2.1/dotneato/common/Makefile.am	2006-10-18 22:08:13 +0600
@@ -25,7 +25,12 @@
 	shapes.c utils.c output.c emit.c
 
 libcommon_la_LIBADD = \
-	@GD_LIBS@ @EXPAT_LIBS@ @LIBSVG_CAIRO_LIBS@ @Z_LIBS@
+	@GD_LIBS@ @EXPAT_LIBS@ @LIBSVG_CAIRO_LIBS@ @Z_LIBS@ \
+	$(top_builddir)/graph/libgraph.la \
+	$(top_builddir)/pathplan/libpathplan.la \
+	$(top_builddir)/cdt/libcdt.la \
+	$(top_builddir)/dotneato/gvrender/libgvrender.la
+
 
 psgen.o psgen.lo : ps.h
 
--- graphviz-2.2.1/dotneato/circogen/Makefile.am.orig	2004-08-13 04:29:41 +0600
+++ graphviz-2.2.1/dotneato/circogen/Makefile.am	2006-10-18 22:14:58 +0600
@@ -23,6 +23,6 @@
 	stack.c circular.c deglist.c blocktree.c blockpath.c \
 	circpos.c nodeset.c
 
-libcircogen_la_LIBADD = $(top_builddir)/dotneato/neatogen/libneatogen.la
+libcircogen_la_LIBADD = $(top_builddir)/dotneato/neatogen/libneatogen.la $(top_builddir)/dotneato/common/libcommon.la
 
 EXTRA_DIST = Makefile.old
--- graphviz-2.2.1/agraph/Makefile.am.orig	2004-07-26 22:52:05 +0600
+++ graphviz-2.2.1/agraph/Makefile.am	2006-10-18 22:12:28 +0600
@@ -21,6 +21,8 @@
 	mem.c node.c obj.c pend.c rec.c refstr.c scan.l subg.c \
 	utils.c write.c
 
+libagraph_la_LIBADD = $(top_builddir)/cdt/libcdt.la
+
 scan.o scan.lo: scan.c grammar.h
 
 scan.c: $(top_srcdir)/agraph/scan.l