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/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index bcb3a647d77b190f4ac9469a06addd032e44a2d6..5247b98b804f27ef4af5478b6e2c7ba11e4948c9 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -47,16 +47,16 @@ dot.pdf: $(top_srcdir)/cmd/dot/dot.1
 dot_static_SOURCES = dot.c
 dot_static_LDFLAGS = -export-dynamic -dlpreopen self -export-symbols-regex '.*_LTX_library'
 dot_static_LDADD = \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_dot_layout.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_neato_layout.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_gd.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_pangocairo.a \
-       $(top_builddir)/lib/gvc/.libs/libgvc_builtins.a \
-       $(top_builddir)/lib/pathplan/.libs/libpathplan.a \
-       $(top_builddir)/lib/pack/.libs/libpack.a \
-       $(top_builddir)/lib/graph/.libs/libgraph.a \
-       $(top_builddir)/lib/cdt/.libs/libcdt.a \
-       @PANGOCAIRO_LIBS@ @GD_LIBS_STATIC@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@
+       $(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 \
+       $(top_builddir)/lib/pathplan/libpathplan_C.la \
+       $(top_builddir)/lib/pack/libpack_C.la \
+       $(top_builddir)/lib/graph/libgraph_C.la \
+       $(top_builddir)/lib/cdt/libcdt_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@
 
 EXTRA_DIST = Makefile.old dot.1 dot.pdf
 

diff --git a/cmd/gvpr/Makefile.am b/cmd/gvpr/Makefile.am
index 6685f7bf10fa90b271d95df0ecaae7bbbc0ac754..273c5ddaa1b80fab03c95fa1f9fecbb4d2589b2c 100644 (file)
--- a/cmd/gvpr/Makefile.am
+++ b/cmd/gvpr/Makefile.am
@@ -21,14 +21,15 @@ pdf_DATA = gvpr.pdf
 
 gvpr_SOURCES = actions.c compile.c gvpr.c gprstate.c parse.c queue.c
 
-gvpr_LDADD = $(top_builddir)/lib/expr/libexpr.la \
-        $(top_builddir)/lib/vmalloc/libvmalloc.la \
-       $(top_builddir)/lib/sfio/libsfio.la \
-        $(top_builddir)/lib/ingraphs/libingraphs.la \
+gvpr_LDADD = \
+       $(top_builddir)/lib/vmalloc/libvmalloc_C.la \
+       $(top_builddir)/lib/sfio/libsfio_C.la \
+        $(top_builddir)/lib/ingraphs/libingraphs_C.la \
+       $(top_builddir)/lib/expr/libexpr.la \
        $(top_builddir)/lib/agraph/libagraph.la @MATH_LIBS@
 
 gvpr_DEPENDENCIES = \
-       $(top_builddir)/lib/ast/libast.la
+       $(top_builddir)/lib/ast/libast_C.la
 
 $(gvpr_OBJECTS): gdefs.h
 

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 3413300021a87b5d344b2eb3bb5210f0fa5005f0..fc85a1e916e2dd19019b217aa344258e46ac9166 100644 (file)
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -38,75 +38,75 @@ uninstall-hook:
 gxl2dot_SOURCES = cvtgxl.c dot2gxl.c gxl2dot.c
 
 gxl2dot_LDADD = \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/agraph/libagraph.la @EXPAT_LIBS@ \
        $(top_builddir)/lib/graph/libgraph.la
 
 sccmap_SOURCES = sccmap.c
 
 sccmap_LDADD = \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/agraph/libagraph.la
 
 ccomps_SOURCES = ccomps.c
 
 ccomps_LDADD = \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/graph/libgraph.la
 
 tred_SOURCES = tred.c
 
 tred_LDADD = \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/graph/libgraph.la
 
 unflatten_SOURCES = unflatten.c
 
 unflatten_LDADD = \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/agraph/libagraph.la
 
 acyclic_SOURCES = acyclic.c
 
 acyclic_LDADD = \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/graph/libgraph.la
 
 nop_SOURCES = nop.c
 
 nop_LDADD = \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/agraph/libagraph.la
 
 gvcolor_SOURCES = gvcolor.c colxlate.c colortbl.h
 
 gvcolor_LDADD = \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/graph/libgraph.la
 
 bcomps_SOURCES = bcomps.c
 
 bcomps_LDADD = \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/graph/libgraph.la
 
 gc_SOURCES = gc.c
 
 gc_LDADD = \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/graph/libgraph.la
 
 gvpack_SOURCES = gvpack.c gvpack_builtins.c
 
 gvpack_LDADD = \
        $(top_builddir)/lib/gvc/libgvc.la \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/plugin/libgvplugin_neato_layout.la
 
 dijkstra_SOURCES = dijkstra.c
 
 dijkstra_LDADD = \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
+       $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/agraph/libagraph.la
 
 .1.pdf:

diff --git a/configure.ac b/configure.ac
index 3976f230dadfb6dc12f51deb352d759580e9b621..aaa684ede42f5db70a6f291af56b696659e088bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1095,7 +1095,7 @@ else
        AC_MSG_WARN(Optional IPSEPCOLA is enabled)
        AC_DEFINE_UNQUOTED(IPSEPCOLA,1,[Define if you want IPSEPCOLA])
        IPSEPCOLA_INCLUDES='-I$(top_srcdir)/lib/vpsc'
-       IPSEPCOLA_LIBS='$(top_builddir)/lib/vpsc/libvpsc.la -lstdc++'
+       IPSEPCOLA_LIBS='$(top_builddir)/lib/vpsc/libvpsc_C.la -lstdc++'
 fi
 AC_SUBST(IPSEPCOLA_INCLUDES)
 AC_SUBST(IPSEPCOLA_LIBS)
@@ -1208,7 +1208,6 @@ if test "x$with_libgd" = "xyes"; then
            AC_MSG_WARN(Optional GD library not available - no gd.h))
     LDFLAGS=$save_LDFLAGS
     CPPFLAGS=$save_CPPFLAGS
