All libs first assembled as non-installed libxxx_C "convenience" libraries.

Now bin/dot_static and lib/graphviz/libtcldot_builtin.so have no
external dependencies on any other graphviz library.

diff --git a/tclpkg/tclpathplan/Makefile.am b/tclpkg/tclpathplan/Makefile.am
index 528bba1ee8eb98efaffc54657b7b0b5089e87544..589c746074cd33adaa854b77bb9d2e16c9d72379 100644 (file)
--- a/tclpkg/tclpathplan/Makefile.am
+++ b/tclpkg/tclpathplan/Makefile.am
@@ -20,8 +20,8 @@ endif
 libtclplan_la_SOURCES = find_ints.c intersect.c makecw.c tclpathplan.c wrapper.c
 libtclplan_la_LDFLAGS = -no-undefined
 libtclplan_la_LIBADD = \
-       $(top_builddir)/tclpkg/tclhandle/libtclhandle.la \
-       $(top_builddir)/tclpkg/tclstubs/libtclstubs.la \
+       $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
+       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
        $(top_builddir)/lib/pathplan/libpathplan.la
 
 if WITH_TCL

diff --git a/tclpkg/tkspline/Makefile.am b/tclpkg/tkspline/Makefile.am
index 78338701e4e1e8518e09e7427df1db9863bd2778..501b5b0c68fab08fdc2f793e9fedfc598f1131e6 100644 (file)
--- a/tclpkg/tkspline/Makefile.am
+++ b/tclpkg/tkspline/Makefile.am
@@ -24,11 +24,11 @@ man_MANS = $(man)
 pdf_DATA = $(pdf)
 endif
 
-libtkspline_la_SOURCES = tkspline.c
 libtkspline_la_LDFLAGS = -no-undefined 
+libtkspline_la_SOURCES = tkspline.c
 libtkspline_la_LIBADD = \
-       $(top_builddir)/tclpkg/tkstubs/libtkstubs.la \
-       $(top_builddir)/tclpkg/tclstubs/libtclstubs.la @TK_LIB_SPEC@
+       $(top_builddir)/tclpkg/tkstubs/libtkstubs_C.la \
+       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la @TK_LIB_SPEC@
 
 if WITH_TK
 all-local: pkgIndex.tcl
@@ -40,7 +40,7 @@ endif
 .n.pdf:
        groff -Tps -man $< | ps2pdf - - >$@
 
-EXTRA_DIST = $(libtkspline_la_SOURCES) $(man) $(pdf) dllEntry.c
+EXTRA_DIST = $(man) $(pdf) dllEntry.c
 
 CLEANFILES = pkgIndex.tcl