Add support for Xnest

5 files changed, 112 insertions, 4 deletions

diff --git a/hw/Makefile.am b/hw/Makefile.am
index a015b93db..e2681953c 100644
--- a/hw/Makefile.am
+++ b/hw/Makefile.am
@@ -3,11 +3,15 @@ DMX_SUBDIRS = dmx
 endif
 
 if XORG
-XORG_SUBDIRS = xfree86 
+XORG_SUBDIRS = xfree86
 endif
 
 if XVFB
-XVFB_SUBDIRS = vfb 
+XVFB_SUBDIRS = vfb
+endif
+
+if XNEST
+XNEST_SUBDIRS = xnest
 endif
 
 if XWIN
@@ -18,4 +22,5 @@ SUBDIRS =			\
 	$(XORG_SUBDIRS)		\
 	$(XWIN_SUBDIRS)		\
 	$(XVFB_SUBDIRS)		\
+	$(XNEST_SUBDIRS)	\
 	$(DMX_SUBDIRS)
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index e9d21762c..342d8a094 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -1,6 +1,10 @@
+if DRI
+DRI_SUBDIR = dri
+endif
+
 SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
           ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
-	  xf8_32wid loader scanpci dixmods dri
+	  xf8_32wid loader scanpci dixmods $(DRI_SUBDIR)
 
 bin_PROGRAMS = Xorg
 
diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am
index cdc1c8bf1..95fcfebab 100644
--- a/hw/xfree86/dri/Makefile.am
+++ b/hw/xfree86/dri/Makefile.am
@@ -10,4 +10,4 @@ libdri_la_SOURCES = \
 	sarea.h \
 	xf86dri.c
 
-sdk_HEADERS = dri.h sarea.h dristruct.h  xf86dri.h
+sdk_HEADERS = dri.h sarea.h dristruct.h
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
new file mode 100644
index 000000000..4b037b5ce
--- /dev/null
+++ b/hw/xnest/Makefile.am
@@ -0,0 +1,62 @@
+bin_PROGRAMS = Xnest
+
+SRCS =	Args.c \
+	Args.h \
+	Color.c \
+	Color.h \
+	Cursor.c \
+	Display.c \
+	Display.h \
+	Drawable.h \
+	Events.c \
+	Events.h \
+	Font.c \
+	GC.c \
+	GCOps.c \
+	GCOps.h \
+	GetTime.c \
+	Handlers.c \
+	Handlers.h \
+	Init.c \
+	Init.h \
+	Keyboard.c \
+	Keyboard.h \
+	Pixmap.c \
+	Pointer.c \
+	Pointer.h \
+	Screen.c \
+	Screen.h \
+	TestExt.c \
+	Visual.c \
+	Visual.h \
+	Window.c \
+	XNCursor.h \
+	Xnest.h \
+	XNFont.h \
+	XNGC.h \
+	XNPixmap.h \
+	XNWindow.h \
+	$(top_srcdir)/Xext/dpmsstubs.c \
+	$(top_srcdir)/Xi/stubs.c \
+	$(top_srcdir)/mi/miinitext.c \
+	$(top_srcdir)/fb/fbcmap.c
+
+
+Xnest_SOURCES = $(SRCS)
+
+Xnest_LDADD = $(XORG_CORE_LIBS) \
+              $(XNEST_LIBS) \
+              $(XNESTMODULES_LIBS)
+
+Xnest_LDFLAGS =
+
+AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
+            -DNO_HW_ONLY_EXTS \
+            $(XNESTMODULES_CFLAGS)
+
+EXTRA_DIST = os2Stub.c
+
+# -UDPMSExtension for miinitext? can't put into 
+# OS_DEFINES???
+# EXT_DEFINES???
+# ICONFIGFILES -- SpecialCObjectRule
diff --git a/hw/xnest/xnest-config.h b/hw/xnest/xnest-config.h
new file mode 100644
index 000000000..8b477767a
--- /dev/null
+++ b/hw/xnest/xnest-config.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2005 Red Hat Inc., Raleigh, North Carolina.
+ *
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation on the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef XNEST_CONFIG_H
+#define XNEST_CONFIG_H
+
+#include <dix-config.h>
+#include <xkb-config.h>
+
+#undef MITSHM
+#undef XFree86LOADER
+
+#endif /* XNEST_CONFIG_H */