summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-10-18 19:14:08 +0000
committerAdam Jackson <ajax@nwnk.net>2005-10-18 19:14:08 +0000
commitdd0d010e9c34278f968be486a6c5c91e021b6609 (patch)
tree1d257f6dda7b0dae3c215f10a5267f1dd4fb8373
parent79e6ac79f983b6cbd88a868dfd2235d9cbe75e8b (diff)
Fix parallel builds my ensuring libdmxconfig builds first.
-rw-r--r--ChangeLog5
-rw-r--r--hw/dmx/config/Makefile.am3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1371cf9fc..12206e79e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-18 Adam Jackson <ajax@freedesktop.org>
+
+ * hw/dmx/config/Makefile.am:
+ Fix parallel builds my ensuring libdmxconfig builds first.
+
2005-10-18 Alan Coopersmith <alan.coopersmith@sun.com>
* hw/xfree86/utils/xorgcfg/Makefile.am:
diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am
index 0f837aa30..e7d08aaa2 100644
--- a/hw/dmx/config/Makefile.am
+++ b/hw/dmx/config/Makefile.am
@@ -29,6 +29,7 @@ AM_CFLAGS = \
bin_PROGRAMS = xdmxconfig vdltodmx dmxtodmx
+xdmxconfig_DEPENDENCIES = libdmxconfig.a
xdmxconfig_SOURCES = \
xdmxconfig.c \
$(top_srcdir)/hw/dmx/dmxlog.c \
@@ -37,9 +38,11 @@ xdmxconfig_SOURCES = \
CanvasP.h
xdmxconfig_LDADD = -L. -ldmxconfig @XDMXCONFIG_DEP_LIBS@
+vdltodmx_DEPENDENCIES = libdmxconfig.a
vdltodmx_SOURCES = vdltodmx.c
vdltodmx_LDADD = -L. -ldmxconfig
+dmxtodmx_DEPENDENCIES = libdmxconfig.a
dmxtodmx_SOURCES = dmxtodmx.c
dmxtodmx_LDADD = -L. -ldmxconfig