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/lib/vmalloc/Makefile.am b/lib/vmalloc/Makefile.am
index 2ffee9367f64d217a64ec892850b142a03a92dc7..52392d3513a4ac9dda40236c692c1af342b8ba57 100644 (file)
--- a/lib/vmalloc/Makefile.am
+++ b/lib/vmalloc/Makefile.am
@@ -5,9 +5,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib/ast \
        -I$(top_srcdir)/lib/sfio
 
 noinst_HEADERS = vmalloc.h vmhdr.h
-noinst_LTLIBRARIES = libvmalloc.la
+noinst_LTLIBRARIES = libvmalloc_C.la
 
-libvmalloc_la_SOURCES = malloc.c vmbest.c vmclear.c vmclose.c vmdcheap.c \
+libvmalloc_C_la_SOURCES = malloc.c vmbest.c vmclear.c vmclose.c vmdcheap.c \
        vmdebug.c vmdisc.c vmexit.c vmlast.c vmopen.c vmpool.c vmprivate.c \
        vmprofile.c vmregion.c vmsegment.c vmset.c vmstat.c vmstrdup.c \
        vmtrace.c vmwalk.c

diff --git a/lib/vpsc/Makefile.am b/lib/vpsc/Makefile.am
index 6064cc452acd230836c73b2bd820d0bd06d2ae76..6101b7b9dabe5f71a5b108a3ade7c18620a18356 100644 (file)
--- a/lib/vpsc/Makefile.am
+++ b/lib/vpsc/Makefile.am
@@ -2,27 +2,16 @@
 ## Process this file with automake to produce Makefile.in
 
 if WITH_IPSEPCOLA
-noinst_LTLIBRARIES = libvpsc.la
+noinst_LTLIBRARIES = libvpsc_C.la
 endif
 
-libvpsc_la_SOURCES = block.cpp \
-       blocks.cpp \
-       constraint.cpp \
-       generate-constraints.cpp \
-       pairingheap/PairingHeap.cpp \
-       remove_rectangle_overlap.cpp \
-       solve_VPSC.cpp \
-       csolve_VPSC.cpp \
-       variable.cpp
-
-noinst_HEADERS = solve_VPSC.h \
-       block.h \
-       blocks.h \
-       variable.h \
-       constraint.h \
-       generate-constraints.h \
-       remove_rectangle_overlap.h \
-       solve_VPSC.h \
-       csolve_VPSC.h \
-       pairingheap/PairingHeap.h \
+noinst_HEADERS = \
+       solve_VPSC.h block.h blocks.h variable.h constraint.h \
+       generate-constraints.h remove_rectangle_overlap.h \
+       solve_VPSC.h csolve_VPSC.h pairingheap/PairingHeap.h \
        pairingheap/dsexceptions.h
+
+libvpsc_C_la_SOURCES = \
+       block.cpp blocks.cpp constraint.cpp generate-constraints.cpp \
+       pairingheap/PairingHeap.cpp remove_rectangle_overlap.cpp \
+       solve_VPSC.cpp csolve_VPSC.cpp variable.cpp

diff --git a/tclpkg/gdtclft/Makefile.am b/tclpkg/gdtclft/Makefile.am
index 3df464ec96d97e570c0ff1b3a382543e1ce0efed..073c68da6d51b3496383cee18ecf3547108f938c 100644 (file)
--- a/tclpkg/gdtclft/Makefile.am
+++ b/tclpkg/gdtclft/Makefile.am
@@ -31,8 +31,8 @@ libgdtclft_la_SOURCES = gdtclft.c
 libgdtclft_la_LDFLAGS = -no-undefined
 
 libgdtclft_la_LIBADD = \
-       $(top_builddir)/tclpkg/tclhandle/libtclhandle.la \
-       $(top_builddir)/tclpkg/tclstubs/libtclstubs.la @GD_LIBS@
+       $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
+       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la @GD_LIBS@
 
 if WITH_LIBGD
 if WITH_TCL
@@ -49,7 +49,7 @@ endif
 .n.pdf:
        groff -Tps -man $< | ps2pdf - - >$@
 
-EXTRA_DIST = $(libgdtclft_la_SOURCES) $(man) $(pdf) Makefile.old
+EXTRA_DIST = $(man) $(pdf) Makefile.old
 
 CLEANFILES = pkgIndex.tcl
 

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 891d878daa6ee84f20ff6e1cf25187646f127b30..6b18e13151c119d6aaf3a0b62d177863ab4ac602 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -110,7 +110,7 @@ pkgtcldir = $(pkglibdir)/tcl
 TCL_hdr = 
 nodist_libgv_tcl_la_SOURCES = gv_tcl.cpp $(TCL_hdr)
 libgv_tcl_la_SOURCES = $(BASESOURCES)
-libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs.la $(BASELIBS) @TCL_LIBS@
+libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) @TCL_LIBS@
 libgv_tcl_la_LDFLAGS = 
 gv_tcl.cpp $(TCL_hdr): gv.i
        $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp gv.i

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 95205441d41b67f2622981c3f2420dbacd368a97..49c4004b95b74452cd7ca5651487cff2b51e188e 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -44,20 +44,20 @@ endif
 libtcldot_la_SOURCES = tcldot.c $(CODEGENS) $(GDTCLFT)
 libtcldot_la_LDFLAGS = -no-undefined
 libtcldot_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/gvc/libgvc.la @LIBGEN_LIBS@ @LIBLTDL@
 
 libtcldot_builtin_la_SOURCES = tcldot.c $(top_srcdir)/lib/gvc/dot_builtins.c $(CODEGENS) $(GDTCLFT)
 libtcldot_builtin_la_LDFLAGS = -no-undefined
 libtcldot_builtin_la_LIBADD = \
-       $(top_builddir)/tclpkg/tclhandle/libtclhandle.la \
-       $(top_builddir)/tclpkg/tclstubs/libtclstubs.la \
-       $(top_builddir)/lib/plugin/libgvplugin_dot_layout.la \
-       $(top_builddir)/lib/plugin/libgvplugin_neato_layout.la \
-       $(top_builddir)/lib/plugin/libgvplugin_gd.la \
-       $(top_builddir)/lib/plugin/libgvplugin_pangocairo.la \
-       $(top_builddir)/lib/gvc/libgvc_builtins.la \
+       $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
+       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
+       $(top_builddir)/lib/plugin/libgvplugin_dot_layout_C.la \
+       $(top_builddir)/lib/plugin/libgvplugin_neato_layout_C.la \
+       $(top_builddir)/lib/plugin/libgvplugin_gd_C.la \
+       $(top_builddir)/lib/plugin/libgvplugin_pangocairo_C.la \
+       $(top_builddir)/lib/gvc/libgvc_builtins_C.la \
        @PANGOCAIRO_LIBS@ @GD_LIBS@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@
 
 if WITH_TCL
@@ -70,8 +70,7 @@ endif
 .n.pdf:
        groff -Tps -man $< | ps2pdf - - >$@
 
-EXTRA_DIST = $(libtcldot_la_SOURCES) $(man) $(pdf) $(html) \
-       README README.Tkspline Makefile.old
+EXTRA_DIST = $(man) $(pdf) $(html) README README.Tkspline Makefile.old
 
 CLEANFILES = pkgIndex.tcl