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 c294dcba6e5a361a356736db536828985cc80221..8d593c100b7b345d70bb443769d972a6d5d5ed1e 100644 (file)
--- 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 a40a80584806d50b9959d70eac60e97b73ba9bbd..2f16466626b2001e2772c982b2262c2aec4996d8 100644 (file)
--- 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 edfe22771240642322264ac6435680e98626677c..693410a6765bd742e39adfcb333e153c7d2c0879 100644 (file)
--- 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