Move drm up to os-support since the files are shared by multiple platforms.

    Fix the dri and drm build. Fix server-side DMX extension build. Make
    xf4bpp use the correct version of mfbline.c for mfbseg.c. Add #ifndef
    _HEADERNAME_H_/#define _HEADERNAME_H_/.../#endif to the headers.

12 files changed, 67 insertions, 44 deletions

diff --git a/configure.ac b/configure.ac
index dcbcfbf4b..1663ac064 100644
--- a/configure.ac
+++ b/configure.ac
@@ -390,10 +390,11 @@ AC_SUBST([MESA_SOURCE])
 
 AM_CONDITIONAL(DRI, test x$DRI = xyes)
 if test "$DRI" = yes; then
-	AC_DEFINE(XORGDRI,1,[Build DRI extension])
-	AC_DEFINE(_XORGDRI_SERVER_,1,[XORGDRI internal define])
+	AC_DEFINE(XF86DRI,1,[Build DRI extension])
 	PKG_CHECK_MODULES([DRIPROTO], [xf86driproto])
 	AC_SUBST(DRIPROTO_CFLAGS)
+	PKG_CHECK_MODULES([LIBDRM], [libdrm])
+	AC_SUBST(LIBDRM_CFLAGS)
 fi
 AC_DEFINE(XINPUT,1,[Support X Input extension])
 EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.la'
@@ -803,9 +804,9 @@ hw/xfree86/int10/Makefile
 hw/xfree86/loader/Makefile
 hw/xfree86/os-support/Makefile
 hw/xfree86/os-support/bus/Makefile
+hw/xfree86/os-support/drm/Makefile
 hw/xfree86/os-support/misc/Makefile
 hw/xfree86/os-support/linux/Makefile
-hw/xfree86/os-support/linux/drm/Makefile
 hw/xfree86/os-support/solaris/Makefile
 hw/xfree86/parser/Makefile
 hw/xfree86/rac/Makefile
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 9dba2d7c4..d53d28624 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -31,8 +31,8 @@ Xdmx_SOURCES = dmxinit.c \
 	dmxsync.c \
 	dmxextension.c \
 	dmxpict.c \
+	dmx.c \
 	$(top_srcdir)/fb/fbcmap.c \
-	$(top_srcdir)/Xext/dmx.c \
 	$(top_srcdir)/mi/miinitext.c \
 	$(GLX_SRCS) 
 
diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am
index 1dc08064c..9b4cf4e11 100644
--- a/hw/xfree86/dri/Makefile.am
+++ b/hw/xfree86/dri/Makefile.am
@@ -1,5 +1,12 @@
 libdri_la_LTLIBRARIES = libdri.la
-libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/GL/glx/ -I$(top_srcdir)/GL/include -DXF86DRI -DXORG_VERSION_CURRENT=\"100\" @DRIPROTO_CFLAGS@
+libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
+                   -I$(top_srcdir)/hw/xfree86/os-support \
+                   -I$(top_srcdir)/hw/xfree86/os-support/bus \
+                   -I$(top_srcdir)/GL/glx \
+                   -I$(top_srcdir)/GL/include \
+                   -DHAVE_XORG_CONFIG_H \
+                   @DRIPROTO_CFLAGS@ \
+                   @LIBDRM_CFLAGS@
 libdri_la_LDFLAGS = -module -avoid-version
 libdri_ladir = @moduledir@/extensions
 libdri_la_SOURCES = \
diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am
index b55e9786d..b83ae9142 100644
--- a/hw/xfree86/os-support/Makefile.am
+++ b/hw/xfree86/os-support/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = bus @XORG_OS_SUBDIR@ misc
+if DRI
+DRI_SUBDIRS=drm
+endif
+
+SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)
 
 sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h xf86drm.h \
               xf86drmCompat.h assyntax.h xf86OSKbd.h xf86OSmouse.h
diff --git a/hw/xfree86/os-support/drm/Makefile.am b/hw/xfree86/os-support/drm/Makefile.am
new file mode 100644
index 000000000..fde53ecec
--- /dev/null
+++ b/hw/xfree86/os-support/drm/Makefile.am
@@ -0,0 +1,18 @@
+libdrm_la_LTLIBRARIES = libdrm.la
+libdrm_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
+                   -I$(top_srcdir)/hw/xfree86/dri \
+                   -I$(top_srcdir)/hw/xfree86/os-support \
+                   -I$(top_srcdir)/hw/xfree86/os-support/bus \
+                   -I$(top_srcdir)/hw/xfree86/os-suport/shared/drm/kernel \
+                   -I$(top_srcdir)/GL/glx \
+                   -I$(top_srcdir)/GL/include \
+                   -DHAVE_XORG_CONFIG_H \
+                   @LIBDRM_CFLAGS@
+libdrm_la_LDFLAGS = -module -avoid-version
+libdrm_ladir = @moduledir@/@XORG_OS@
+libdrm_la_SOURCES = \
+	xf86drm.c \
+	xf86drmHash.c \
+	xf86drmRandom.c \
+	xf86drmSL.c \
+	drmmodule.c
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
index eca77f123..98dd778f9 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -1,8 +1,3 @@
-if DRI
-DRI_SUBDIRS=drm
-DRI_LIBS=drm/libxorglinuxdrm.a
-endif
-
 noinst_LIBRARIES = liblinux.a
 liblinux_a_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \
                      lnx_pci.c lnx_agp.c lnx_kmod.c lnx_KbdMap.c \
