summaryrefslogtreecommitdiff
path: root/cfb
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-01-06 23:06:15 +0000
committerAdam Jackson <ajax@nwnk.net>2006-01-06 23:06:15 +0000
commit13c9e0c094c4e34cd1e43a7cc08b2dca39a32412 (patch)
tree020691234ce7de60ba19084616ab7362d944be0a /cfb
parentfe0c838b5d8bc8d9cf5a686bb7d3e90682d2d19a (diff)
Bug #5525: Build a working Xprt. (Drew Parsons)
Diffstat (limited to 'cfb')
-rw-r--r--cfb/Makefile.am2
-rw-r--r--cfb/Makefile.am.inc13
2 files changed, 14 insertions, 1 deletions
diff --git a/cfb/Makefile.am b/cfb/Makefile.am
index 1f5687469..54064c395 100644
--- a/cfb/Makefile.am
+++ b/cfb/Makefile.am
@@ -9,7 +9,7 @@ libcfb_la_SOURCES = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c \
libcfb_la_LIBADD = ../mfb/libmfb.la
-AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
diff --git a/cfb/Makefile.am.inc b/cfb/Makefile.am.inc
index f28816dd5..e1ef67227 100644
--- a/cfb/Makefile.am.inc
+++ b/cfb/Makefile.am.inc
@@ -138,3 +138,16 @@ cfbply1rctG.c:
cfbglrop8.c:
echo "#define GLYPHROP" > $@
echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@
+
+
+if XPRINT
+
+PLATFORMDEFS = -DXFREE86
+
+cfbmskbits.h: compiler.h
+
+compiler.h:
+ echo "#include \"$(top_srcdir)/hw/xfree86/common/compiler.h\"" >> $@
+
+endif
+