]> granicus.if.org Git - graphviz/commitdiff
cluster: 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
cluster:

/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/gvmap/Makefile.am

index 518c406a1600ae5346a48098e643daf5aeaff82f..7a9b0f5f99190c04557b51e4c13d09741616d3aa 100644 (file)
@@ -55,9 +55,9 @@ cluster_LDADD = \
        $(top_builddir)/lib/sparse/libsparse_C.la \
        $(top_builddir)/lib/rbtree/librbtree_C.la \
        $(top_builddir)/lib/ingraphs/libingraphs_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/gvc/libgvc.la \
        $(GTS_LIBS) -lm
 
 gvmap.sh :