Add support for building Xdmx and Xvfb

4 files changed, 133 insertions, 46 deletions

diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index b387a9ffe..9dba2d7c4 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = input
+SUBDIRS = input config
 bin_PROGRAMS = Xdmx
 
 if XINERAMA
@@ -30,55 +30,23 @@ Xdmx_SOURCES = dmxinit.c \
 	dmxstat.c \
 	dmxsync.c \
 	dmxextension.c \
-	miinitext.c \
 	dmxpict.c \
-	libc_wrapper.c \
+	$(top_srcdir)/fb/fbcmap.c \
+	$(top_srcdir)/Xext/dmx.c \
+	$(top_srcdir)/mi/miinitext.c \
 	$(GLX_SRCS) 
 
 
-
 #if COMPOSITE
 #Xdmx_SOURCES += fakecw.c
 #endif
 
-miinitext.c: 
-	echo "#include <config.h>" > $@
-	echo "#undef HAVE_CONFIG_H" >> $@
-	echo "#define DMXEXT" >> $@
-	echo "#undef BEZIER " >> $@
-	echo "#undef PEXEXT " >> $@ 
-	echo "#undef MULTIBUFFER  " >> $@
-	echo "#undef XV  " >> $@
-	echo "#undef XIE " >> $@ 
-	echo "#undef DBE " >> $@ 
-	echo "#undef XF86VIDMODE  " >> $@
-	echo "#undef XF86MISC  " >> $@
-	echo "#undef XFreeXDGA " >> $@ 
-	echo "#undef XF86DRI  " >> $@
-	echo "#undef MITSHM  " >> $@
-	echo "#undef TOGCUP  " >> $@
-	echo "#undef DPSEXT  " >> $@
-	echo "#undef MITMISC " >> $@ 
-	echo "#undef SCREENSAVER  " >> $@
-	echo "#undef RANDR  " >> $@
-	echo "#undef XFIXES " >> $@ 
-	echo "#undef DAMAGE " >> $@
-	echo "#undef COMPOSITE " >> $@
-	echo "#undef FONTCACHE " >> $@
-	echo "#undef XFree86LOADER " >> $@
-	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
-
-DISTCLEANFILES = miinitext.c libc_wrapper.c
-
-libc_wrapper.c:
-	echo "#define SELF_CONTAINED_WRAPPER" > $@
-	echo "#include \"$(top_srcdir)/hw/xorg/os-support/shared/libc_wrapper.c\"" >> $@
-	
-
 Xdmx_LDFLAGS = -rdynamic
