diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2006-07-06 17:05:21 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2006-07-26 15:48:50 -0700 |
| commit | 7608a63ff7409f399c9a26962a304b84196a1868 (patch) | |
| tree | d5656254b294955875419be0d9b76d4feab089ae /hw | |
| parent | 39158e98acb29e97a2682d4a37385f9141b484c4 (diff) | |
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.
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/dixmods/Makefile.am | 6 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/fbmodule.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index 65dad8a86..54bc09948 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -18,6 +18,7 @@ module_LTLIBRARIES = libafb.la \ libcfb.la \ libcfb32.la \ libfb.la \ + libwfb.la \ libmfb.la \ libshadow.la @@ -66,6 +67,11 @@ libfb_la_LIBADD = $(top_builddir)/fb/libfb.la libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS) +libwfb_la_LDFLAGS = -avoid-version +libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la +libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c +libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER + libglx_la_LDFLAGS = -avoid-version if AIGLX GLXDRI_LIBRARY = $(top_builddir)/GL/glx/libglxdri.la diff --git a/hw/xfree86/dixmods/fbmodule.c b/hw/xfree86/dixmods/fbmodule.c index e8e6cd7c6..4df2646dd 100644 --- a/hw/xfree86/dixmods/fbmodule.c +++ b/hw/xfree86/dixmods/fbmodule.c @@ -33,7 +33,11 @@ static XF86ModuleVersionInfo VersRec = { +#ifdef FB_ACCESS_WRAPPER + "wfb", +#else "fb", +#endif MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -45,4 +49,4 @@ static XF86ModuleVersionInfo VersRec = {0,0,0,0} /* signature, to be patched into the file by a tool */ }; -_X_EXPORT XF86ModuleData fbModuleData = { &VersRec, NULL, NULL }; +_X_EXPORT XF86ModuleData FBPREFIX(ModuleData) = { &VersRec, NULL, NULL }; |