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/ast/Makefile.am b/lib/ast/Makefile.am
index 808748ead59b5f0ec1687c0a5b73e8c43b112089..e3f9815c752a8e84664eef20e11fbe487bfd0aa5 100644 (file)
--- a/lib/ast/Makefile.am
+++ b/lib/ast/Makefile.am
@@ -4,9 +4,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/lib/sfio
 
 noinst_HEADERS = align.h ast.h error.h hashkey.h
-noinst_LTLIBRARIES = libast.la
+noinst_LTLIBRARIES = libast_C.la
 
-libast_la_SOURCES = pathpath.c sfstr.h chresc.c chrtoi.c error.c \
+libast_C_la_SOURCES = pathpath.c sfstr.h chresc.c chrtoi.c error.c \
        fmtbuf.c fmtesc.c pathaccess.c pathbin.c pathcanon.c pathcat.c \
        pathexists.c pathfind.c pathgetlink.c \
        strcopy.c stresc.c strmatch.c strton.c strerror.c

diff --git a/lib/cdt/Makefile.am b/lib/cdt/Makefile.am
index 5d41f5fda7b87c4794819778c7b966fa37d8d0d0..6da8a9247efadde374789e362b64cad01af6c607 100644 (file)
--- a/lib/cdt/Makefile.am
+++ b/lib/cdt/Makefile.am
@@ -11,18 +11,20 @@ pdf = cdt.pdf
 AM_CPPFLAGS = -I$(top_srcdir)
 
 pkginclude_HEADERS = cdt.h dthdr.h
+noinst_LTLIBRARIES = libcdt_C.la
 pkglib_LTLIBRARIES = libcdt.la
 man_MANS = $(man)
 pdf_DATA = $(pdf)
 pkgextrainclude_DATA = $(top_builddir)/ast_common.h
 pkgconfig_DATA = libcdt.pc
 
-libcdt_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-
-libcdt_la_SOURCES = dtclose.c dtdisc.c dtextract.c dtflatten.c \
+libcdt_C_la_SOURCES = dtclose.c dtdisc.c dtextract.c dtflatten.c \
        dthash.c dtlist.c dtmethod.c dtopen.c dtrenew.c dtrestore.c dtsize.c \
        dtstat.c dtstrhash.c dttree.c dtview.c dtwalk.c
 
+libcdt_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libcdt_la_SOURCES = $(libcdt_C_la_SOURCES)
+
 .3.pdf:
        groff -Tps -man $< | ps2pdf - - >$@
 

diff --git a/lib/circogen/Makefile.am b/lib/circogen/Makefile.am
index 92a3a2a9f4c4db98ff3d29256fe537148141a53a..4248d3d41f9b26251abf281d86b2f2c976471a7c 100644 (file)
--- a/lib/circogen/Makefile.am
+++ b/lib/circogen/Makefile.am
@@ -17,9 +17,9 @@ AM_CPPFLAGS = \
 noinst_HEADERS = block.h blockpath.h blocktree.h circo.h \
        circpos.h circular.h deglist.h edgelist.h nodelist.h \
        nodeset.h stack.h
-noinst_LTLIBRARIES = libcircogen.la
+noinst_LTLIBRARIES = libcircogen_C.la
 
-libcircogen_la_SOURCES = circularinit.c nodelist.c block.c edgelist.c \
+libcircogen_C_la_SOURCES = circularinit.c nodelist.c block.c edgelist.c \
        stack.c circular.c deglist.c blocktree.c blockpath.c \
        circpos.c nodeset.c
 

diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 5b13576bf1672325ad7acd155e9ef4d55657c896..b8907e2cd86bcee44bb56b1609f2788cc749d36c 100644 (file)
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -14,7 +14,7 @@ pkginclude_HEADERS = logic.h arith.h geom.h color.h types.h globals.h textpara.h
 noinst_HEADERS = render.h utils.h memory.h \
        geomprocs.h colorprocs.h colortbl.h entities.h \
        const.h macros.h htmllex.h htmltable.h pointset.h
-noinst_LTLIBRARIES = libcommon.la
+noinst_LTLIBRARIES = libcommon_C.la
 
 if WITH_LIBGD
 GD_CODEGENS = gdgen.c vrmlgen.c
@@ -26,7 +26,7 @@ CODEGENS = $(GD_CODEGENS) diagen.c figgen.c hpglgen.c mapgen.c mifgen.c mpgen.c
 endif
 
 
-libcommon_la_SOURCES = arrows.c colxlate.c fontmetrics.c \
+libcommon_C_la_SOURCES = arrows.c colxlate.c fontmetrics.c \
        args.c memory.c globals.c htmllex.c htmlparse.y htmltable.c input.c \
        pointset.c postproc.c routespl.c splines.c psusershape.c \
        timing.c labels.c ns.c shapes.c utils.c geom.c \