]> granicus.if.org Git - graphviz/commitdiff
cmd/edgepaint: autotools: link to the gvc lib instead of the static common lib
authorMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Tue, 14 Sep 2021 10:31:44 +0000 (12:31 +0200)
committerMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Sun, 19 Sep 2021 20:57:33 +0000 (22:57 +0200)
The common lib is part of gvc and should not be linked to directly.

This will allow an upcoming MR to correct the storage class attributes
in lib/common/globals.h.

Wihout this commit, many errors like this would appear when linking
the edegpaint executable:

/usr/lib/gcc/x86_64-pc-cygwin/10/../../../../x86_64-pc-cygwin/bin/ld: ../../lib/edgepaint/.libs/libedgepaint_C.a(node_distinct_coloring.o): in function `node_distinct_coloring_internal2':
/home/magja/graphviz/lib/edgepaint/node_distinct_coloring.c:137: undefined reference to `__imp_Verbose'

Towards https://gitlab.com/graphviz/graphviz/-/issues/2058.

cmd/edgepaint/Makefile.am

index 99f192001730091e6cdb9145a2644d653726fb35..d93b0a8c5d804daeb8e68b712055aa3f8c7e7ace 100644 (file)
@@ -32,10 +32,10 @@ edgepaint_LDADD = \
        $(top_builddir)/lib/neatogen/libneatogen_C.la \
        $(top_builddir)/lib/sparse/libsparse_C.la \
        $(top_builddir)/lib/rbtree/librbtree_C.la \
-       $(top_builddir)/lib/common/libcommon_C.la \
        $(top_builddir)/lib/edgepaint/liblab_gamut.la \
        $(top_builddir)/lib/cgraph/libcgraph.la \
        $(top_builddir)/lib/cdt/libcdt.la \
+       $(top_builddir)/lib/gvc/libgvc.la \
        $(ANN_LIBS) -lm
 
 # add a non-existent C++ source to force the C++ compiler to be used for