Don't try to link fb, shadow, or vgahw into the loadable Xorg server, as
they're only supposed to be loadable modules.
This commit is contained in:
parent
2b8e4db9ac
commit
327741486e
|
@ -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'
|
||||
|
|
|
@ -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) \
|
||||
|
|
Loading…
Reference in New Issue
Block a user