summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--hw/xfree86/Makefile.am2
2 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index b4a104a48..6ea1d159c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -530,7 +530,7 @@ PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES])
XSERVER_LIBS="${XSERVER_LIBS} -lm -lz"
XORG_CORE_LIBS="$DIX_LIB"
-XORG_LIBS="$FB_LIB $MI_LIB $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $EXTENSION_LIBS $XPSTUBS_LIB $OS_LIB $SHADOW_LIB"
+XORG_LIBS="$MI_LIB $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $EXTENSION_LIBS $XPSTUBS_LIB $OS_LIB"
XWIN_LIBS="$FB_LIB $MI_LIB $XI_LIB $XKB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $EXTENSION_LIBS $XPSTUBS_LIB $OS_LIB $SHADOW_LIB"
XDMX_LIBS="$OS_LIB $DAMAGE_LIB $MINIMI_LIB $XKB_LIB $XI_LIB $DMX_EXTENSIONS"
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index b45a8685f..af35efe05 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -23,8 +23,6 @@ XORG_LIBS = \
$(OS_LIBS) \
dummylib/libdummy.a \
dixmods/libdixmods.la \
- vgahw/libvgahw.la \
- $(top_builddir)/fb/libfb.la \
@XORG_LIBS@
Xorg_LDADD = $(XORG_LIBS) \