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.

6 files changed, 32 insertions, 22 deletions

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