-Xdmx_LDADD = $(XORG_CORE_LIBS) $(top_srcdir)/hw/xorg/os-support/@XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.a  \
-	$(XDMX_LIBS) $(GLX_LIBS) $(top_srcdir)/miext/shadow/.libs/libshadow.a $(top_srcdir)/fb/.libs/libfb.a  \
-	$(top_srcdir)/hw/xorg/dummylib/libdummy.a  input/libdmxinput.a \
-	config/libdmxconfig.a -lfl $(XDMCP_LIBS) @DMXMODULES_LIBS@  -lXi
-
-Xdmx_CFLAGS = @DMXMODULES_CFLAGS@
+Xdmx_LDADD = $(XORG_CORE_LIBS) \
+             $(XDMX_LIBS) \
+             $(GLX_LIBS) \
+             input/libdmxinput.a \
+             config/libdmxconfig.a \
+             @DMXMODULES_LIBS@
+
+Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H @DMXMODULES_CFLAGS@ -DXFree86Server
diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am
new file mode 100644
index 000000000..2e8d756fd
--- /dev/null
+++ b/hw/dmx/config/Makefile.am
@@ -0,0 +1,13 @@
+noinst_LIBRARIES = libdmxconfig.a
+
+LIBSRCS = parser.y scanner.l dmxparse.c dmxprint.c dmxcompat.c dmxconfig.c
+
+parser.h: parser.c
+scanner.c: scanner.l parser.h
+
+CLEANFILES = parser.c parser.h scanner.c
+
+libdmxconfig_a_SOURCES = $(LIBSRCS)
+
+AM_CFLAGS = -I.. -DHAVE_DMX_CONFIG_H @DMXMODULES_CFLAGS@
+AM_YFLAGS = -d
diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h
new file mode 100644
index 000000000..11e8fb8e5
--- /dev/null
+++ b/hw/dmx/dmx-config.h
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kem@redhat.com>
+ *
+ */
+
+/** \file
+ * Provide configuration #define's and #undef's to build Xdmx in X.Org's
+ * modular source tree.
+ */
+
+#ifndef DMX_CONFIG_H
+#define DMX_CONFIG_H
+
+#include <dix-config.h>
+
+/*
+ * Note 1: This is a signed int that is printed as a decimal number.
+ *         Since we want to make it human-interpretable, the fields are
+ *         defined as:
+ *         2147483648
+ *         AAbbyymmdd
+ *         AA: major version 01-20
+ *         bb: minor version 00-99
+ *         yy: year          00-99 [See Note 2]
+ *         mm: month         01-12
+ *         dd: day           01-31
+ *
+ * Note 2: The default epoch for the year is 2000.
+ *         To change the default epoch, change the DMX_VENDOR_RELEASE
+ *         macro below, bumb the minor version number, and change
+ *         xdpyinfo to key off the major/minor version to determine the
+ *         new epoch.  Remember to do this on January 1, 2100 and every
+ *         100 years thereafter.
+ */
+#define DMX_VENDOR_RELEASE(major,minor,year,month,day) \
+    ((major)     * 100000000) + \
+    ((minor)     *   1000000) + \
+    ((year-2000) *     10000) + \
+    ((month)     *       100) + \
+    ((day)       *         1)
+#define VENDOR_RELEASE  DMX_VENDOR_RELEASE(1,2,2004,6,30)
+#define VENDOR_STRING   "DMX Project"
+
+/* Enable the DMX extension */
+#define DMXEXT
+
+/* Disable the extensions that are not currently supported */
+#undef BEZIER
+#undef PEXEXT
+#undef MULTIBUFFER
+#undef XV
+#undef XIE
+#undef DBE
+#undef XF86VIDMODE
+#undef XF86MISC
+#undef XFreeXDGA
+#undef XF86DRI
+#undef MITSHM
+#undef TOGCUP
+#undef DPSEXT
+#undef MITMISC
+#undef SCREENSAVER
+#undef RANDR
+#undef XFIXES
+#undef DAMAGE
+#undef COMPOSITE
+#undef FONTCACHE
+#undef XFree86LOADER
+
+#endif /* DMX_CONFIG_H */
diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am
index 7ba10ce44..eb94ac174 100644
--- a/hw/dmx/input/Makefile.am
+++ b/hw/dmx/input/Makefile.am
@@ -7,5 +7,13 @@ DMXSRCS = dmxinputinit.c dmxarg.c dmxsigio.c dmxevents.c \
 	  dmxxinput.c dmxmotion.c dmxeq.c dmxmap.c
 
 
-libdmxinput_a_SOURCES = ChkNotMaskEv.c $(RAWSRCS) $(USBSRCS) $(DRVSRCS) $(DMXSRCS) $(LIBSRCS)
-AM_CFLAGS = -I..
+libdmxinput_a_SOURCES = ChkNotMaskEv.c \
+                        $(RAWSRCS) \
+                        $(USBSRCS) \
+                        $(DRVSRCS) \
+                        $(DMXSRCS) \
+                        $(LIBSRCS)
+
+AM_CFLAGS = -I.. -I../../xfree86/common \
+            -DHAVE_DMX_CONFIG_H \
+            @DMXMODULES_CFLAGS@