Remove Imakefiles.

16 files changed, 11 insertions, 259 deletions

diff --git a/ChangeLog b/ChangeLog
index 60760cd63..92484f28b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-27  Adam Jackson  <ajax@freedesktop.org>
+
+	* hw/kdrive/Imakefile:
+	* hw/kdrive/*/Imakefile:
+	Remove Imakefiles.
+
 2005-12-26  Adam Jackson  <ajax@freedesktop.org>
 
 	* os/oscolor.c:
@@ -175,6 +181,11 @@
 	* hw/kdrive/vxworks/vxworks.c:
 	Build fixes: XSERVER_LIBS -> KDRIVE_LIBS, config.h -> kdrive-config.h
 
+	* configure.ac:
+	* hw/Makefile.am:
+	* include/kdrive-config.h.in:
+	Skeletal kdrive build system.  Totall non-functional atm.
+
 2005-12-26  Daniel Stone  <daniel@freedesktop.org>
 
 	* xkb/xkbInit.c:
diff --git a/hw/kdrive/Imakefile b/hw/kdrive/Imakefile
deleted file mode 100644
index 2ff182c38..000000000
--- a/hw/kdrive/Imakefile
+++ /dev/null
@@ -1,34 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/Imakefile,v 1.7 2001/05/23 08:56:08 alanh Exp $
-KDRIVE=.
-#include "Kdrive.tmpl"
-
-#if BuildRender
-RENDERSRCS=kpict.c
-RENDEROBJS=kpict.o
-#endif
-
-#if BuildXvExt
-XVSRCS=kxv.c
-XVOBJS=kxv.o 
-#endif
-
-#if XipaqServer
-DEFINES = -DXIPAQ
-#endif
-
-SRCS = kaa.c kcmap.c kcolor.c kdrive.c kinfo.c kinput.c kmap.c knoop.c ktest.c \
-	vga.c kasync.c kmode.c kcurscol.c kshadow.c $(RENDERSRCS) $(XVSRCS)
-
-OBJS = kaa.o kcmap.o kcolor.o kdrive.o kinfo.o kinput.o kmap.o knoop.o ktest.o \
-	vga.o kasync.o kmode.o kcurscol.o kshadow.o $(RENDEROBJS) $(XVOBJS)
-
-INCLUDES = $(KDINCS)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(kdrive,$(OBJS))
-
-SpecialCObjectRule(kdrive,,$(EXT_DEFINES))
-
-InstallManPage(Xkdrive,$(MANDIR))
-DependTarget()
diff --git a/hw/kdrive/fbdev/Imakefile b/hw/kdrive/fbdev/Imakefile
deleted file mode 100644
index 6f9650937..000000000
--- a/hw/kdrive/fbdev/Imakefile
+++ /dev/null
@@ -1,19 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/Imakefile,v 1.4 2001/05/23 08:56:08 alanh Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-#if XipaqServer
-DEFINES = -DXIPAQ
-#endif
-
-SRCS = 	fbdev.c fbinit.c
-
-OBJS = 	fbdev.o fbinit.o
-
-INCLUDES = $(KDINCS) -I.
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(fbdev,$(OBJS))
-InstallManPage(Xfbdev,$(MANDIR))
-DependTarget()
diff --git a/hw/kdrive/i810/Imakefile b/hw/kdrive/i810/Imakefile
deleted file mode 100644
index 32850275d..000000000
--- a/hw/kdrive/i810/Imakefile
+++ /dev/null
@@ -1,21 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/i810/Imakefile,v 1.6 2000/10/20 00:19:51 keithp Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-#if BuildXvExt
-XVSRCS = i810_video.c
-XVOBJS = i810_video.o
-#endif
-
-SRCS = 	i810.c i810stub.c i810draw.c i810_cursor.c $(XVSRCS)
-
-OBJS = 	i810.o i810stub.o i810draw.o i810_cursor.o $(XVOBJS)
-
-DEFINES = XvExtensionDefines /* -DI810CFG_SHOW_OVERSCAN */
-
-INCLUDES = -I. $(KDINCS)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(i810,$(OBJS))
-DependTarget()
diff --git a/hw/kdrive/igs/Imakefile b/hw/kdrive/igs/Imakefile
deleted file mode 100644
index 2214ee5ba..000000000
--- a/hw/kdrive/igs/Imakefile
+++ /dev/null
@@ -1,13 +0,0 @@
-XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/igs/Imakefile,v 1.2 2000/05/24 23:52:47 keithp Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-SRCS = 	igs.c igscmap.c igscurs.c igsdraw.c igsreg.c igsstub.c
-
-OBJS = 	igs.o igscmap.o igscurs.o igsdraw.o igsreg.o igsstub.o
-
-INCLUDES = -I. $(KDINCS)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(igs,$(OBJS))
-DependTarget()
diff --git a/hw/kdrive/ipaq/Imakefile b/hw/kdrive/ipaq/Imakefile
deleted file mode 100644
index 9658ea7e5..000000000
--- a/hw/kdrive/ipaq/Imakefile
+++ /dev/null
@@ -1,13 +0,0 @@
-XCOMM $RCSId: $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-SRCS = 	ipaq.c
-
-OBJS = 	ipaq.o
-
-INCLUDES = -I. $(KDINCS) -I$(KDRIVE)/fbdev -I$(KDRIVE)/pcmcia
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(ipaq,$(OBJS))
-DependTarget()
diff --git a/hw/kdrive/itsy/Imakefile b/hw/kdrive/itsy/Imakefile
deleted file mode 100644
index 1c646af6f..000000000
--- a/hw/kdrive/itsy/Imakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $RCSId: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-SRCS = 	itsy.c ts.c kbd.c
-
-OBJS = 	itsy.o ts.o kbd.o
-
-INCLUDES = -I. $(KDINCS)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(itsy,$(OBJS))
-DependTarget()
diff --git a/hw/kdrive/linux/Imakefile b/hw/kdrive/linux/Imakefile
deleted file mode 100644
index c4fc2642f..000000000
--- a/hw/kdrive/linux/Imakefile
+++ /dev/null
@@ -1,25 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/linux/Imakefile,v 1.8 2001/10/12 06:33:09 keithp Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-#if TouchScreen
-#if HasTsLib
-TSSRCS = tslib.c
-TSOBJS = tslib.o
-#else
-TSSRCS = ts.c
-TSOBJS = ts.o
-#endif
-#endif
-
-SRCS = keyboard.c linux.c mouse.c ps2.c bus.c ms.c agp.c $(TSSRCS)
-
-OBJS = keyboard.o linux.o mouse.o ps2.o bus.o ms.o agp.o $(TSOBJS)
-
-INCLUDES = -I. $(KDINCS)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(linux,$(OBJS))
-
-DependTarget()
diff --git a/hw/kdrive/pcmcia/Imakefile b/hw/kdrive/pcmcia/Imakefile
deleted file mode 100644
index 29da5c418..000000000
--- a/hw/kdrive/pcmcia/Imakefile
+++ /dev/null
@@ -1,13 +0,0 @@
-XCOMM $RCSId: $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-SRCS = 	pcmcia.c pcmciacurs.c pcmciastub.c pcmciashadow.c pcmciarotate.c
-
-OBJS = 	pcmcia.o pcmciacurs.o pcmciastub.o pcmciashadow.o pcmciarotate.o
-
-INCLUDES = -I. $(KDINCS) -I$(KDRIVE)/fbdev
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(pcmcia,$(OBJS))
-DependTarget()
diff --git a/hw/kdrive/savage/Imakefile b/hw/kdrive/savage/Imakefile
deleted file mode 100644
index 4d7577900..000000000
--- a/hw/kdrive/savage/Imakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $RCSId: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-SRCS = 	s3.c s3clock.c s3cmap.c s3curs.c s3draw.c s3gc.c s3reg.c s3stub.c
-
-OBJS = 	s3.o s3clock.o s3cmap.o s3curs.o s3draw.o s3gc.o s3reg.o s3stub.o
-
-INCLUDES = -I. $(KDINCS)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(savage,$(OBJS))
-DependTarget()
diff --git a/hw/kdrive/sis530/Imakefile b/hw/kdrive/sis530/Imakefile
deleted file mode 100644
index 08ac126cc..000000000
--- a/hw/kdrive/sis530/Imakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $RCSId: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-SRCS = 	sis.c sisclock.c siscmap.c siscurs.c sisdraw.c sisio.c sisstub.c
-
-OBJS = 	sis.o sisclock.o siscmap.o siscurs.o sisdraw.o sisio.o sisstub.o
-
-INCLUDES = -I. $(KDINCS)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(sis530,$(OBJS))
-DependTarget()
diff --git a/hw/kdrive/trident/Imakefile b/hw/kdrive/trident/Imakefile
deleted file mode 100644
index 0dff5e91b..000000000
--- a/hw/kdrive/trident/Imakefile
+++ /dev/null
@@ -1,16 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/trident/Imakefile,v 1.5 2000/09/19 23:49:55 keithp Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-SRCS = 	trident.c tridentdraw.c tridentcurs.c tridentstub.c
-
-OBJS = 	trident.o tridentdraw.o tridentcurs.o tridentstub.o
-
-DEFINES = -DVESA /* -DUSE_PCI*/
-
-INCLUDES = -I. $(KDINCS) -I$(KDRIVE)/fbdev -I$(KDRIVE)/vesa
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(trident,$(OBJS))
-DependTarget()
diff --git a/hw/kdrive/trio/Imakefile b/hw/kdrive/trio/Imakefile
deleted file mode 100644
index 1cc1ecaac..000000000
--- a/hw/kdrive/trio/Imakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $RCSId: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-SRCS = 	s3.c s3clock.c s3cmap.c s3curs.c s3draw.c s3gc.c s3stub.c
-
-OBJS = 	s3.o s3clock.o s3cmap.o s3curs.o s3draw.o s3gc.o s3stub.o
-
-INCLUDES = -I. $(KDINCS)
-
-DEFINES = -DS3_TRIO
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(trio,$(OBJS))
-DependTarget()
-
-LinkSourceFile(s3draw.h,../savage)
-LinkSourceFile(s3draw.c,../savage)
-LinkSourceFile(s3gc.c,../savage)
diff --git a/hw/kdrive/ts300/Imakefile b/hw/kdrive/ts300/Imakefile
deleted file mode 100644
index 329b4825b..000000000
--- a/hw/kdrive/ts300/Imakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $
-XCOMM $RCSId: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-SRCS = 	ts300.c
-
-OBJS = 	ts300.o
-
-INCLUDES = -I. $(KDINCS) -I../trio -I../sis530
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(ts300,$(OBJS))
-DependTarget()
diff --git a/hw/kdrive/vesa/Imakefile b/hw/kdrive/vesa/Imakefile
deleted file mode 100644
index 785ef9927..000000000
--- a/hw/kdrive/vesa/Imakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-XCOMM $RCSId: xc/programs/Xserver/hw/kdrive/vesa/Imakefile,v 1.2 2000/09/03 05:11:22 keithp Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-SRCS = 	vesa.c vesainit.c vbe.c vga.c vm86.c
-
-OBJS = 	vesa.o vesainit.o vbe.o vga.o vm86.o
-
-INCLUDES = -I. $(KDINCS)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(vesa,$(OBJS))
-InstallManPage(Xvesa,$(MANDIR))
-DependTarget()
diff --git a/hw/kdrive/vxworks/Imakefile b/hw/kdrive/vxworks/Imakefile
deleted file mode 100644
index fea4f3416..000000000
--- a/hw/kdrive/vxworks/Imakefile
+++ /dev/null
@@ -1,15 +0,0 @@
-XCOMM $RCSId: $
-#include <Server.tmpl>
-
-SRCS = vxworks.c vxkbd.c vxkmouse.c
-
-OBJS = vxworks.o vxkbd.o vxkmouse.o
-
-INCLUDES = -I. -I.. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
-	   -I../../../fb -I../../../mi -I../../../include -I../../../os  \
-           -I$(EXTINCSRC) -I$(XINCLUDESRC)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(vxworks,$(OBJS))
-
-DependTarget()