From 0635acab08bade9bfd9d2abd3ea5a3fe525bc647 Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Sat, 16 Jul 2005 03:46:01 +0000
Subject: [PATCH] Add record module building support Change module building to
 not use     -include Fix xnest, dmx and vfb builds to -DXFree86Server for
 fbcmap     compilation

---
 hw/dmx/Makefile.am                    |  4 ++-
 hw/vfb/Makefile.am                    |  1 +
 hw/xfree86/dixmods/Makefile.am        | 44 +++++++++++++++++++--------
 hw/xfree86/dixmods/extmod/Makefile.am | 25 ++++++++-------
 hw/xnest/Makefile.am                  |  1 +
 5 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index d53d28624..ecd3383d3 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -49,4 +49,6 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
              config/libdmxconfig.a \
              @DMXMODULES_LIBS@
 
-Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H @DMXMODULES_CFLAGS@ -DXFree86Server
+Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \
+              -DXFree86Server \
+              @DMXMODULES_CFLAGS@
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index 2ea5309fd..2dc8670c6 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -20,4 +20,5 @@ Xvfb_LDFLAGS =
 AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
             -DNO_HW_ONLY_EXTS \
             -DNO_MODULE_EXTS \
+            -DXFree86Server \
             $(XVFBMODULES_CFLAGS)
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index c36b6a6b9..5a4dc6079 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -6,15 +6,29 @@ if GLX
 GLXMODS = libglx.la # libGLcore.la
 endif
 
-module_LTLIBRARIES = \
-        libafb.la libbitmap.la libcfb.la libcfb16.la libcfb24.la libcfb32.la \
-        libdbe.la libfb.la liblayer.la libmfb.la libshadow.la $(GLXMODS)
+module_LTLIBRARIES = libafb.la \
+                     libbitmap.la \
+                     libcfb.la \
+                     libcfb16.la \
+                     libcfb24.la \
+                     libcfb32.la \
+                     libdbe.la \
+                     libfb.la \
+                     liblayer.la \
+                     libmfb.la \
+                     librecord.la \
+                     libshadow.la \
+                     $(GLXMODS)
 
-# yes, this is a cheesy hack.
-AM_CFLAGS = $(XORG_CFLAGS) -include xorg-config.h
-INCLUDES = $(XORG_INCS) -I$(top_srcdir)/afb -I$(top_srcdir)/mfb \
-           -I$(top_srcdir)/cfb -I$(top_srcdir)/dbe -I$(srcdir)/../loader \
-           -I$(top_srcdir)/miext/layer -I$(top_srcdir)/miext/shadow
+AM_CFLAGS = @XORG_CFLAGS@
+INCLUDES = @XORG_INCS@ \
+           -I$(top_srcdir)/afb \
+           -I$(top_srcdir)/cfb \
+           -I$(top_srcdir)/mfb \
+           -I$(top_srcdir)/dbe \
+           -I$(top_srcdir)/hw/xfree86/loader \
+           -I$(top_srcdir)/miext/layer \
+           -I$(top_srcdir)/miext/shadow
 
 libGLcore_la_LDFLAGS = -avoid-version
 libGLcore_la_LIBADD = $(top_srcdir)/GL/mesa/libGLcore.a
@@ -49,6 +63,7 @@ libdbe_la_LDFLAGS = -avoid-version
 libdbe_la_LIBADD = $(top_srcdir)/dbe/libdbe.la
 libdbe_la_SOURCES = dbemodule.c
 
+libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS)
 libfb_la_LDFLAGS = -avoid-version
 libfb_la_LIBADD = $(top_srcdir)/fb/libfb.la
 libfb_la_SOURCES = $(top_srcdir)/fb/fbcmap.c fbmodule.c
@@ -65,15 +80,18 @@ libmfb_la_LDFLAGS = -avoid-version
 libmfb_la_LIBADD = $(top_srcdir)/mfb/libmfb.la
 libmfb_la_SOURCES = mfbmodule.c
 
+librecord_la_LDFLAGS = -avoid-version
+librecord_la_LIBADD = $(top_srcdir)/record/librecord.la
+librecord_la_SOURCES = recordmod.c
+
 libshadow_la_LDFLAGS = -avoid-version
 libshadow_la_LIBADD = $(top_srcdir)/miext/shadow/libshadow.la
 libshadow_la_SOURCES = shmodule.c
 
-libdixmods_la_SOURCES = \
-	xkbKillSrv.c \
-	xkbPrivate.c \
-	xkbVT.c \
-	$(top_srcdir)/mi/miinitext.c
+libdixmods_la_SOURCES = xkbKillSrv.c \
+                        xkbPrivate.c \
+                        xkbVT.c \
+                        $(top_srcdir)/mi/miinitext.c
 
 xkb%.c:
 	echo "#define XF86DDXACTIONS" > $@
diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
index 95fa0505b..aec4cabf2 100644
--- a/hw/xfree86/dixmods/extmod/Makefile.am
+++ b/hw/xfree86/dixmods/extmod/Makefile.am
@@ -7,17 +7,20 @@ if XV
 XV_SRCS = xvmod.c
 endif
 
-# yes, this is a cheesy hack.
-AM_CFLAGS = $(XORG_CFLAGS) -include xorg-config.h
-INCLUDES = $(XORG_INCS) -I$(top_srcdir)/afb -I$(top_srcdir)/mfb \
-           -I$(top_srcdir)/cfb -I$(top_srcdir)/dbe -I$(srcdir)/../loader \
-           -I$(top_srcdir)/miext/layer -I$(top_srcdir)/miext/shadow
+AM_CFLAGS = @XORG_CFLAGS@
+INCLUDES = @XORG_INCS@ \
+           -I$(top_srcdir)/afb \
+           -I$(top_srcdir)/mfb \
+           -I$(top_srcdir)/cfb \
+           -I$(top_srcdir)/dbe \
+           -I$(top_srcdir)/hw/xfree86/loader \
+           -I$(top_srcdir)/miext/layer \
+           -I$(top_srcdir)/miext/shadow
 
 libextmod_la_LDFLAGS = -avoid-version
 libextmod_la_LIBADD = $(top_srcdir)/Xext/libXext.la
-libextmod_la_SOURCES = \
-                        modinit.c \
-                        $(DGA_SRCS) \
-                        xf86misc.c \
-                        xf86vmode.c \
-                        $(XV_SRCS)
+libextmod_la_SOURCES = modinit.c \
+                       $(DGA_SRCS) \
+                       xf86misc.c \
+                       xf86vmode.c \
+                       $(XV_SRCS)
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index 4b037b5ce..0fb415be5 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -52,6 +52,7 @@ Xnest_LDFLAGS =
 
 AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
             -DNO_HW_ONLY_EXTS \
+            -DXFree86Server \
             $(XNESTMODULES_CFLAGS)
 
 EXTRA_DIST = os2Stub.c