xserver: Branch 'master'
Daniel Stone
daniels at kemper.freedesktop.org
Tue Aug 29 12:53:57 PDT 2006
hw/kdrive/chips/Makefile.am | 2 +-
hw/kdrive/ephyr/Makefile.am | 4 +---
hw/kdrive/epson/Makefile.am | 2 +-
hw/kdrive/fake/Makefile.am | 4 +---
hw/kdrive/fbdev/Makefile.am | 4 +---
hw/kdrive/i810/Makefile.am | 2 +-
hw/kdrive/mach64/Makefile.am | 2 +-
hw/kdrive/mga/Makefile.am | 2 +-
hw/kdrive/neomagic/Makefile.am | 2 +-
hw/kdrive/nvidia/Makefile.am | 2 +-
hw/kdrive/pm2/Makefile.am | 2 +-
hw/kdrive/r128/Makefile.am | 2 +-
hw/kdrive/sdl/Makefile.am | 2 --
hw/kdrive/sis300/Makefile.am | 2 +-
hw/kdrive/smi/Makefile.am | 2 +-
hw/kdrive/vesa/Makefile.am | 3 +--
hw/kdrive/via/Makefile.am | 2 +-
17 files changed, 16 insertions(+), 25 deletions(-)
New commits:
diff-tree 393dc0a3388d56186181b2bd9bcc1d267747e709 (from cff23616fe45e10c6786a303c8dcfc0a80463a53)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Tue Aug 29 22:53:54 2006 +0300
kdrive: remove @KDRIVE_LIBS@ from Xfoo_DEPENDENCIES
diff --git a/hw/kdrive/chips/Makefile.am b/hw/kdrive/chips/Makefile.am
index e308077..4966fae 100644
--- a/hw/kdrive/chips/Makefile.am
+++ b/hw/kdrive/chips/Makefile.am
@@ -30,4 +30,4 @@ Xchips_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
-Xchips_DEPENDENCIES = $(CHIPS_LIBS) @KDRIVE_LIBS@
+Xchips_DEPENDENCIES = $(CHIPS_LIBS)
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
index f423bfe..1c65944 100644
--- a/hw/kdrive/ephyr/Makefile.am
+++ b/hw/kdrive/ephyr/Makefile.am
@@ -39,6 +39,4 @@ Xephyr_LDADD = \
Xephyr_DEPENDENCIES = \
libxephyr.a \
- libxephyr-hostx.a \
- @KDRIVE_LIBS@ \
- ../../../exa/libexa.la
+ libxephyr-hostx.a
diff --git a/hw/kdrive/epson/Makefile.am b/hw/kdrive/epson/Makefile.am
index 0538f4c..97b0a75 100644
--- a/hw/kdrive/epson/Makefile.am
+++ b/hw/kdrive/epson/Makefile.am
@@ -30,4 +30,4 @@ Xepson_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
-Xepson_DEPENDENCIES = $(EPSON_LIBS) @KDRIVE_LIBS@
+Xepson_DEPENDENCIES = $(EPSON_LIBS)
diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
index f3a6a34..3a53e3d 100644
--- a/hw/kdrive/fake/Makefile.am
+++ b/hw/kdrive/fake/Makefile.am
@@ -28,6 +28,4 @@ Xfake_LDADD = \
@XSERVER_LIBS@
Xfake_DEPENDENCIES = \
- libfake.a \
- @KDRIVE_LIBS@
-
+ libfake.a
diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
index fce6df9..92464f4 100644
--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@@ -24,6 +24,4 @@ Xfbdev_LDADD = \
$(TSLIB_FLAG)
Xfbdev_DEPENDENCIES = \
- libfbdev.a \
- @KDRIVE_LIBS@
-
+ libfbdev.a
diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am
index d676a69..a611829 100644
--- a/hw/kdrive/i810/Makefile.am
+++ b/hw/kdrive/i810/Makefile.am
@@ -32,4 +32,4 @@ Xi810_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
-Xi810_DEPENDENCIES = $(I810_LIBS) @KDRIVE_LIBS@
+Xi810_DEPENDENCIES = $(I810_LIBS)
diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am
index 299565f..e924aef 100644
--- a/hw/kdrive/mach64/Makefile.am
+++ b/hw/kdrive/mach64/Makefile.am
@@ -34,4 +34,4 @@ Xmach64_LDADD = \
$(TSLIB_FLAG)
-Xmach64_DEPENDENCIES = $(MACH64_LIBS) @KDRIVE_LIBS@
+Xmach64_DEPENDENCIES = $(MACH64_LIBS)
diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am
index 64d260e..00b8c56 100644
--- a/hw/kdrive/mga/Makefile.am
+++ b/hw/kdrive/mga/Makefile.am
@@ -32,4 +32,4 @@ Xmga_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
-Xmga_DEPENDENCIES = $(MGA_LIBS) @KDRIVE_LIBS@
+Xmga_DEPENDENCIES = $(MGA_LIBS)
diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am
index b37bfc3..75fd4ed 100644
--- a/hw/kdrive/neomagic/Makefile.am
+++ b/hw/kdrive/neomagic/Makefile.am
@@ -44,4 +44,4 @@ Xneomagic_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
-Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS) @KDRIVE_LIBS@
+Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS)
diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am
index 48551a3..3c31a98 100644
--- a/hw/kdrive/nvidia/Makefile.am
+++ b/hw/kdrive/nvidia/Makefile.am
@@ -33,4 +33,4 @@ Xnvidia_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
-Xnvidia_DEPENDENCIES = $(NVIDIA_LIBS) @KDRIVE_LIBS@
+Xnvidia_DEPENDENCIES = $(NVIDIA_LIBS)
diff --git a/hw/kdrive/pm2/Makefile.am b/hw/kdrive/pm2/Makefile.am
index 1a71207..4c41c65 100644
--- a/hw/kdrive/pm2/Makefile.am
+++ b/hw/kdrive/pm2/Makefile.am
@@ -31,4 +31,4 @@ Xpm2_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
-Xpm2_DEPENDENCIES = $(PM2_LIBS) @KDRIVE_LIBS@
+Xpm2_DEPENDENCIES = $(PM2_LIBS)
diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am
index b33e138..d68e155 100644
--- a/hw/kdrive/r128/Makefile.am
+++ b/hw/kdrive/r128/Makefile.am
@@ -30,4 +30,4 @@ Xr128_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
-Xr128_DEPENDENCIES = $(R128_LIBS) @KDRIVE_LIBS@
+Xr128_DEPENDENCIES = $(R128_LIBS)
diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am
index ba6ed4d..cc3873c 100644
--- a/hw/kdrive/sdl/Makefile.am
+++ b/hw/kdrive/sdl/Makefile.am
@@ -16,5 +16,3 @@ Xsdl_LDADD = @KDRIVE_PURE_LIBS@ \
@XSERVER_LIBS@ \
$(TSLIB_FLAG) \
@XSDL_LIBS@
-
-Xsdl_DEPENDENCIES = @KDRIVE_LIBS@
diff --git a/hw/kdrive/sis300/Makefile.am b/hw/kdrive/sis300/Makefile.am
index efd1e9a..6a6e0bf 100644
--- a/hw/kdrive/sis300/Makefile.am
+++ b/hw/kdrive/sis300/Makefile.am
@@ -43,4 +43,4 @@ Xsis_LDADD = \
@KDRIVE_LIBS@ \
$(TSLIB_FLAG)
-Xsis_DEPENDENCIES = $(SIS_LIBS) @KDRIVE_LIBS@
+Xsis_DEPENDENCIES = $(SIS_LIBS)
diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am
index a214e76..f7f0a66 100644
--- a/hw/kdrive/smi/Makefile.am
+++ b/hw/kdrive/smi/Makefile.am
@@ -35,4 +35,4 @@ Xsmi_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
-Xsmi_DEPENDENCIES = $(SMI_LIBS) @KDRIVE_LIBS@
+Xsmi_DEPENDENCIES = $(SMI_LIBS)
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
index 01bc0a3..c490205 100644
--- a/hw/kdrive/vesa/Makefile.am
+++ b/hw/kdrive/vesa/Makefile.am
@@ -32,5 +32,4 @@ Xvesa_LDADD = \
@XSERVER_LIBS@
Xvesa_DEPENDENCIES = \
- libvesa.a \
- @KDRIVE_LIBS@
+ libvesa.a
diff --git a/hw/kdrive/via/Makefile.am b/hw/kdrive/via/Makefile.am
index 4d52df9..7dcfd7c 100644
--- a/hw/kdrive/via/Makefile.am
+++ b/hw/kdrive/via/Makefile.am
@@ -31,4 +31,4 @@ Xvia_LDADD = \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
-Xvia_DEPENDENCIES = $(VIA_LIBS) @KDRIVE_LIBS@
+Xvia_DEPENDENCIES = $(VIA_LIBS)
More information about the xorg-commit
mailing list