| diff -Naur graphviz-2.44.1.a/cmd/edgepaint/Makefile.am graphviz-2.44.1.b/cmd/edgepaint/Makefile.am |
| --- graphviz-2.44.1.a/cmd/edgepaint/Makefile.am 2020-06-29 10:47:18.000000000 +0200 |
| +++ graphviz-2.44.1.b/cmd/edgepaint/Makefile.am 2020-11-26 22:45:46.670921600 +0100 |
| @@ -27,10 +27,10 @@ |
| $(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) -lstdc++ -lm |
| |
| edgepaint.1.pdf: edgepaint.1.ps |
| diff -Naur graphviz-2.44.1.a/cmd/gvmap/Makefile.am graphviz-2.44.1.b/cmd/gvmap/Makefile.am |
| --- graphviz-2.44.1.a/cmd/gvmap/Makefile.am 2020-06-29 10:47:18.000000000 +0200 |
| +++ graphviz-2.44.1.b/cmd/gvmap/Makefile.am 2020-11-26 22:45:46.670921600 +0100 |
| @@ -39,9 +39,9 @@ |
| $(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 |
| |
| cluster_LDADD = \ |
| @@ -51,9 +51,9 @@ |
| $(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 : |
| diff -Naur graphviz-2.44.1.a/cmd/smyrna/Makefile.am graphviz-2.44.1.b/cmd/smyrna/Makefile.am |
| --- graphviz-2.44.1.a/cmd/smyrna/Makefile.am 2020-06-29 10:47:18.000000000 +0200 |
| +++ graphviz-2.44.1.b/cmd/smyrna/Makefile.am 2020-11-26 22:45:46.731293900 +0100 |
| @@ -9,7 +9,6 @@ |
| -I$(top_srcdir)/lib/cgraph \ |
| -I$(top_srcdir)/lib/cdt \ |
| -I$(top_srcdir)/lib/glcomp \ |
| - -I$(top_srcdir)/lib/utilities \ |
| -I$(top_srcdir)/lib/xdot \ |
| -I$(top_srcdir)/lib/glcomp \ |
| -I$(top_srcdir)/lib/ast \ |
| @@ -56,15 +55,16 @@ |
| gui/toolboxcallbacks.c gui/topviewsettings.c glutrender.c |
| |
| smyrna_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \ |
| - $(top_builddir)/lib/cdt/libcdt_C.la \ |
| + $(top_builddir)/lib/cdt/libcdt.la \ |
| $(top_builddir)/lib/xdot/libxdot_C.la \ |
| $(top_builddir)/lib/glcomp/libglcomp_C.la \ |
| $(top_builddir)/lib/topfish/libtopfish_C.la \ |
| $(top_builddir)/lib/common/libcommon_C.la \ |
| - $(top_builddir)/lib/gvpr/libgvpr_C.la \ |
| + $(top_builddir)/lib/gvpr/libgvpr.la \ |
| $(top_builddir)/lib/expr/libexpr_C.la \ |
| $(top_builddir)/lib/ingraphs/libingraphs_C.la \ |
| $(top_builddir)/lib/neatogen/libneatogen_C.la \ |
| + $(top_builddir)/lib/xdot/libxdot.la \ |
| $(GTK_LIBS) $(GLUT_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(X_LIBS) $(EXPAT_LIBS) $(GTS_LIBS) $(MATH_LIBS) $(EXTRA_SMYRNA_LDFLAGS) |
| |
| smyrna_static_SOURCES = $(smyrna_SOURCES) |
| diff -Naur graphviz-2.44.1.a/cmd/tools/Makefile.am graphviz-2.44.1.b/cmd/tools/Makefile.am |
| --- graphviz-2.44.1.a/cmd/tools/Makefile.am 2020-06-29 10:47:18.000000000 +0200 |
| +++ graphviz-2.44.1.b/cmd/tools/Makefile.am 2020-11-27 01:55:58.656300600 +0100 |
| @@ -187,8 +187,14 @@ |
| gvpack_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=0 |
| |
| gvpack_LDADD = \ |
| - $(top_builddir)/lib/gvc/libgvc.la \ |
| + $(top_builddir)/lib/gvc/libgvc_C.la \ |
| $(top_builddir)/lib/ingraphs/libingraphs_C.la \ |
| + $(top_builddir)/lib/neatogen/libneatogen_C.la \ |
| + $(top_builddir)/lib/sfdpgen/libsfdpgen_C.la \ |
| + $(top_builddir)/lib/ortho/libortho_C.la \ |
| + $(top_builddir)/lib/sparse/libsparse_C.la \ |
| + $(top_builddir)/lib/rbtree/librbtree_C.la \ |
| + $(top_builddir)/lib/vpsc/libvpsc_C.la \ |
| $(top_builddir)/lib/cgraph/libcgraph.la \ |
| $(top_builddir)/lib/cdt/libcdt.la \ |
| $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la |
| @@ -197,12 +203,17 @@ |
| gvpack_static_SOURCES = gvpack.c |
| gvpack_static_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=0 |
| gvpack_static_LDADD = \ |
| - $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout_C.la \ |
| - $(top_builddir)/lib/ingraphs/libingraphs_C.la \ |
| $(top_builddir)/lib/gvc/libgvc_C.la \ |
| - $(top_builddir)/lib/pathplan/libpathplan_C.la \ |
| + $(top_builddir)/lib/ingraphs/libingraphs_C.la \ |
| + $(top_builddir)/lib/neatogen/libneatogen_C.la \ |
| + $(top_builddir)/lib/sfdpgen/libsfdpgen_C.la \ |
| + $(top_builddir)/lib/ortho/libortho_C.la \ |
| + $(top_builddir)/lib/sparse/libsparse_C.la \ |
| + $(top_builddir)/lib/rbtree/librbtree_C.la \ |
| + $(top_builddir)/lib/vpsc/libvpsc_C.la \ |
| $(top_builddir)/lib/cgraph/libcgraph_C.la \ |
| $(top_builddir)/lib/cdt/libcdt_C.la \ |
| + $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout_C.la \ |
| $(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS) |
| endif |
| |
| @@ -221,7 +232,7 @@ |
| $(top_builddir)/lib/common/libcommon_C.la \ |
| $(top_builddir)/lib/gvc/libgvc_C.la \ |
| $(top_builddir)/lib/pathplan/libpathplan_C.la \ |
| - $(top_builddir)/lib/cgraph/libcgraph.la @MATH_LIBS@ |
| + $(top_builddir)/lib/cgraph/libcgraph.la @MATH_LIBS@ @EXPAT_LIBS@ |
| |
| mm2gv.1.pdf: mm2gv.1.ps |
| @PS2PDF@ $< $@ |
| diff -Naur graphviz-2.44.1.a/lib/gvc/Makefile.am graphviz-2.44.1.b/lib/gvc/Makefile.am |
| --- graphviz-2.44.1.a/lib/gvc/Makefile.am 2020-06-29 10:47:18.000000000 +0200 |
| +++ graphviz-2.44.1.b/lib/gvc/Makefile.am 2020-11-26 22:45:46.680974100 +0100 |
| @@ -19,7 +19,7 @@ |
| AM_CPPFLAGS += -O0 |
| endif |
| |
| -LIBS = $(SOCKET_LIBS) $(Z_LIBS) $(MATH_LIBS) |
| +LIBS = $(SOCKET_LIBS) $(Z_LIBS) $(MATH_LIBS) -lregex |
| |
| pkginclude_HEADERS = gvc.h gvcext.h gvplugin.h gvcjob.h \ |
| gvcommon.h gvplugin_render.h gvplugin_layout.h gvconfig.h \ |
| diff -Naur graphviz-2.44.1.a/lib/gvpr/Makefile.am graphviz-2.44.1.b/lib/gvpr/Makefile.am |
| --- graphviz-2.44.1.a/lib/gvpr/Makefile.am 2020-06-29 10:47:18.000000000 +0200 |
| +++ graphviz-2.44.1.b/lib/gvpr/Makefile.am 2020-11-26 22:45:46.680974100 +0100 |
| @@ -52,7 +52,7 @@ |
| libgvpr_la_DEPENDENCIES = $(libgvpr_C_la_DEPENDENCIES) |
| |
| if WITH_WIN32 |
| -libgvpr_la_LDFLAGS += -export-symbols-regex gvpr |
| +libgvpr_la_LDFLAGS += -export-symbols-regex gvpr -lshlwapi |
| endif |
| |
| mkdefs$(EXEEXT): |
| diff -Naur graphviz-2.44.1.a/plugin/dot_layout/Makefile.am graphviz-2.44.1.b/plugin/dot_layout/Makefile.am |
| --- graphviz-2.44.1.a/plugin/dot_layout/Makefile.am 2020-06-29 10:47:18.000000000 +0200 |
| +++ graphviz-2.44.1.b/plugin/dot_layout/Makefile.am 2020-11-26 22:45:46.689028900 +0100 |
| @@ -22,7 +22,8 @@ |
| gvplugin_dot_layout.c \ |
| gvlayout_dot_layout.c |
| libgvplugin_dot_layout_C_la_LIBADD = \ |
| - $(top_builddir)/lib/dotgen/libdotgen_C.la |
| + $(top_builddir)/lib/dotgen/libdotgen_C.la \ |
| + $(top_builddir)/lib/ortho/libortho_C.la |
| |
| libgvplugin_dot_layout_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO) |
| libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES) |
| diff -Naur graphviz-2.44.1.a/plugin/neato_layout/Makefile.am graphviz-2.44.1.b/plugin/neato_layout/Makefile.am |
| --- graphviz-2.44.1.a/plugin/neato_layout/Makefile.am 2020-06-29 10:47:18.000000000 +0200 |
| +++ graphviz-2.44.1.b/plugin/neato_layout/Makefile.am 2020-11-26 22:45:46.691053800 +0100 |
| @@ -27,6 +27,7 @@ |
| $(top_builddir)/lib/patchwork/libpatchwork_C.la \ |
| $(top_builddir)/lib/osage/libosage_C.la \ |
| $(top_builddir)/lib/fdpgen/libfdpgen_C.la \ |
| + $(top_builddir)/lib/ortho/libortho_C.la \ |
| $(top_builddir)/lib/sparse/libsparse_C.la \ |
| $(top_builddir)/lib/rbtree/librbtree_C.la \ |
| $(top_builddir)/lib/circogen/libcircogen_C.la |
| diff -Naur graphviz-2.44.1.a/plugin/webp/Makefile.am graphviz-2.44.1.b/plugin/webp/Makefile.am |
| --- graphviz-2.44.1.a/plugin/webp/Makefile.am 2020-06-29 10:47:18.000000000 +0200 |
| +++ graphviz-2.44.1.b/plugin/webp/Makefile.am 2020-11-26 22:45:46.711157100 +0100 |
| @@ -26,7 +26,8 @@ |
| |
| libgvplugin_webp_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ |
| libgvplugin_webp_la_SOURCES = $(libgvplugin_webp_C_la_SOURCES) |
| -libgvplugin_webp_la_LIBADD = @WEBP_LIBS@ @PANGOCAIRO_LIBS@ |
| +libgvplugin_webp_la_LIBADD = @WEBP_LIBS@ @PANGOCAIRO_LIBS@ \ |
| + $(top_builddir)/lib/gvc/libgvc.la |
| |
| if WITH_WIN32 |
| libgvplugin_webp_la_LDFLAGS += -no-undefined |