-    GD_LIBS_STATIC=$(GD_LIBS)
 fi
 else
     # using the internal libgd
@@ -1216,8 +1215,7 @@ else
     AC_DEFINE_UNQUOTED(HAVE_GD_GIF,1,[Define if the GD library has the GD_GIF feature])
     AC_DEFINE_UNQUOTED(HAVE_LIBGD,1,[Define if either internal or external GD library is availabel])
     GD_INCLUDES='-I$(top_srcdir)/lib/gd'
-    GD_LIBS='$(top_builddir)/lib/gd/libgvgd.la'
-    GD_LIBS_STATIC='$(top_builddir)/lib/gd/.libs/libgvgd.a'
+    GD_LIBS='$(top_builddir)/lib/gd/libgvgd_C.la'
 fi
 AC_SUBST(GD_INCLUDES)
 AC_SUBST(GD_LIBS)

diff --git a/contrib/prune/Makefile.am b/contrib/prune/Makefile.am
index 418b6c46fa267f4ef2ecb56ee2e90c456ba84ef4..4e35dd2c2afe601f7c2ea201c0c872971f1ce54e 100644 (file)
--- a/contrib/prune/Makefile.am
+++ b/contrib/prune/Makefile.am
@@ -16,7 +16,7 @@ pdf_DATA = prune.pdf
 
 prune_SOURCES = generic_list.c prune.c
 
-prune_LDADD = $(top_builddir)/lib/ingraphs/libingraphs.la \
+prune_LDADD = $(top_builddir)/lib/ingraphs/libingraphs_C.la \
        $(top_builddir)/lib/agraph/libagraph.la \
        $(top_builddir)/lib/cdt/libcdt.la
 

diff --git a/lib/agraph/Makefile.am b/lib/agraph/Makefile.am
index 2b99424c1ce86f3abc8143d965c3f39a47270bbe..178c31598791ea17d332a406b9558e364624320d 100644 (file)
--- a/lib/agraph/Makefile.am
+++ b/lib/agraph/Makefile.am
@@ -12,18 +12,19 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/cdt
 
 pkginclude_HEADERS = aghdr.h agraph.h malloc.h vmstub.h grammar.h
+noinst_LTLIBRARIES = libagraph_C.la
 pkglib_LTLIBRARIES = libagraph.la
 pkgconfig_DATA = libagraph.pc
 man_MANS = $(man)
 pdf_DATA = $(pdf)
 
-libagraph_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-
-libagraph_la_SOURCES = agerror.c apply.c attr.c \
+libagraph_C_la_SOURCES = agerror.c apply.c attr.c \
        edge.c flatten.c grammar.y graph.c id.c imap.c io.c \
        mem.c node.c obj.c pend.c rec.c refstr.c scan.l subg.c \
        utils.c write.c
 
+libagraph_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libagraph_la_SOURCES = $(libagraph_C_la_SOURCES)
 libagraph_la_LIBADD = $(top_builddir)/lib/cdt/libcdt.la
 
 scan.o scan.lo: scan.c grammar.h