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/gd/Makefile.am b/lib/gd/Makefile.am
index de9bebdd0f961fa9620fbe21c14dcf37b52de53d..0e457d7b2abcf812919c83ea901b8602e4fa7308 100644 (file)
--- a/lib/gd/Makefile.am
+++ b/lib/gd/Makefile.am
@@ -8,9 +8,9 @@ AM_CPPFLAGS = @FT_INCLUDES@ @FC_INCLUDES@ @PNG_INCLUDES@ @JPEG_INCLUDES@ @Z_INCL
 htmldir = $(pkgdatadir)/doc/html
 
 if WITH_MYLIBGD
-pkginclude_HEADERS = gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
+noinst_HEADERS = gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
        gdfonts.h gdfontt.h gdhelpers.h jisx0208.h wbmp.h gdfx.h entities.h
-pkglib_LTLIBRARIES = libgvgd.la
+noinst_LTLIBRARIES = libgvgd_C.la
 noinst_PROGRAMS = annotate gdparttopng gdtopng gd2copypal gd2topng pngtogd \
        pngtogd2 webpng gd2togif gdcmpgif giftogd2 \
        fontsizetest fontwheeltest gdtest gddemo gd2time gdtestft \
@@ -18,19 +18,17 @@ noinst_PROGRAMS = annotate gdparttopng gdtopng gd2copypal gd2topng pngtogd \
 html_DATA = $(html)
 endif
 
-libgvgd_la_LDFLAGS = -version-info 2:0:0 -no-undefined
-
-libgvgd_la_SOURCES = gdtables.c gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c \
+libgvgd_C_la_SOURCES = \
+       gdtables.c gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c \
        gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c \
        gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c \
        gdfonts.c gdfontt.c gdft.c gdhelpers.c gdkanji.c gdxpm.c wbmp.c
-
-libgvgd_la_LIBADD = @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
+libgvgd_C_la_LIBADD = @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
 
 gd.html: index.html
        cp $(top_srcdir)/lib/gd/index.html gd.html
 
-LDADD = ./libgvgd.la
+LDADD = ./libgvgd_C.la
 
 dist-zip: distdir
        zip -qr $(distdir).zip $(distdir)

diff --git a/lib/graph/Makefile.am b/lib/graph/Makefile.am
index 157bf6a4054cd433c175cf1d5917cd02e77d2f22..0acd0f41294e799ec8be38510d6f784830817275 100644 (file)
--- a/lib/graph/Makefile.am
+++ b/lib/graph/Makefile.am
@@ -12,16 +12,18 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/cdt
 
 pkginclude_HEADERS = graph.h libgraph.h triefa.h parser.h agxbuf.h
+noinst_LTLIBRARIES = libgraph_C.la
 pkglib_LTLIBRARIES = libgraph.la
 pkgconfig_DATA = libgraph.pc
 man_MANS = $(man)
 pdf_DATA = $(pdf)
 
-libgraph_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-
-libgraph_la_SOURCES = attribs.c agxbuf.c edge.c graph.c graphio.c lexer.c \
+libgraph_C_la_SOURCES = \
+       attribs.c agxbuf.c edge.c graph.c graphio.c lexer.c \
        node.c parser.y refstr.c trie.c
  
+libgraph_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgraph_la_SOURCES = $(libgraph_C_la_SOURCES)
 libgraph_la_LIBADD = $(top_builddir)/lib/cdt/libcdt.la
 
 lexer.o lexer.lo trie.o trie.lo: parser.h

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 5e9bc1b2ba23197ec3a95c616ca81377e142dae1..004ac4b570c842c3a8467f22c1e92d309a7cbc81 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -20,24 +20,25 @@ pkginclude_HEADERS = gvc.h gvcext.h gvplugin.h gvcjob.h gvcint.h \
        gvplugin_textlayout.h \
        gvplugin_device.h
 noinst_HEADERS = gvcproc.h
+noinst_LTLIBRARIES = libgvc_C.la libgvc_builtins_C.la
 pkglib_LTLIBRARIES = libgvc.la
-noinst_LTLIBRARIES = libgvc_builtins.la
 pkgconfig_DATA = libgvc.pc
 
-libgvc_builtins_la_SOURCES = gvrender.c gvlayout.c gvdevice.c \
+libgvc_C_la_SOURCES = gvrender.c gvlayout.c gvdevice.c \
        gvcontext.c gvjobs.c gvevent.c gvplugin.c gvconfig.c \
        gvtextlayout.c gvusershape.c gvc.c
-libgvc_la_SOURCES = ${libgvc_builtins_la_SOURCES} no_builtins.c
+libgvc_C_la_LIBADD = \
+       $(top_builddir)/lib/common/libcommon_C.la
 
-libgvc_builtins_la_LIBADD = \
+libgvc_builtins_C_la_SOURCES = $(libgvc_C_la_SOURCES)
+libgvc_builtins_C_la_LIBADD = $(libgvc_C_la_LIBADD)
+
+libgvc_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
+libgvc_la_SOURCES = $(libgvc_C_la_SOURCES) no_builtins.c
+libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) \
        $(top_builddir)/lib/cdt/libcdt.la \
-       $(top_builddir)/lib/common/libcommon.la \
        $(top_builddir)/lib/graph/libgraph.la \
        $(top_builddir)/lib/pathplan/libpathplan.la \
        @GD_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@
 
-libgvc_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-
-libgvc_la_LIBADD = ${libgvc_builtins_la_LIBADD}
-
 EXTRA_DIST = Makefile.old dot_builtins.c