From: John Ellson <ellson@research.att.com>
Date: Thu, 16 Aug 2012 18:06:57 +0000 (-0400)
Subject: make ortho a component of layout engines, not gvc, so that dotlayout has no (well... 
X-Git-Tag: LAST_LIBGRAPH~32^2~338
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fffe0564759194ec64a24a7073e11dd58ec18106;p=graphviz

make ortho a component of layout engines, not gvc, so that dotlayout has no (well less) unresolved symbols
---

diff --git a/lib/dotgen/Makefile.am b/lib/dotgen/Makefile.am
index 4c6474c5b..f0e794295 100644
--- a/lib/dotgen/Makefile.am
+++ b/lib/dotgen/Makefile.am
@@ -29,4 +29,10 @@ libdotgen_C_la_SOURCES = acyclic.c class1.c class2.c cluster.c compound.c \
 	conc.c decomp.c fastgr.c flat.c dotinit.c mincross.c \
 	position.c rank.c sameport.c dotsplines.c aspect.c
 
+if WITH_ORTHO
+libdotgen_C_la_DEPENDENCIES = \
+	 $(top_builddir)/lib/ortho/libortho_C.la
+endif
+
+
 EXTRA_DIST = Makefile.old gvdotgen.vcproj
diff --git a/lib/dotgen2/Makefile.am b/lib/dotgen2/Makefile.am
index b27dac200..933505169 100644
--- a/lib/dotgen2/Makefile.am
+++ b/lib/dotgen2/Makefile.am
@@ -24,4 +24,8 @@ endif
 libdotgen2_C_la_LDFLAGS = -no-undefined
 libdotgen2_C_la_SOURCES = dotinit.c level.c minc2.c ns.c groups.c minc_utils.c decomp.c
 
+if WITH_ORTHO
+libdotgen2_C_la_DEPENDENCIES =  $(top_builddir)/lib/ortho/libortho_C.la
+endif
+
 # EXTRA_DIST = dotgen2.vcproj
diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index b2f88b61c..c35508a2f 100644
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -52,10 +52,6 @@ libgvc_C_la_DEPENDENCIES = \
 	$(top_builddir)/lib/xdot/libxdot_C.la \
 	$(top_builddir)/lib/label/liblabel_C.la \
 	$(top_builddir)/lib/common/libcommon_C.la
-if WITH_ORTHO
-libgvc_C_la_LIBADD += $(top_builddir)/lib/ortho/libortho_C.la
-libgvc_C_la_DEPENDENCIES +=  $(top_builddir)/lib/ortho/libortho_C.la
-endif
 if ENABLE_LTDL
 libgvc_C_la_LIBADD += @LIBLTDL@ $(LIBLTDL_LDFLAGS)
 endif
diff --git a/lib/neatogen/Makefile.am b/lib/neatogen/Makefile.am
index 13a64631f..deead2ce2 100644
--- a/lib/neatogen/Makefile.am
+++ b/lib/neatogen/Makefile.am
@@ -45,4 +45,9 @@ libneatogen_C_la_SOURCES = adjust.c circuit.c edges.c geometry.c \
     overlap.c call_tri.c \
 	compute_hierarchy.c delaunay.c multispline.c $(WITH_IPSEPCOLA_SOURCES)
 
+if WITH_ORTHO
+libneatogen_C_la_DEPENDENCIES = \
+	$(top_builddir)/lib/ortho/libortho_C.la
+endif
+
 EXTRA_DIST = Makefile.old $(IPSEPCOLA_SOURCES) gvneatogen.vcproj
diff --git a/plugin/dot_layout/Makefile.am b/plugin/dot_layout/Makefile.am
index 6def5985f..7d03d722b 100644
--- a/plugin/dot_layout/Makefile.am
+++ b/plugin/dot_layout/Makefile.am
@@ -27,13 +27,9 @@ endif
 libgvplugin_dot_layout_C_la_SOURCES = \
 	gvplugin_dot_layout.c \
 	gvlayout_dot_layout.c
-if WITH_CGRAPH
+
 libgvplugin_dot_layout_C_la_LIBADD = \
 	$(top_builddir)/lib/dotgen/libdotgen_C.la
-else
-libgvplugin_dot_layout_C_la_LIBADD = \
-	$(top_builddir)/lib/dotgen/libdotgen_C.la 
-endif
 
 libgvplugin_dot_layout_la_LDFLAGS = -version-info $(GVPLUGIN_VERSION_INFO)
 libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES)
@@ -43,6 +39,11 @@ libgvplugin_dot_layout_la_LIBADD = $(libgvplugin_dot_layout_C_la_LIBADD) \
 	$(top_builddir)/lib/cdt/libcdt.la \
 	$(top_builddir)/lib/pathplan/libpathplan.la $(MATH_LIBS)
 	
+if WITH_ORTHO
+libgvplugin_dot_layout_la_LIBADD += \
+	$(top_builddir)/lib/ortho/libortho_C.la 
+endif
+
 if WITH_WIN32
 libgvplugin_dot_layout_la_LDFLAGS += -no-undefined
 libgvplugin_dot_layout_la_LIBADD += $(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la
diff --git a/plugin/neato_layout/Makefile.am b/plugin/neato_layout/Makefile.am
index ceb4b522e..2c019c46a 100644
--- a/plugin/neato_layout/Makefile.am
+++ b/plugin/neato_layout/Makefile.am
@@ -46,6 +46,11 @@ libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \
 	$(top_builddir)/lib/pathplan/libpathplan.la \
 	$(GTS_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 	
+if WITH_ORTHO
+libgvplugin_neato_layout_la_LIBADD += \
+	$(top_builddir)/lib/ortho/libortho_C.la 
+endif
+
 if WITH_SFDP
 libgvplugin_neato_layout_C_la_LIBADD += $(top_builddir)/lib/sfdpgen/libsfdpgen_C.la
 endif
diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 7989e0283..cdc7c8588 100644
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -98,12 +98,18 @@ libtcldot_builtin_la_LIBADD = $(TCLHANDLE_LIBS) \
 	$(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(GTS_LIBS)
 
 if WITH_PANGOCAIRO
-libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/pango/libgvplugin_pango_C.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
+libtcldot_builtin_la_LIBADD += \
+	$(top_builddir)/plugin/pango/libgvplugin_pango_C.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
 endif
 
 if WITH_LIBGD
-libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la
-libtcldot_builtin_la_LIBADD += $(GD_LIBS)
+libtcldot_builtin_la_LIBADD += \
+	$(top_builddir)/plugin/gd/libgvplugin_gd_C.la $(GD_LIBS)
+endif
+
+if WITH_ORTHO
+libtcldot_builtin_la_LIBADD += \
+        $(top_builddir)/lib/ortho/libortho_C.la
 endif
 
 libtcldot_builtin_la_LIBADD += $(EXPAT_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)