diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-08-02 14:27:03 -0400 |
---|---|---|
committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-08-02 14:27:03 -0400 |
commit | e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74 (patch) | |
tree | c9639b11acb0ff6c90d774574b0392d81320e84e /fb/Makefile.am | |
parent | 32c0dcc8c0d1edba5d7e418fd2dc916847a4f069 (diff) | |
parent | f3955c0a020b39021050cd33c20a17f14fc4b579 (diff) |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/devices.c
dix/property.c
include/dix.h
Diffstat (limited to 'fb/Makefile.am')
-rw-r--r-- | fb/Makefile.am | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/fb/Makefile.am b/fb/Makefile.am index 28c0cc703..75861a38d 100644 --- a/fb/Makefile.am +++ b/fb/Makefile.am @@ -1,4 +1,4 @@ -noinst_LTLIBRARIES = libfb.la libwfb.la libfbmmx.la +noinst_LTLIBRARIES = libfb.la libwfb.la INCLUDES = \ -I$(top_srcdir)/hw/xfree86/os-support \ @@ -12,25 +12,8 @@ endif libfb_la_CFLAGS = $(AM_CFLAGS) -if MMX_CAPABLE -libfb_la_CFLAGS += -DUSE_MMX - -libfbmmx_la_CFLAGS = \ - $(DIX_CFLAGS) \ - -DUSE_MMX \ - -mmmx \ - -msse \ - -Winline \ - --param inline-unit-growth=10000 \ - --param large-function-growth=10000 -endif - libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER -libfbmmx_la_SOURCES = \ - fbmmx.c \ - fbmmx.h - libfb_la_SOURCES = \ fb.h \ fb24_32.c \ @@ -73,6 +56,4 @@ libfb_la_SOURCES = \ libwfb_la_SOURCES = $(libfb_la_SOURCES) -libfb_la_LIBADD = libfbmmx.la - EXTRA_DIST = fbcmap.c fbcmap_mi.c |