diff options
author | adam <adam> | 2007-01-08 11:29:47 +0000 |
---|---|---|
committer | adam <adam> | 2007-01-08 11:29:47 +0000 |
commit | a27e5deae1d775a3e549b3dce4749fd0dc636502 (patch) | |
tree | b2629479f2c5da28ae897e9e15bc38b7db9616dd | |
parent | a5a5a7bd867bce3640ae7a7f0dd6ab75d2a6a8ca (diff) | |
download | pkgsrc-a27e5deae1d775a3e549b3dce4749fd0dc636502.tar.gz |
Changes 2.12:
- Bug fix release for 2.10
- The gd plugin for font handlers was not being used at all if the build
did not use fontconfig, e.g., on Windows. In addition, the code had
dropped the name mapping to Windows font names.
- PostScript output had an extraneous '%' character on the first line,
which would cause printing to fail.
- Text handling, during both sizing and layout, incorrectly handled
empty lines such as label="\nabc".
- HTML-like tables had been changed to use too much vertical space,
to possibly use the wrong font in calculating the height of a line,
and to use the wrong offset when moving the baseline from one line to
the next.
-rw-r--r-- | graphics/graphviz/Makefile | 40 | ||||
-rw-r--r-- | graphics/graphviz/PLIST | 88 | ||||
-rw-r--r-- | graphics/graphviz/buildlink3.mk | 17 | ||||
-rw-r--r-- | graphics/graphviz/distinfo | 15 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-aa | 22 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ab | 12 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ac | 25 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ae | 28 |
8 files changed, 118 insertions, 129 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index f46348c06c2..a420ff6179c 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.51 2006/05/11 21:51:40 jmc Exp $ +# $NetBSD: Makefile,v 1.52 2007/01/08 11:29:47 adam Exp $ -DISTNAME= graphviz-2.6 -PKGREVISION= 5 +DISTNAME= graphviz-2.12 CATEGORIES= graphics MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ @@ -11,16 +10,28 @@ COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_LANGUAGES= c c++ USE_LIBTOOL= yes -USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config GNU_CONFIGURE= yes -XAW_TYPE= standard +# ltdl enabled makes 'dot' crash +CONFIGURE_ARGS+= --disable-ltdl +CONFIGURE_ARGS+= --without-gtk +CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q} +CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q} +CONFIGURE_ENV+= X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q} +# build fails when PHP and/or Ruby are also installed +CONFIGURE_ENV+= ac_cv_prog_PHP= +CONFIGURE_ENV+= ac_cv_prog_RUBY= +CPPFLAGS+= -DNO_POSTSCRIPT_ALIAS=1 PKGCONFIG_OVERRIDE= lib/agraph/libagraph.pc.in PKGCONFIG_OVERRIDE+= lib/cdt/libcdt.pc.in +PKGCONFIG_OVERRIDE+= lib/expr/libexpr.pc.in PKGCONFIG_OVERRIDE+= lib/graph/libgraph.pc.in PKGCONFIG_OVERRIDE+= lib/gvc/libgvc.pc.in +PKGCONFIG_OVERRIDE+= lib/gvc/libgvc_builtins.pc.in PKGCONFIG_OVERRIDE+= lib/pathplan/libpathplan.pc.in +XAW_TYPE= standard .include "../../mk/bsd.prefs.mk" @@ -29,23 +40,16 @@ PKGCONFIG_OVERRIDE+= lib/pathplan/libpathplan.pc.in BUILDLINK_TRANSFORM+= rm:-Wno-unused-parameter .endif -CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q} -CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q} -CONFIGURE_ENV+= X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q} -# build fails when PHP and/or Ruby are also installed -CONFIGURE_ENV+= ac_cv_prog_PHP= -CONFIGURE_ENV+= ac_cv_prog_RUBY= - -CPPFLAGS+= -DNO_POSTSCRIPT_ALIAS=1 - # prevent another config.status run pre-build: - ${TOUCH} ${WRKSRC}/Makefile + touch ${WRKSRC}/Makefile +.include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/libltdl/buildlink3.mk" -.include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" +.include "../../devel/libltdl/convenience.mk" +.include "../../devel/pango/buildlink3.mk" +.include "../../devel/swig/buildlink3.mk" +.include "../../lang/lua/buildlink3.mk" # The configure script requires gd>=2.0.34, which was never released. # Uncomment the following when graphics/gd is updated to 2.0.34 #.include "../../graphics/gd/buildlink3.mk" diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST index 5005ef2e228..0a7e2d5cdfa 100644 --- a/graphics/graphviz/PLIST +++ b/graphics/graphviz/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2005/10/08 08:11:10 adam Exp $ +@comment $NetBSD: PLIST,v 1.13 2007/01/08 11:29:47 adam Exp $ bin/acyclic bin/bcomps bin/ccomps @@ -6,7 +6,6 @@ bin/circo bin/dijkstra bin/dot bin/dot2gxl -bin/dot_static bin/dotty bin/fdp bin/gc @@ -30,21 +29,12 @@ include/graphviz/arith.h include/graphviz/ast_common.h include/graphviz/cdt.h include/graphviz/color.h +include/graphviz/demand_loading.c +include/graphviz/dot_builtins.c include/graphviz/dthdr.h -include/graphviz/entities.h include/graphviz/exgram.h include/graphviz/exlib.h include/graphviz/expr.h -include/graphviz/gd.h -include/graphviz/gd_io.h -include/graphviz/gdcache.h -include/graphviz/gdfontg.h -include/graphviz/gdfontl.h -include/graphviz/gdfontmb.h -include/graphviz/gdfonts.h -include/graphviz/gdfontt.h -include/graphviz/gdfx.h -include/graphviz/gdhelpers.h include/graphviz/geom.h include/graphviz/globals.h include/graphviz/grammar.h @@ -55,52 +45,65 @@ include/graphviz/gvc.h include/graphviz/gvcext.h include/graphviz/gvcint.h include/graphviz/gvcjob.h +include/graphviz/gvcommon.h include/graphviz/gvplugin.h include/graphviz/gvplugin_device.h include/graphviz/gvplugin_layout.h +include/graphviz/gvplugin_loadimage.h include/graphviz/gvplugin_render.h include/graphviz/gvplugin_textlayout.h -include/graphviz/gvplugin_usershape.h -include/graphviz/jisx0208.h include/graphviz/libgraph.h include/graphviz/logic.h include/graphviz/malloc.h +include/graphviz/no_demand_loading.c include/graphviz/pack.h include/graphviz/parser.h include/graphviz/pathgeom.h include/graphviz/pathplan.h include/graphviz/pathutil.h include/graphviz/solvers.h +include/graphviz/textpara.h include/graphviz/tri.h include/graphviz/triefa.h include/graphviz/types.h +include/graphviz/usershape.h include/graphviz/vis.h include/graphviz/vispath.h include/graphviz/vmstub.h -include/graphviz/wbmp.h -lib/graphviz/config -lib/graphviz/libagraph.la -lib/graphviz/libcdt.la -lib/graphviz/libexpr.la -lib/graphviz/libgdtclft.la -lib/graphviz/libgraph.la -lib/graphviz/libgv_tcl.la -lib/graphviz/libgvc.la -lib/graphviz/libgvc_builtins.la -lib/graphviz/libgvgd.la +lib/graphviz/libgvplugin_core.la lib/graphviz/libgvplugin_dot_layout.la +lib/graphviz/libgvplugin_gd.la lib/graphviz/libgvplugin_neato_layout.la -lib/graphviz/libgvplugin_usershape_gd.la -lib/graphviz/libpack.la -lib/graphviz/libpathplan.la -lib/graphviz/libtcldot.la -lib/graphviz/libtclplan.la -lib/graphviz/libtkspline.la +lib/graphviz/libgvplugin_pango.la +lib/graphviz/libgvplugin_xlib.la +lib/graphviz/lua/gv.so +lib/graphviz/lua/gv_lua.man +lib/graphviz/lua/libgv_lua.la +lib/graphviz/perl/gv.so lib/graphviz/pkgIndex.tcl +lib/graphviz/python/_gv.so +lib/graphviz/ruby/gv.so +lib/graphviz/tcl/gv.so +lib/graphviz/tcl/gv_tcl.man +lib/graphviz/tcl/libgdtclft.la +lib/graphviz/tcl/libgv_tcl.la +lib/graphviz/tcl/libtcldot.la +lib/graphviz/tcl/libtcldot_builtin.la +lib/graphviz/tcl/libtclplan.la +lib/graphviz/tcl/libtkspline.la +lib/libagraph.la +lib/libcdt.la +lib/libexpr.la +lib/libgraph.la +lib/libgvc.la +lib/libgvc_builtins.la +lib/libpathplan.la lib/pkgconfig/libagraph.pc lib/pkgconfig/libcdt.pc +lib/pkgconfig/libexpr.pc lib/pkgconfig/libgraph.pc lib/pkgconfig/libgvc.pc +lib/pkgconfig/libgvc_builtins.pc lib/pkgconfig/libpathplan.pc man/man1/acyclic.1 man/man1/bcomps.1 @@ -129,7 +132,7 @@ man/man3/agraph.3 man/man3/cdt.3 man/man3/expr.3 man/man3/graph.3 -man/man3/pack.3 +man/man3/gvc.3 man/man3/pathplan.3 man/mann/gdtclft.n man/mann/tcldot.n @@ -247,6 +250,8 @@ share/graphviz/doc/html/info/hexagon.gif share/graphviz/doc/html/info/house.gif share/graphviz/doc/html/info/html1.gif share/graphviz/doc/html/info/html2.gif +share/graphviz/doc/html/info/html3.gif +share/graphviz/doc/html/info/html4.gif share/graphviz/doc/html/info/index.html share/graphviz/doc/html/info/invhouse.gif share/graphviz/doc/html/info/invtrapezium.gif @@ -254,6 +259,7 @@ share/graphviz/doc/html/info/invtriangle.gif share/graphviz/doc/html/info/lang.html share/graphviz/doc/html/info/mrecord.gif share/graphviz/doc/html/info/nohead.gif +share/graphviz/doc/html/info/none.gif share/graphviz/doc/html/info/octagon.gif share/graphviz/doc/html/info/output.html share/graphviz/doc/html/info/parallelogram.gif @@ -265,12 +271,15 @@ share/graphviz/doc/html/info/record.gif share/graphviz/doc/html/info/rect.gif share/graphviz/doc/html/info/rectangle.gif share/graphviz/doc/html/info/round.gif +share/graphviz/doc/html/info/sdlshapes.jpg share/graphviz/doc/html/info/septagon.gif share/graphviz/doc/html/info/shapes.html share/graphviz/doc/html/info/trapezium.gif share/graphviz/doc/html/info/triangle.gif share/graphviz/doc/html/info/tripleoctagon.gif +share/graphviz/doc/html/pspdf.png share/graphviz/doc/html/tcldot.html +share/graphviz/doc/html/winbuild.html share/graphviz/doc/latex_suggestions.txt share/graphviz/doc/pdf/acyclic.pdf share/graphviz/doc/pdf/agraph.pdf @@ -289,6 +298,7 @@ share/graphviz/doc/pdf/fdp.pdf share/graphviz/doc/pdf/gc.pdf share/graphviz/doc/pdf/gdtclft.pdf share/graphviz/doc/pdf/graph.pdf +share/graphviz/doc/pdf/gvc.pdf share/graphviz/doc/pdf/gvcolor.pdf share/graphviz/doc/pdf/gvpack.pdf share/graphviz/doc/pdf/gvpr.pdf @@ -299,7 +309,6 @@ share/graphviz/doc/pdf/lneato.pdf share/graphviz/doc/pdf/neato.pdf share/graphviz/doc/pdf/neatoguide.pdf share/graphviz/doc/pdf/nop.pdf -share/graphviz/doc/pdf/pack.pdf share/graphviz/doc/pdf/pathplan.pdf share/graphviz/doc/pdf/prune.pdf share/graphviz/doc/pdf/sccmap.pdf @@ -387,5 +396,16 @@ share/graphviz/lefty/tree.lefty @dirrm share/graphviz/demo/pathplan_data @dirrm share/graphviz/demo @dirrm share/graphviz +@dirrm lib/graphviz/tcl +@dirrm lib/graphviz/sharp +@dirrm lib/graphviz/ruby +@dirrm lib/graphviz/python +@dirrm lib/graphviz/php +@dirrm lib/graphviz/perl +@dirrm lib/graphviz/ocaml +@dirrm lib/graphviz/lua +@dirrm lib/graphviz/java +@dirrm lib/graphviz/io +@dirrm lib/graphviz/guile @dirrm lib/graphviz @dirrm include/graphviz diff --git a/graphics/graphviz/buildlink3.mk b/graphics/graphviz/buildlink3.mk index 9ad123787f0..577cada8c2b 100644 --- a/graphics/graphviz/buildlink3.mk +++ b/graphics/graphviz/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/07/16 15:02:43 seb Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2007/01/08 11:29:47 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GRAPHVIZ_BUILDLINK3_MK:= ${GRAPHVIZ_BUILDLINK3_MK}+ -.if !empty(BUILDLINK_DEPTH:M+) +.if ${BUILDLINK_DEPTH} == "+" BUILDLINK_DEPENDS+= graphviz .endif @@ -11,19 +11,16 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngraphviz} BUILDLINK_PACKAGES+= graphviz BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}graphviz -.if !empty(GRAPHVIZ_BUILDLINK3_MK:M+) +.if ${GRAPHVIZ_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.graphviz+= graphviz>=1.12 BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.6nb5 BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz .endif # GRAPHVIZ_BUILDLINK3_MK -.include "../../devel/libltdl/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" -# The configure script requires gd>=2.0.34, which was never released. -# Uncomment the following when graphics/gd is updated to 2.0.34 -#.include "../../graphics/gd/buildlink3.mk" +.include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/pango/buildlink3.mk" +.include "../../devel/swig/buildlink3.mk" +.include "../../lang/lua/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index b879048001f..97b772e265e 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.19 2006/03/09 17:04:58 minskim Exp $ +$NetBSD: distinfo,v 1.20 2007/01/08 11:29:47 adam Exp $ -SHA1 (graphviz-2.6.tar.gz) = 062897f364c905f33852caff93899df97c817def -RMD160 (graphviz-2.6.tar.gz) = 555c6c635b5271b09ffb7ee142192a1b4ec07919 -Size (graphviz-2.6.tar.gz) = 4109848 bytes -SHA1 (patch-aa) = 814d6b54de2b39a97326d35af15a5155c37cc271 -SHA1 (patch-ab) = 66ad49b481d774bedad0efda65ae2f112b06062a -SHA1 (patch-ac) = adbaa1f265d5a1781574e5c6aad3d35709c3a853 +SHA1 (graphviz-2.12.tar.gz) = aa48a926395a57c6c7e1e755b9432a29461538e3 +RMD160 (graphviz-2.12.tar.gz) = 68d55176cd5ce0e6a25c90b443529747e738d5c6 +Size (graphviz-2.12.tar.gz) = 4607023 bytes +SHA1 (patch-aa) = 7674162928db2e16a724c2b4ecb2bd59a2b7d33c +SHA1 (patch-ab) = 7fd332e66c44b8a384b6dba4eeccdafe3eb0d930 +SHA1 (patch-ac) = e0877aef8259172549e6b69f1478d1ccdef2bb6d SHA1 (patch-ad) = d14bfef61caec543812b9d5ea8d2c331bf350af8 -SHA1 (patch-ae) = 635f583ec7cc83fe8bfef5889876cf14aeb36bf0 diff --git a/graphics/graphviz/patches/patch-aa b/graphics/graphviz/patches/patch-aa index 3a2a2a60086..3c514ca81b3 100644 --- a/graphics/graphviz/patches/patch-aa +++ b/graphics/graphviz/patches/patch-aa @@ -1,8 +1,16 @@ -$NetBSD: patch-aa,v 1.5 2006/02/15 02:53:29 minskim Exp $ +$NetBSD: patch-aa,v 1.6 2007/01/08 11:29:47 adam Exp $ ---- configure.ac.orig 2005-08-28 05:47:29.000000000 -0700 +--- configure.ac.orig 2006-12-04 22:11:58.000000000 +0100 +++ configure.ac -@@ -1265,6 +1265,7 @@ AC_FUNC_ALLOCA +@@ -244,6 +244,7 @@ dnl Checks for header files + # AC_HAVE_HEADERS(string.h) + AC_CHECK_HEADERS(stdarg.h stddef.h stddef.h stdlib.h stdint.h malloc.h \ + search.h getopt.h pthread.h values.h float.h limits.h termios.h \ ++ crt_externs.h \ + errno.h time.h unistd.h fenv.h strings.h inttypes.h \ + sys/time.h sys/times.h sys/types.h sys/select.h fpu_control.h \ + sys/fpu.h strings.h sys/socket.h sys/stat.h sys/mman.h \ +@@ -336,6 +337,7 @@ AC_FUNC_ALLOCA AC_CHECK_FUNCS([lrand48 drand48 srand48 setmode setenv getenv \ __freadable _sysconf getrusage strerror cbrt lsqrt vsnprintf \ @@ -10,11 +18,3 @@ $NetBSD: patch-aa,v 1.5 2006/02/15 02:53:29 minskim Exp $ strtoul strtoll strtoull uname]) AC_REPLACE_FUNCS([strcasecmp strncasecmp]) -@@ -1281,6 +1282,7 @@ dnl ----------------------------------- - # AC_HAVE_HEADERS(string.h) - AC_CHECK_HEADERS(stdarg.h stddef.h stddef.h stdlib.h stdint.h malloc.h \ - search.h getopt.h pthread.h values.h float.h limits.h termios.h \ -+ crt_externs.h \ - errno.h time.h sys/time.h sys/times.h sys/types.h unistd.h fenv.h \ - sys/select.h fpu_control.h sys/fpu.h strings.h sys/socket.h sys/stat.h) - AC_HEADER_TIME diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab index b4513387e53..cb9a0ed8700 100644 --- a/graphics/graphviz/patches/patch-ab +++ b/graphics/graphviz/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.11 2006/02/15 02:53:29 minskim Exp $ +$NetBSD: patch-ab,v 1.12 2007/01/08 11:29:47 adam Exp $ ---- config.h.in.orig 2005-08-28 06:09:52.000000000 -0700 +--- config.h.in.orig 2006-12-04 23:02:31.000000000 +0100 +++ config.h.in -@@ -42,6 +42,9 @@ - /* Define to 1 if you have the `cbrt' function. */ - #undef HAVE_CBRT +@@ -57,6 +57,9 @@ + /* Define to 1 if you have the `dcgettext' function. */ + #undef HAVE_DCGETTEXT +/* Define to 1 if you have the <crt_externs.h> header file. */ +#undef HAVE_CRT_EXTERNS_H @@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.11 2006/02/15 02:53:29 minskim Exp $ /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H -@@ -300,6 +303,9 @@ +@@ -345,6 +348,9 @@ /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac index 3f382b80dd1..7a311eda350 100644 --- a/graphics/graphviz/patches/patch-ac +++ b/graphics/graphviz/patches/patch-ac @@ -1,8 +1,16 @@ -$NetBSD: patch-ac,v 1.15 2006/02/15 02:53:29 minskim Exp $ +$NetBSD: patch-ac,v 1.16 2007/01/08 11:29:47 adam Exp $ ---- configure.orig 2006-02-12 12:13:19.000000000 -0800 +--- configure.orig 2006-12-04 23:02:10.000000000 +0100 +++ configure -@@ -30100,8 +30100,10 @@ fi +@@ -6315,6 +6315,7 @@ fi + + for ac_header in stdarg.h stddef.h stddef.h stdlib.h stdint.h malloc.h \ + search.h getopt.h pthread.h values.h float.h limits.h termios.h \ ++ crt_externs.h \ + errno.h time.h unistd.h fenv.h strings.h inttypes.h \ + sys/time.h sys/times.h sys/types.h sys/select.h fpu_control.h \ + sys/fpu.h strings.h sys/socket.h sys/stat.h sys/mman.h \ +@@ -7974,8 +7975,10 @@ fi @@ -13,14 +21,3 @@ $NetBSD: patch-ac,v 1.15 2006/02/15 02:53:29 minskim Exp $ strtoul strtoll strtoull uname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -@@ -30353,8 +30355,10 @@ done - - - -+ - for ac_header in stdarg.h stddef.h stddef.h stdlib.h stdint.h malloc.h \ - search.h getopt.h pthread.h values.h float.h limits.h termios.h \ -+ crt_externs.h \ - errno.h time.h sys/time.h sys/times.h sys/types.h unistd.h fenv.h \ - sys/select.h fpu_control.h sys/fpu.h strings.h sys/socket.h sys/stat.h - do diff --git a/graphics/graphviz/patches/patch-ae b/graphics/graphviz/patches/patch-ae deleted file mode 100644 index 5a08b872701..00000000000 --- a/graphics/graphviz/patches/patch-ae +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ae,v 1.10 2006/03/09 17:04:58 minskim Exp $ - ---- lib/plugin/Makefile.in.orig 2005-08-28 06:11:26.000000000 -0700 -+++ lib/plugin/Makefile.in -@@ -78,7 +78,10 @@ am_libgvplugin_neato_layout_la_OBJECTS = - gvlayout_neato_layout.lo - libgvplugin_neato_layout_la_OBJECTS = \ - $(am_libgvplugin_neato_layout_la_OBJECTS) --libgvplugin_usershape_gd_la_DEPENDENCIES = -+libgvplugin_usershape_gd_la_DEPENDENCIES = \ -+ $(top_builddir)/lib/cdt/libcdt.la \ -+ $(top_builddir)/lib/graph/libgraph.la \ -+ $(top_builddir)/lib/gvc/libgvc_builtins.la - am_libgvplugin_usershape_gd_la_OBJECTS = gvplugin_usershape_gd.lo \ - gvusershape_gd.lo - libgvplugin_usershape_gd_la_OBJECTS = \ -@@ -399,7 +402,10 @@ libgvplugin_usershape_gd_la_SOURCES = \ - gvplugin_usershape_gd.c \ - gvusershape_gd.c - --libgvplugin_usershape_gd_la_LIBADD = @GD_LIBS@ -+libgvplugin_usershape_gd_la_LIBADD = @GD_LIBS@ \ -+ $(top_builddir)/lib/cdt/libcdt.la \ -+ $(top_builddir)/lib/graph/libgraph.la \ -+ $(top_builddir)/lib/gvc/libgvc_builtins.la - EXTRA_DIST = Makefile.old - all: all-am - |