#fix for #1471 and similar potential races

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 8c752bad6b3d1b22555d452872ee5bb35e47b847..a595f3b9eeb83f2b849b8f3dbfb886d365f7ed42 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -45,7 +45,8 @@ libgvc_C_la_SOURCES = gvrender.c gvlayout.c gvdevice.c gvloadimage.c \
        gvtextlayout.c gvusershape.c gvc.c
 libgvc_C_la_LIBADD = $(top_builddir)/lib/common/libcommon_C.la \
        $(top_builddir)/lib/pack/libpack_C.la
-
+libgvc_C_la_DEPENDENCIES = $(top_builddir)/lib/rbtree/librbtree_C.la \
+       $(top_builddir)/lib/pack/libpack_C.la
 #For use with plugins.
 #   so it is linked with an empty table of builtins.
 libgvc_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
@@ -55,6 +56,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) \
        $(top_builddir)/lib/graph/libgraph.la \
        $(top_builddir)/lib/pathplan/libpathplan.la \
        @GTS_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
+libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)
 
 #For use without plugins.
 #  so it needs to be linked with a preset table of builtins, e.g. dot_builtins.c,
@@ -64,6 +66,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) \
 libgvc_builtins_la_LDFLAGS = -version-info @VERSION_INFO@
 libgvc_builtins_la_SOURCES = $(libgvc_C_la_SOURCES)
 libgvc_builtins_la_LIBADD = $(libgvc_la_LIBADD)
+libgvc_builtins_la_DEPENDENCIES = $(libgvc_la_DEPENDENCIES)
 
 gvc.3.pdf: $(srcdir)/gvc.3
        - @GROFF@ -Tps -man $(srcdir)/gvc.3 | @PS2PDF@ - - > gvc.3.pdf

diff --git a/lib/inkpot/Makefile.am b/lib/inkpot/Makefile.am
index e19ac42d8127cd0be771ce755d857d47b07daff5..cdfeaa49849d892cbf90b2347a6c489fc6a39ac8 100644 (file)
--- a/lib/inkpot/Makefile.am
+++ b/lib/inkpot/Makefile.am
@@ -22,9 +22,11 @@ inkpot_LDADD = $(builddir)/libinkpot.la
 
 libinkpot_C_la_SOURCES = inkpot_scheme.c inkpot_value.c inkpot_xlate.c
 libinkpot_C_la_LIBADD = $(top_builddir)/lib/rbtree/librbtree_C.la
+libinkpot_C_la_DEPENDENCIES = $(top_builddir)/lib/rbtree/librbtree_C.la
 
 libinkpot_la_SOURCES = $(libinkpot_C_la_SOURCES)
 libinkpot_la_LIBADD = $(libinkpot_C_la_LIBADD)
+libinkpot_la_DEPENDENCIES = $(libinkpot_C_la_DEPENDENCIES)
 libinkpot_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined 
 
 inkpot_scheme.o inkpot_scheme.lo: inkpot_lib_define.h inkpot_lib_scheme.h