more fixes for --enable-static resulting from ortho move

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index d28f05f146c8933fd87f1c291ab05908df55e115..db6bd7f97261759ae9282fd9c13e123129a943c3 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -92,6 +92,12 @@ dot_static_LDADD = \
        $(top_builddir)/lib/cdt/libcdt_C.la \
                $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS) $(GTS_LIBS) $(EXPAT_LIBS) $(Z_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 
+if WITH_ORTHO
+dot_static_LDADD += \
+        $(top_builddir)/lib/ortho/libortho_C.la
+endif
+
+
 dot_builtins_SOURCES = dot.c dot_builtins.c
 dot_builtins_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
 dot_builtins_LDADD = \

diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index 8d593c100b7b345d70bb443769d972a6d5d5ed1e..f5af19fa249555d6965344d23f133ee730ca55fc 100644 (file)
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -68,15 +68,18 @@ smyrna_LDADD = $(top_builddir)/lib/cgraph/libcgraph.la \
 
 smyrna_static_SOURCES = $(smyrna_SOURCES)
 smyrna_static_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
-               $(top_builddir)/lib/cdt/libcdt_C.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/expr/libexpr_C.la \
+               $(top_builddir)/lib/sfio/libsfio_C.la \
+               $(top_builddir)/lib/ast/libast_C.la \
+               $(top_builddir)/lib/vmalloc/libvmalloc_C.la \
                $(top_builddir)/lib/ingraphs/libingraphs_C.la \
                $(top_builddir)/lib/neatogen/libneatogen_C.la \
+               $(top_builddir)/lib/cdt/libcdt_C.la \
                $(GTK_LIBS) $(GLUT_LIBS) $(GTKGLEXT_LIBS) $(GLADE_LIBS) $(EXPAT_LIBS) $(GTS_LIBS)
 
 smyrna.1.pdf: $(srcdir)/smyrna.1