]> granicus.if.org Git - graphviz/commitdiff
gvc: autotools: remove now obsolete linking to xdot
authorMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Mon, 27 Sep 2021 20:29:01 +0000 (22:29 +0200)
committerMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Tue, 7 Dec 2021 06:34:59 +0000 (07:34 +0100)
The core plugin that previously relied on this explicitly links to
xdot itself since commit 6d646c82d94efdfb9933328f08301f6e1600943e.

The gvc source files do not refer to xdot explicitly and any implicit
references are now resolved by the transitive dependency through
common.

Fixes these errors using autotools with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: ../../lib/xdot/.libs/libxdot.dll.a(d000007.o):(.text+0x0): multiple definition of `parseXDotF'; ../../lib/xdot/.libs/libxdot_C.a(xdot.o):C:\Users\magja\graphviz\lib\xdot/xdot.c:475: first defined here
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: ../../lib/xdot/.libs/libxdot.dll.a(d000002.o):(.text+0x0): multiple definition of `freeXDot'; ../../lib/xdot/.libs/libxdot_C.a(xdot.o):C:\Users\magja\graphviz\lib\xdot/xdot.c:927: first defined here

lib/gvc/Makefile.am

index 71f7baa69544eb90a38ad2ba27fd3aca0ac2a974..d6640d3361a3eb76163acb2c752fe423cfd2256b 100644 (file)
@@ -48,12 +48,10 @@ libgvc_C_la_SOURCES = gvrender.c gvlayout.c gvdevice.c gvloadimage.c \
 
 libgvc_C_la_LIBADD = \
        $(top_builddir)/lib/pack/libpack_C.la \
-       $(top_builddir)/lib/xdot/libxdot_C.la \
        $(top_builddir)/lib/label/liblabel_C.la \
        $(top_builddir)/lib/common/libcommon_C.la
 libgvc_C_la_DEPENDENCIES = \
        $(top_builddir)/lib/pack/libpack_C.la \
-       $(top_builddir)/lib/xdot/libxdot_C.la \
        $(top_builddir)/lib/label/liblabel_C.la \
        $(top_builddir)/lib/common/libcommon_C.la
 if WITH_ORTHO
@@ -67,7 +65,6 @@ endif
 libgvc_la_LDFLAGS = -version-info $(GVC_VERSION) -no-undefined
 libgvc_la_SOURCES = $(libgvc_C_la_SOURCES)
 libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) \
-       $(top_builddir)/lib/xdot/libxdot.la \
        $(top_builddir)/lib/cdt/libcdt.la \
        $(top_builddir)/lib/cgraph/libcgraph.la \
        $(top_builddir)/lib/pathplan/libpathplan.la \