Add smi server

7 files changed, 58 insertions, 22 deletions

diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
index 27d1ee43f..d9d700af7 100644
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@@ -4,4 +4,5 @@ SUBDIRS =	\
 	vesa	\
 	mach64	\
 	fbdev	\
-	mga
+	mga	\
+	smi
diff --git a/hw/kdrive/smi/Imakefile b/hw/kdrive/smi/Imakefile
deleted file mode 100644
index 930425447..000000000
--- a/hw/kdrive/smi/Imakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/smi/Imakefile,v 1.2 2001/06/16 05:48:48 keithp Exp $
-KDRIVE=..
-#include "../Kdrive.tmpl"
-
-#if BuildXvExt
-XVSRCS=smivideo.c
-XVOBJS=smivideo.o
-#endif
-
-SRCS = 	smi.c smidraw.c smistub.c $(XVSRCS)
-
-OBJS = 	smi.o smidraw.o smistub.o $(XVOBJS)
-
-DEFINES = XvExtensionDefines -DVESA /* -DUSE_PCI*/
-
-INCLUDES = -I. $(KDINCS) -I$(KDRIVE)/vesa
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(smi,$(OBJS))
-DependTarget()
diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am
new file mode 100644
index 000000000..4e1d2ea33
--- /dev/null
+++ b/hw/kdrive/smi/Makefile.am
@@ -0,0 +1,43 @@
+INCLUDES = 					\
+	-I$(top_srcdir)/fb			\
+	-I$(top_srcdir)/hw/kdrive/src		\
+	-I$(top_srcdir)/hw/kdrive/vesa		\
+	-I$(top_srcdir)/mi			\
+	-I$(top_srcdir)/miext/layer		\
+	-I$(top_srcdir)/miext/shadow		\
+	-I$(top_srcdir)/randr			\
+	-I$(top_srcdir)/render			\
+	$(XSERVER_CFLAGS)
+
+bin_PROGRAMS = Xsmi
+
+noinst_LIBRARIES = libsmi.a
+
+#	smivideo.c	# not ready yet
+	
+libsmi_a_SOURCES = 	\
+	smi.c	\
+	smidraw.c
+	
+Xsmi_SOURCES = \
+	smistub.c
+
+Xsmi_LDADD = \
+	$(top_builddir)/hw/kdrive/smi/libsmi.a \
+	$(top_builddir)/hw/kdrive/vesa/libvesa.a \
+	$(top_builddir)/dix/libdix.a		\
+	$(top_builddir)/os/libos.a		\
+	$(top_builddir)/miext/layer/liblayer.a	\
+	$(top_builddir)/hw/kdrive/src/libkdrive.a  \
+	$(top_builddir)/hw/kdrive/linux/liblinux.a  \
+	$(top_builddir)/miext/shadow/libshadow.a \
+	$(top_builddir)/randr/librandr.a	\
+	$(top_builddir)/render/librender.a	\
+	$(top_builddir)/fb/libfb.a		\
+	$(top_builddir)/mi/libmi.a		\
+	$(top_builddir)/Xext/libXext.a		\
+	$(top_builddir)/randr/librandr.a	\
+	$(top_builddir)/render/librender.a	\
+	$(top_builddir)/dix/libxpstubs.a	\
+	$(XSERVER_LIBS)				\
+	-lm -lz
diff --git a/hw/kdrive/smi/smi.c b/hw/kdrive/smi/smi.c
index 1445b7f59..811ae7cc6 100644
--- a/hw/kdrive/smi/smi.c
+++ b/hw/kdrive/smi/smi.c
@@ -21,6 +21,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smi.c,v 1.11 2002/10/18 06:31:17 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "smi.h"
 #include <sys/io.h>
 
diff --git a/hw/kdrive/smi/smidraw.c b/hw/kdrive/smi/smidraw.c
index 445d356b5..62059f898 100644
--- a/hw/kdrive/smi/smidraw.c
+++ b/hw/kdrive/smi/smidraw.c
@@ -23,10 +23,13 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smidraw.c,v 1.7 2001/07/24 19:06:03 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "smi.h"
 #include "smidraw.h"
 
-#include	"Xmd.h"
+#include	<X11/Xmd.h>
 #include	"gcstruct.h"
 #include	"scrnintstr.h"
 #include	"pixmapstr.h"
diff --git a/hw/kdrive/smi/smistub.c b/hw/kdrive/smi/smistub.c
index d43908439..d6433666e 100644
--- a/hw/kdrive/smi/smistub.c
+++ b/hw/kdrive/smi/smistub.c
@@ -24,6 +24,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smistub.c,v 1.4 2002/10/08 21:25:35 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "smi.h"
 
 void
diff --git a/hw/kdrive/smi/smivideo.c b/hw/kdrive/smi/smivideo.c
index 8ff29e67f..2395ebec7 100644
--- a/hw/kdrive/smi/smivideo.c
+++ b/hw/kdrive/smi/smivideo.c
@@ -20,6 +20,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 /* $XFree86: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.10 2003/04/23 21:51:18 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "mach64.h"
 
 #include "Xv.h"