From a45ed2897d9398221bf008978224205721c7ae2b Mon Sep 17 00:00:00 2001 From: ellson Date: Thu, 28 Jul 2005 22:57:50 +0000 Subject: [PATCH] static builds are really hard to get right !! --- cmd/dot/Makefile.am | 14 ++++++++++---- lib/gvc/Makefile.am | 3 --- lib/gvc/gvplugin.c | 2 +- tclpkg/gv/Makefile.am | 7 ++++++- tclpkg/tcldot/Makefile.am | 3 +++ 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am index d8a811cb0..1645ba490 100644 --- 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 c01b52c8a..9411836da 100644 --- 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 ee3f5970a..93e2b159f 100644 --- 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 1152b9cc9..51fecaacd 100644 --- 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 dcd8938eb..9bac2a428 100644 --- 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 -- 2.40.0