static builds are really hard to get right !!

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index d8a811cb0a755cf53579867a95542f72ab26c240..1645ba4902ea504897530794679524c75fb81e42 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -18,7 +18,11 @@ man_MANS = dot.1
 pdf_DATA = dot.pdf
 
 dot_SOURCES = dot.c $(top_srcdir)/lib/gvc/builtins.c
-dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la
+dot_LDADD = \
+       $(top_builddir)/lib/plugin/libgvplugin_dot_layout.la \
+       $(top_builddir)/lib/plugin/libgvplugin_neato_layout.la \
+       $(top_builddir)/lib/plugin/libgvplugin_usershape_gd.la \
+       $(top_builddir)/lib/gvc/libgvc.la
 
 install-data-hook:
        (cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; $(LN_S) dot.1 $$i; done;)
@@ -44,14 +48,16 @@ dot_static: dot.o
        $(top_builddir)/lib/plugin/.libs/libgvplugin_neato_layout.a \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_usershape_gd.a \
        $(top_builddir)/lib/gvc/.libs/libgvc.a \
-       $(top_builddir)/lib/gd/.libs/libgvgd.a \
-       $(top_builddir)/lib/pack/.libs/libpack.a \
        $(top_builddir)/lib/pathplan/.libs/libpathplan.a \
+       $(top_builddir)/lib/pack/.libs/libpack.a \
        $(top_builddir)/lib/graph/.libs/libgraph.a \
        $(top_builddir)/lib/cdt/.libs/libcdt.a \
-       -lfreetype -lfontconfig -lexpat -lpng -ljpeg -lltdl \
+       $(top_builddir)/lib/gd/.libs/libgvgd.a \
+       -lfreetype -lfontconfig -lexpat -lpng -ljpeg -lltdl -lz \
        -o dot_static
 
 EXTRA_DIST = Makefile.old dot.1 dot.pdf 
 
+CLEANFILES = dot_static
+
 DISTCLEANFILES = dot.pdf

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index c01b52c8af0d00cea0aca5d8e737f202d86250fa..9411836da09e58a1a7bf52dbd54468e4959d7186 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -26,9 +26,6 @@ libgvc_la_LIBADD = \
        $(top_builddir)/lib/common/libcommon.la \
        $(top_builddir)/lib/graph/libgraph.la \
        $(top_builddir)/lib/pathplan/libpathplan.la \
-       $(top_builddir)/lib/plugin/libgvplugin_dot_layout.la \
-       $(top_builddir)/lib/plugin/libgvplugin_neato_layout.la \
-       $(top_builddir)/lib/plugin/libgvplugin_usershape_gd.la \
        @GD_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@
 
 EXTRA_DIST = Makefile.old builtins.c

diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c
index ee3f5970a2959f6acab16c2b58c7fd720805c9ae..93e2b159f4ee5763a6a425b2cec5c2319173415e 100644 (file)
--- a/lib/gvc/gvplugin.c
+++ b/lib/gvc/gvplugin.c
@@ -134,7 +134,7 @@ gvplugin_library_t *gvplugin_library_load(char *path)
     }
     hndl = lt_dlopen (p);
     if (!hndl) {
-        agerr(AGERR, "failed to dlopen %s\n", p);
+        agerr(AGWARN, "failed to dlopen %s\n", p);
         return NULL;
     }
 

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 1152b9cc9b767e82ff5992e5ce29d9cf10457c31..51fecaacd7141c23eada76a772cd1640e3447d84 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -11,7 +11,12 @@ AM_CPPFLAGS = \
 LIBS =  @LIBS@ -lc
 
 BASESOURCES = gv.cpp $(top_srcdir)/lib/gvc/builtins.c
-BASELIBS = $(top_builddir)/lib/gvc/libgvc.la
+BASELIBS = \
+       $(top_builddir)/lib/plugin/libgvplugin_dot_layout.la \
+       $(top_builddir)/lib/plugin/libgvplugin_neato_layout.la \
+       $(top_builddir)/lib/plugin/libgvplugin_usershape_gd.la \
+       $(top_builddir)/lib/gvc/libgvc.la
+
 
 #CSHARP_hdr = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs
 #libgv_csharp_la_SOURCES = $(BASESOURCES) gv_csharp.cpp

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index dcd8938eb814866320e2ea6af0619fdd5fcea2ea..9bac2a428df47a2303652e637e63b8b64a1722be 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -36,6 +36,9 @@ libtcldot_la_SOURCES = tcldot.c tkgen.c \
 libtcldot_la_LIBADD = \
        $(top_builddir)/tclpkg/tclhandle/libtclhandle.la \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs.la \
+        $(top_builddir)/lib/plugin/libgvplugin_dot_layout.la \
+        $(top_builddir)/lib/plugin/libgvplugin_neato_layout.la \
+        $(top_builddir)/lib/plugin/libgvplugin_usershape_gd.la \
        $(top_builddir)/lib/gvc/libgvc.la
 
 if WITH_TCL