diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-01 21:12:24 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-01 21:12:24 +0000 |
| commit | 7ecc2d526c4ea5db2589644a2fec0daf71df36da (patch) | |
| tree | daae1e4dabfb070b022ef7565d90a95d1b63ab40 | |
| parent | 6251f9c00a866f64207d23b0a06306ead15298e8 (diff) | |
Remove fbcmap.c hacks from the DIX.
| -rw-r--r-- | fb/Makefile.am | 5 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/Makefile.am | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/fb/Makefile.am b/fb/Makefile.am index ab53dc27e..64bbef2ab 100644 --- a/fb/Makefile.am +++ b/fb/Makefile.am @@ -2,8 +2,6 @@ noinst_LTLIBRARIES = libfb.la sdk_HEADERS = fb.h fbrop.h -AM_CFLAGS = -DXFree86Server -DXFree86Loader - libfb_la_SOURCES = \ fb.h \ fb24_32.c \ @@ -14,7 +12,6 @@ libfb_la_SOURCES = \ fbblt.c \ fbbltone.c \ fbbstore.c \ - fbcmap.c \ fbcompose.c \ fbcopy.c \ fbfill.c \ @@ -48,3 +45,5 @@ libfb_la_SOURCES = \ fbedgeimp.h \ fbmmx.c \ fbmmx.h + +EXTRA_DIST = fbcmap.c diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index bea219e70..361b71a79 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -8,10 +8,13 @@ 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 -libbitmap_la_SOURCES = bitmapmod.c +libbitmap_la_SOURCES = \ + bitmapmod.c libbitmap_la_LDFLAGS = -lXfont -libfb_la_SOURCES = fbmodule.c +libfb_la_SOURCES = \ + $(top_srcdir)/fb/fbcmap.c + fbmodule.c libdixmods_la_SOURCES = \ afbmodule.c \ |