--- ./agraph/Makefile.am.orig	2004-07-26 20:52:05 +0400
+++ ./agraph/Makefile.am	2006-07-03 08:41:26 +0400
@@ -21,6 +21,9 @@
 	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
--- ./dotneato/common/Makefile.am.orig	2004-09-15 02:27:43 +0400
+++ ./dotneato/common/Makefile.am	2006-07-03 08:48:47 +0400
@@ -25,7 +25,11 @@
 	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)/dotneato/neatogen/libneatogen.la \
+	$(top_builddir)/dotneato/gvrender/libgvrender.la \
+	$(top_builddir)/pathplan/libpathplan.la
+
 
 psgen.o psgen.lo : ps.h
 
--- ./dotneato/Makefile.am.orig	2004-11-25 02:45:55 +0300
+++ ./dotneato/Makefile.am	2006-07-03 08:25:20 +0400
@@ -45,7 +45,8 @@
 dot_LDADD = \
 	$(top_builddir)/dotneato/common/libcommon.la \
 	$(top_builddir)/dotneato/gvrender/libgvrender.la \
-	$(top_builddir)/dotneato/dotgen/libdotgen.la
+	$(top_builddir)/dotneato/dotgen/libdotgen.la \
+	$(top_builddir)/dotneato/neatogen/libneatogen.la
 
 neato_SOURCES = neato.c
 neato_LDADD = \

--- ./dotneato/common/Makefile.am.orig	2006-07-03 08:57:42 +0400
+++ ./dotneato/common/Makefile.am	2006-07-03 09:09:20 +0400
@@ -26,10 +26,8 @@
 
 libcommon_la_LIBADD = \
 	@GD_LIBS@ @EXPAT_LIBS@ @LIBSVG_CAIRO_LIBS@ @Z_LIBS@ \
-	$(top_builddir)/dotneato/neatogen/libneatogen.la \
-	$(top_builddir)/dotneato/gvrender/libgvrender.la \
-	$(top_builddir)/pathplan/libpathplan.la
-
+	$(top_builddir)/pathplan/libpathplan.la \
+	$(top_builddir)/dotneato/gvrender/libgvrender.la
 
 psgen.o psgen.lo : ps.h
 
--- ./dotneato/gvrender/Makefile.am.orig	2004-08-13 02:29:42 +0400
+++ ./dotneato/gvrender/Makefile.am	2006-07-03 09:09:32 +0400
@@ -15,6 +15,6 @@
 
 libgvrender_la_SOURCES = gvrender.c gvcontext.c gvjobs.c gvlang.c gvconfig.c
 
-libgvrender_la_LIBADD = $(top_builddir)/dotneato/common/libcommon.la
+#libgvrender_la_LIBADD = $(top_builddir)/dotneato/common/libcommon.la
                                                                                 
 EXTRA_DIST = Makefile.old
--- ./Makefile.am.orig	2006-07-03 09:47:40 +0400
+++ ./Makefile.am	2006-07-03 09:45:58 +0400
@@ -3,6 +3,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 pkgindexdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
 pkgindex_DATA = pkgIndex.tcl
 
 txtdir = $(pkgdatadir)/doc