@@ -20,8 +15,6 @@ sdk_HEADERS = agpgart.h
 
 AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
 
-SUBDIRS = $(DRI_SUBDIRS)
-
 INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
 
 EXTRA_DIST = \
diff --git a/hw/xfree86/os-support/linux/drm/Makefile.am b/hw/xfree86/os-support/linux/drm/Makefile.am
deleted file mode 100644
index 3410b5cf3..000000000
--- a/hw/xfree86/os-support/linux/drm/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDES = -I$(srcdir)/../../shared/drm/kernel \
-           -I$(srcdir)/../.. \
-           -I$(srcdir)/../../bus \
-           -I$(srcdir)/../../../dri \
-           -I$(srcdir)/../../../common
-
-sdklibdir = $(libdir)/xorg
-sdklib_LIBRARIES = libxorglinuxdrm.a
-libxorglinuxdrm_a_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c \
-                            xf86drmSL.c drmmodule.c
-
-AM_CFLAGS = $(XORG_CFLAGS)
diff --git a/hw/xfree86/xf4bpp/Makefile.am b/hw/xfree86/xf4bpp/Makefile.am
index fb42b3856..8d4d2f72a 100644
--- a/hw/xfree86/xf4bpp/Makefile.am
+++ b/hw/xfree86/xf4bpp/Makefile.am
@@ -55,7 +55,7 @@ DISTCLEANFILES = mfbseg.c
 
 mfbseg.c:
 	echo "#define POLYSEGMENT" > $@
-	echo "#include \"$(top_srcdir)/mfb/mfbline.c\"" >> $@
+	echo "#include \"$(srcdir)/mfbline.c\"" >> $@
 
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
 
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 5784785ef..6fefe2694 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -1,4 +1,7 @@
-/* include/config.h.in.  Generated from configure.ac by autoheader.  */
+/* dix-config.h.in: not at all generated.                      -*- c -*- */
+
+#ifndef _DIX_CONFIG_H_
+#define _DIX_CONFIG_H_
 
 /* Support BigRequests extension */
 #undef BIGREQS
@@ -342,6 +345,9 @@
 /* Support Xv Extension */
 #undef XV
 
+/* Support DRI support */
+#undef XF86DRI
+
 /* Vendor name */
 #undef XVENDORNAME
 
@@ -365,3 +371,5 @@
 
 /* Build Rootless code */
 #undef ROOTLESS
+
+#endif /* _DIX_CONFIG_H_ */
diff --git a/include/xkb-config.h.in b/include/xkb-config.h.in
index 411bcc4a5..2d6713a5e 100644
--- a/include/xkb-config.h.in
+++ b/include/xkb-config.h.in
@@ -1,10 +1,14 @@
-/*
- * xkb-config.h.in: not at all generated.
+/* xkb-config.h.in: not at all generated.                      -*- c -*-
  * 
  */
 
+#ifndef _XKB_CONFIG_H_
+#define _XKB_CONFIG_H_
+
 /* Default set of XKB rules. */
 #undef __XKBDEFRULES__
 
 /* Path to XKB definitions. */
 #undef XKB_BASE_DIRECTORY
+
+#endif /* _XKB_CONFIG_H_ */
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index f4c25f13a..ebc3d12c8 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -1,14 +1,14 @@
-/*
- * xorg-config.h.in: not at all generated.
+/* xorg-config.h.in: not at all generated.                      -*- c -*-
  * 
- * This file differs from xorg-server.h.in in that -server is installed with the
- * rest of the SDK for external drivers/modules to use, whereas -config is for
- * internal use only (i.e. building the DDX).
+ * This file differs from xorg-server.h.in in that -server is installed
+ * with the rest of the SDK for external drivers/modules to use, whereas
+ * -config is for internal use only (i.e. building the DDX).
  *
  */
 
-/* Normally these are guarded, but if we don't have dix-config.h, we're in some
- * pretty serious trouble anyway.  Consider this a canary. */
+#ifndef _XORG_CONFIG_H_
+#define _XORG_CONFIG_H_
+
 #include <dix-config.h>
 #include <xkb-config.h>
 
@@ -61,11 +61,9 @@
 #undef DEFAULT_LOGPREFIX
 
 /* Building DRI-capable DDX. */
-#undef XORGDRI
-
-/* Building DRI-capable DDX. */
-#undef _XORGDRI_SERVER_
+#undef XF86DRI
 
 /* Solaris 8 or later? */
 #undef __SOL8__
 
+#endif /* _XORG_CONFIG_H_ */
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 7d476d431..6018a9233 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -13,6 +13,9 @@
  * However, it should be kept in sync with this file.
  */
 
+#ifndef _XORG_SERVER_H_
+#define _XORG_SERVER_H_
+
 /* Support BigRequests extension */
 #undef BIGREQS
 
@@ -161,7 +164,7 @@
 #undef XLOADABLE
 
 /* Build DRI extension */
-#undef XORGDRI
+#undef XF86DRI
 
 /* Build Xorg server */
 #undef XORGSERVER
@@ -202,9 +205,6 @@
 /* X/Open-compliant source */
 #undef _XOPEN_SOURCE
 
-/* XORGDRI internal define */
-#undef _XORGDRI_SERVER_
-
 /* Vendor web address for support */
 #undef __VENDORDWEBSUPPORT__
 
@@ -216,3 +216,5 @@
 
 /* Name of X server */
 #undef __XSERVERNAME__
+
+#endif /* _XORG_SERVER_H_ */