Added lib$(GRAPH).la to dot_LDADD in cmd/dot/Makefile.am and libcdt.la to cmd/tools...

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index d28f05f146c8933fd87f1c291ab05908df55e115..f93bfe7359d471067480ff296db5e324505f6ae0 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -52,7 +52,9 @@ pdf_DATA = dot.1.pdf osage.1.pdf patchwork.1.pdf
 
 dot_SOURCES = dot.c no_builtins.c
 dot_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
-dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la
+dot_LDADD = \
+       $(top_builddir)/lib/gvc/libgvc.la \
+       $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la
 
 install-data-hook:
        (cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; $(LN_S) dot.1 $$i; done;)

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 4397a37395fe1149d76fb396a7046b368e02befd..e4363c2c1f1eb72ffb3e1bc44e92a2c0c55f3c71 100644 (file)
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -49,7 +49,8 @@ gxl2gv_SOURCES = cvtgxl.c gv2gxl.c gxl2gv.c
 
 gxl2gv_LDADD = \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
-       $(top_builddir)/lib/cgraph/libcgraph.la @EXPAT_LIBS@ 
+       $(top_builddir)/lib/cgraph/libcgraph.la \
+       $(top_builddir)/lib/cdt/libcdt.la @EXPAT_LIBS@ 
 
 gxl2gv.1.pdf: $(srcdir)/gxl2gv.1
        - @GROFF@ -Tps -man $(srcdir)/gxl2gv.1 | @PS2PDF@ - - >gxl2gv.1.pdf
@@ -141,6 +142,8 @@ gvpack_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=0
 gvpack_LDADD = \
        $(top_builddir)/lib/gvc/libgvc.la \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
+       $(top_builddir)/lib/cgraph/libcgraph.la \
+       $(top_builddir)/lib/cdt/libcdt.la \
        $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la
 
 gvpack.1.pdf: $(srcdir)/gvpack.1
@@ -183,7 +186,8 @@ gmlscan.c: $(top_srcdir)/cmd/tools/gmlscan.l
        rm @LEX_OUTPUT_ROOT@.c
 
 gml2gv_LDADD = \
-       $(top_builddir)/lib/cgraph/libcgraph.la @MATH_LIBS@
+       $(top_builddir)/lib/cgraph/libcgraph.la \
+       $(top_builddir)/lib/cdt/libcdt.la @MATH_LIBS@
 
 gml2gv.1.pdf: gml2gv.1
        - @GROFF@ -Tps -man gml2gv.1 | @PS2PDF@ - - >gml2gv.1.pdf
@@ -192,7 +196,8 @@ graphml2gv_SOURCES = graphml2gv.c
 
 graphml2gv_LDADD = \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
-       $(top_builddir)/lib/cgraph/libcgraph.la @EXPAT_LIBS@ 
+       $(top_builddir)/lib/cgraph/libcgraph.la \
+       $(top_builddir)/lib/cdt/libcdt.la @EXPAT_LIBS@ 
 
 graphml2gv.1.pdf: $(srcdir)/graphml2gv.1
        - @GROFF@ -Tps -man $(srcdir)/graphml2gv.1 | @PS2PDF@ - - >graphml2gv.1.pdf
@@ -201,7 +206,8 @@ dijkstra_SOURCES = dijkstra.c
 
 dijkstra_LDADD = \
        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
-       $(top_builddir)/lib/cgraph/libcgraph.la
+       $(top_builddir)/lib/cgraph/libcgraph.la \
+       $(top_builddir)/lib/cdt/libcdt.la
 
 dijkstra.1.pdf: $(srcdir)/dijkstra.1
        - @GROFF@ -Tps -man $(srcdir)/dijkstra.1 | @PS2PDF@ - - >dijkstra.1.pdf