From: John Ellson <ellson@research.att.com>
Date: Thu, 16 Aug 2012 14:55:13 +0000 (-0400)
Subject: don't link "C" lib to shared lib (ok for bin, not for lib)
X-Git-Tag: LAST_LIBGRAPH~32^2~343
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa8727baf23609d93854f9275883084e5144478b;p=graphviz

don't link "C" lib to shared lib (ok for bin, not for lib)
---

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index c294dcba6..8d593c100 100644
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -55,14 +55,13 @@ smyrna_SOURCES = arcball.c draw.c glexpose.c \
 	gui/glcompui.c gui/gui.c gui/menucallbacks.c \
 	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/xdot/libxdot_C.la \
+smyrna_LDADD = $(top_builddir)/lib/cgraph/libcgraph.la \
+		$(top_builddir)/lib/cdt/libcdt.la \
+		$(top_builddir)/lib/xdot/libxdot.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/expr/libexpr_C.la \
+		$(top_builddir)/lib/gvpr/libgvpr.la \
 		$(top_builddir)/lib/ingraphs/libingraphs_C.la \
 		$(top_builddir)/lib/neatogen/libneatogen_C.la \
 		$(GTK_LIBS) $(GLUT_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(EXPAT_LIBS) $(GTS_LIBS) $(EXTRA_SMYRNA_LDFLAGS)
diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am
index a40a80584..2f1646662 100644
--- a/lib/expr/Makefile.am
+++ b/lib/expr/Makefile.am
@@ -32,10 +32,14 @@ libexpr_C_la_SOURCES = excc.c excontext.c exdata.c exerror.c \
 	exeval.c exexpr.c exlexname.c exopen.c exrewind.c extoken.c \
 	extype.c exzero.c exparse.y exnospace.c exstash.c 
 libexpr_C_la_LIBADD = \
+	$(top_builddir)/lib/ast/libast_C.la \
+	$(top_builddir)/lib/vmalloc/libvmalloc_C.la \
+	$(top_builddir)/lib/sfio/libsfio_C.la
+libexpr_C_la_DEPENDENCIES = \
 	$(top_builddir)/lib/ast/libast_C.la \
 	$(top_builddir)/lib/vmalloc/libvmalloc_C.la \
 	$(top_builddir)/lib/sfio/libsfio_C.la \
-	$(top_builddir)/lib/cdt/libcdt.la
+	$(top_builddir)/lib/cdt/libcdt_C.la
 
 #libexpr_la_LDFLAGS = -version-info $(EXPR_VERSION)
 #libexpr_la_SOURCES = $(libexpr_C_la_SOURCES)
diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am
index edfe22771..693410a67 100644
--- a/lib/gvpr/Makefile.am
+++ b/lib/gvpr/Makefile.am
@@ -31,7 +31,8 @@ $(libgvpr_C_la_OBJECTS): gdefs.h
 libgvpr_C_la_DEPENDENCIES = \
 	$(top_builddir)/lib/expr/libexpr_C.la \
 	$(top_builddir)/lib/common/libcommon_C.la \
-	$(top_builddir)/lib/ingraphs/libingraphs_C.la
+	$(top_builddir)/lib/ingraphs/libingraphs_C.la \
+	$(top_builddir)/lib/cdt/libcdt_C.la
 
 
 libgvpr_la_LDFLAGS = -version-info $(GVPR_VERSION) -no-undefined