diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-04-05 14:41:39 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-04-05 14:41:39 -0400 |
| commit | cf962a849db2b259ca558c6265ea7e3328a4d312 (patch) | |
| tree | 826dcd8d7f7043a8ebc611aebd10978d2550d7f5 /hw/xnest | |
| parent | 5ad562565ac8ef9257da3afb0de1ae4f90f80fe9 (diff) | |
| parent | 5a804f2e97ab59745482660a635b801ac2b9e769 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
configure.ac
Diffstat (limited to 'hw/xnest')
| -rw-r--r-- | hw/xnest/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index b89761651..e958c0eee 100644 --- a/hw/xnest/Makefile.am +++ b/hw/xnest/Makefile.am @@ -45,8 +45,8 @@ SRCS = Args.c \ $(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/mi/miinitext.c -libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap.c -libfbcmap_a_CFLAGS = $(AM_CFLAGS) -DXFree86Server +libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c +libfbcmap_a_CFLAGS = $(AM_CFLAGS) Xnest_SOURCES = $(SRCS) |