summaryrefslogtreecommitdiff
path: root/hw/dmx
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-08-31 12:24:07 -0700
committerEric Anholt <eric@anholt.net>2007-08-31 13:09:45 -0700
commita02db0d500cac20d0f0f107d27c064a175018421 (patch)
tree2530044e3e5c99afa615b464c52c8a0e1219a3d9 /hw/dmx
parent3f42af8c0ef1e5379bc836f589e0cbee43c02ac5 (diff)
Convert servers to using _DEPENDENCIES to ensure proper rebuilds.
This cleans up server Makefile.ams a little bit, but also means that people messing with configure.ac need to be careful with whether they put libraries in the _LIBS or _SYS_LIBS targets. Hopefully the comment in configure.ac will clarify the issues.
Diffstat (limited to 'hw/dmx')
-rw-r--r--hw/dmx/Makefile.am15
1 files changed, 9 insertions, 6 deletions
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 002ea112a..8457aea60 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -81,13 +81,16 @@ Xdmx_SOURCES = dmx.c \
#Xdmx_SOURCES += fakecw.c
#endif
+XDMX_LIBS = \
+ @XDMX_LIBS@ \
+ $(GLX_LIBS) \
+ input/libdmxinput.a \
+ config/libdmxconfig.a \
+ $(XSERVER_LIBS)
+
Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-Xdmx_LDADD = $(XORG_CORE_LIBS) \
- $(XDMX_LIBS) \
- $(GLX_LIBS) \
- input/libdmxinput.a \
- config/libdmxconfig.a \
- @DMXMODULES_LIBS@
+Xdmx_DEPENDENCIES= $(XDMX_LIBS)
+Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS)
# Man page
appmandir = $(APP_MAN_DIR)