From 7608a63ff7409f399c9a26962a304b84196a1868 Mon Sep 17 00:00:00 2001
From: Aaron Plattner <aplattner@nvidia.com>
Date: Thu, 6 Jul 2006 17:05:21 -0700
Subject: Build infrastructure for libwfb.so.

Builds fb/* twice, defining FB_ACCESS_WRAPPER for libwfb.la.  Define a macro,
FBPREFIX(X) which expands to fbX for libfb.la and wfbX for libwfb.la.  Use the
macro on [w]fbModuleData so the new module loads.
---
 fb/Makefile.am | 8 ++++++--
 fb/fb.h        | 6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'fb')

diff --git a/fb/Makefile.am b/fb/Makefile.am
index 11b2d2fea..251c1687b 100644
--- a/fb/Makefile.am
+++ b/fb/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libfb.la libfbmmx.la
+noinst_LTLIBRARIES = libfb.la libwfb.la libfbmmx.la
 
 INCLUDES = \
 	-I$(top_srcdir)/hw/xfree86/os-support \
@@ -11,7 +11,7 @@ sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h
 endif
 
 if MMX_CAPABLE
-AM_CFLAGS += -DUSE_MMX
+libfb_la_CFLAGS = $(AM_CFLAGS) -DUSE_MMX
 
 libfbmmx_la_CFLAGS =				\
 	$(DIX_CFLAGS)				\
@@ -23,6 +23,8 @@ libfbmmx_la_CFLAGS =				\
         --param large-function-growth=10000
 endif
 
+libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
+
 libfbmmx_la_SOURCES =	\
 	fbmmx.c		\
 	fbmmx.h
@@ -70,6 +72,8 @@ libfb_la_SOURCES = 	\
 	fbedge.c	\
 	fbedgeimp.h
 
+libwfb_la_SOURCES = $(libfb_la_SOURCES)
+
 libfb_la_LIBADD = libfbmmx.la
 
 EXTRA_DIST = fbcmap.c
diff --git a/fb/fb.h b/fb/fb.h
index 3742cf01a..13d01218e 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -44,6 +44,12 @@
 #include "picture.h"
 #endif
 
+#ifdef FB_ACCESS_WRAPPER
+#define FBPREFIX(x) wfb##x
+#else
+#define FBPREFIX(x) fb##x
+#endif
+
 /*
  * This single define controls the basic size of data manipulated
  * by this software; it must be log2(sizeof (FbBits) * 8)
-- 
cgit v1.2.3