One less library

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 5247b98b804f27ef4af5478b6e2c7ba11e4948c9..699b9d25d597adc46b1167f86efa8545ecc12224 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -51,7 +51,7 @@ dot_static_LDADD = \
        $(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/gvc/libgvc_C.la \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \
        $(top_builddir)/lib/pack/libpack_C.la \
        $(top_builddir)/lib/graph/libgraph_C.la \

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 004ac4b570c842c3a8467f22c1e92d309a7cbc81..2de4c52d67e0c308b8e705e2ae6d0d7bcbd361cb 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -20,7 +20,7 @@ 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
+noinst_LTLIBRARIES = libgvc_C.la
 pkglib_LTLIBRARIES = libgvc.la
 pkgconfig_DATA = libgvc.pc
 
@@ -30,9 +30,6 @@ libgvc_C_la_SOURCES = gvrender.c gvlayout.c gvdevice.c \
 libgvc_C_la_LIBADD = \
        $(top_builddir)/lib/common/libcommon_C.la
 
-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) \

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 9e454983f36948d76215a7dd565286a84c91b397..129fbbe7c44b686a90f4590b9a68665d9900db61 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -57,7 +57,7 @@ libtcldot_builtin_la_LIBADD = \
        $(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/gvc/libgvc_C.la \
        $(top_builddir)/lib/graph/libgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \