summaryrefslogtreecommitdiff
path: root/hw/vfb
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/vfb
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/vfb')
-rw-r--r--hw/vfb/Makefile.am13
1 files changed, 7 insertions, 6 deletions
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index 6842b45a5..9ceecccc0 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -19,12 +19,13 @@ libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c
Xvfb_SOURCES = $(SRCS)
-Xvfb_LDADD = $(XORG_CORE_LIBS) \
- $(XVFB_LIBS) \
- $(XSERVER_LIBS) \
- $(EXTENSION_LIBS) \
- $(XVFBMODULES_LIBS) \
- libfbcmap.a
+XVFB_LIBS = \
+ @XVFB_LIBS@ \
+ libfbcmap.a \
+ $(XSERVER_LIBS)
+
+Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)
+Xvfb_DEPENDENCIES = $(XVFB_LIBS)
# Man page
include $(top_srcdir)/cpprules.in