From 27d79ab2bcebb634d0b69c851c72283a7514eb0c Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 27 Dec 2005 23:03:15 +0000 Subject: [PATCH] s/XSERVER/KDRIVE/ --- ChangeLog | 3 +++ hw/kdrive/ati/Makefile.am | 2 +- hw/kdrive/chips/Makefile.am | 2 +- hw/kdrive/ephyr/Makefile.am | 2 +- hw/kdrive/epson/Makefile.am | 2 +- hw/kdrive/fake/Makefile.am | 2 +- hw/kdrive/fbdev/Makefile.am | 2 +- 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 | 2 +- hw/kdrive/via/Makefile.am | 2 +- 19 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92484f28b..44cdcacdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ * hw/kdrive/*/Imakefile: Remove Imakefiles. + * hw/kdrive/*/Makefile.am: + s/XSERVER/KDRIVE/ + 2005-12-26 Adam Jackson * os/oscolor.c: diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am index 6420d93b5..186978887 100644 --- a/hw/kdrive/ati/Makefile.am +++ b/hw/kdrive/ati/Makefile.am @@ -64,7 +64,7 @@ ATI_LIBS = \ Xati_LDADD = \ $(ATI_LIBS) \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) diff --git a/hw/kdrive/chips/Makefile.am b/hw/kdrive/chips/Makefile.am index 0585c7b58..210005594 100644 --- a/hw/kdrive/chips/Makefile.am +++ b/hw/kdrive/chips/Makefile.am @@ -26,7 +26,7 @@ CHIPS_LIBS = \ Xchips_LDADD = \ $(CHIPS_LIBS) \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xchips_DEPENDENCIES = $(CHIPS_LIBS) @KDRIVE_LIBS@ diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am index 3a878f8de..1cc5e6872 100644 --- a/hw/kdrive/ephyr/Makefile.am +++ b/hw/kdrive/ephyr/Makefile.am @@ -30,7 +30,7 @@ Xephyr_LDADD = \ libxephyr.a \ libxephyr-hostx.a \ @KDRIVE_LIBS@ \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_LIBS) \ @XEPHYR_LIBS@ diff --git a/hw/kdrive/epson/Makefile.am b/hw/kdrive/epson/Makefile.am index a9b875045..1a2554994 100644 --- a/hw/kdrive/epson/Makefile.am +++ b/hw/kdrive/epson/Makefile.am @@ -26,7 +26,7 @@ EPSON_LIBS = \ Xepson_LDADD = \ $(EPSON_LIBS) \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xepson_DEPENDENCIES = $(EPSON_LIBS) @KDRIVE_LIBS@ diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am index 02b79a961..78b69003a 100644 --- a/hw/kdrive/fake/Makefile.am +++ b/hw/kdrive/fake/Makefile.am @@ -23,7 +23,7 @@ Xfake_SOURCES = \ Xfake_LDADD = \ libfake.a \ @KDRIVE_LIBS@ \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xfake_DEPENDENCIES = \ diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am index fce6df9f4..046836a44 100644 --- a/hw/kdrive/fbdev/Makefile.am +++ b/hw/kdrive/fbdev/Makefile.am @@ -20,7 +20,7 @@ Xfbdev_SOURCES = \ Xfbdev_LDADD = \ libfbdev.a \ @KDRIVE_LIBS@ \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xfbdev_DEPENDENCIES = \ diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am index fdf1a1964..15913e11a 100644 --- a/hw/kdrive/i810/Makefile.am +++ b/hw/kdrive/i810/Makefile.am @@ -28,7 +28,7 @@ I810_LIBS = \ Xi810_LDADD = \ $(I810_LIBS) \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xi810_DEPENDENCIES = $(I810_LIBS) @KDRIVE_LIBS@ diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am index 193bc2544..efe0f74ec 100644 --- a/hw/kdrive/mach64/Makefile.am +++ b/hw/kdrive/mach64/Makefile.am @@ -30,7 +30,7 @@ MACH64_LIBS = \ Xmach64_LDADD = \ $(MACH64_LIBS) \ @KDRIVE_LIBS@ \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am index d236064ba..d084d8824 100644 --- a/hw/kdrive/mga/Makefile.am +++ b/hw/kdrive/mga/Makefile.am @@ -28,7 +28,7 @@ MGA_LIBS = \ Xmga_LDADD = \ $(MGA_LIBS) \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xmga_DEPENDENCIES = $(MGA_LIBS) @KDRIVE_LIBS@ diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am index 21fc62a50..2bc4e9d87 100644 --- a/hw/kdrive/neomagic/Makefile.am +++ b/hw/kdrive/neomagic/Makefile.am @@ -41,7 +41,7 @@ NEOMAGIC_LIBS = \ Xneomagic_LDADD = \ $(NEOMAGIC_LIBS) \ @KDRIVE_LIBS@ \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xneomagic_DEPENDENCIES = $(NEOMAGIC_LIBS) @KDRIVE_LIBS@ diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am index fda904bf2..c2e0fcf7a 100644 --- a/hw/kdrive/nvidia/Makefile.am +++ b/hw/kdrive/nvidia/Makefile.am @@ -30,7 +30,7 @@ NVIDIA_LIBS = \ Xnvidia_LDADD = \ $(NVIDIA_LIBS) \ @KDRIVE_LIBS@ \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xnvidia_DEPENDENCIES = $(NVIDIA_LIBS) @KDRIVE_LIBS@ diff --git a/hw/kdrive/pm2/Makefile.am b/hw/kdrive/pm2/Makefile.am index aca476094..9a03b678b 100644 --- a/hw/kdrive/pm2/Makefile.am +++ b/hw/kdrive/pm2/Makefile.am @@ -27,7 +27,7 @@ PM2_LIBS = \ Xpm2_LDADD = \ $(PM2_LIBS) \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xpm2_DEPENDENCIES = $(PM2_LIBS) @KDRIVE_LIBS@ diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am index aa3ca9bcd..d0596125a 100644 --- a/hw/kdrive/r128/Makefile.am +++ b/hw/kdrive/r128/Makefile.am @@ -26,7 +26,7 @@ R128_LIBS = \ Xr128_LDADD = \ $(R128_LIBS) \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xr128_DEPENDENCIES = $(R128_LIBS) @KDRIVE_LIBS@ diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am index 076f11f0c..b884af042 100644 --- a/hw/kdrive/sdl/Makefile.am +++ b/hw/kdrive/sdl/Makefile.am @@ -12,7 +12,7 @@ endif Xsdl_SOURCES = sdl.c Xsdl_LDADD = @KDRIVE_PURE_LIBS@ \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) \ @XSDL_LIBS@ diff --git a/hw/kdrive/sis300/Makefile.am b/hw/kdrive/sis300/Makefile.am index 7b21757e5..efd1e9ab4 100644 --- a/hw/kdrive/sis300/Makefile.am +++ b/hw/kdrive/sis300/Makefile.am @@ -40,7 +40,7 @@ SIS_LIBS = \ Xsis_LDADD = \ $(SIS_LIBS) \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xsis_DEPENDENCIES = $(SIS_LIBS) @KDRIVE_LIBS@ diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am index d0fe2de21..4790e438e 100644 --- a/hw/kdrive/smi/Makefile.am +++ b/hw/kdrive/smi/Makefile.am @@ -31,7 +31,7 @@ SMI_LIBS = \ Xsmi_LDADD = \ $(SMI_LIBS) \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xsmi_DEPENDENCIES = $(SMI_LIBS) @KDRIVE_LIBS@ diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am index 33683fb94..c82b02cf8 100644 --- a/hw/kdrive/vesa/Makefile.am +++ b/hw/kdrive/vesa/Makefile.am @@ -27,7 +27,7 @@ Xvesa_SOURCES = \ Xvesa_LDADD = \ libvesa.a \ @KDRIVE_LIBS@ \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xvesa_DEPENDENCIES = \ diff --git a/hw/kdrive/via/Makefile.am b/hw/kdrive/via/Makefile.am index 9304c37e8..3c2f45f9d 100644 --- a/hw/kdrive/via/Makefile.am +++ b/hw/kdrive/via/Makefile.am @@ -28,7 +28,7 @@ VIA_LIBS = \ Xvia_LDADD = \ $(VIA_LIBS) \ @KDRIVE_LIBS@ \ - @XSERVER_LIBS@ \ + @KDRIVE_LIBS@ \ $(TSLIB_FLAG) Xvia_DEPENDENCIES = $(VIA_LIBS) @KDRIVE_LIBS@