Kdrive: unbreak kdrive linking
* configure.ac: re-sort Kdrive libs so that symbols get properly resolved. Basically, all some libs are present in both $KDRIVE_LIBS and $XSERVER_LIBS, and some libs orders are not correct. So I made sure Kdrive servers don't have to link against $KDRIVE_LIBS *and* $XSERVER_LIBS. They just have to link against $KDRIVE_LIBS now. * hw/kdrive/*/Makefile.am: update those makefile to reflect the change in configure.ac
This commit is contained in:
parent
28e48cd8e6
commit
6c89d1237c
|
@ -1868,7 +1868,7 @@ if test "$KDRIVE" = yes; then
|
|||
|
||||
KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
|
||||
|
||||
KDRIVE_PURE_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
|
||||
KDRIVE_PURE_LIBS="$FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
|
||||
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
|
||||
case $host_os in
|
||||
*linux*)
|
||||
|
@ -1877,8 +1877,10 @@ if test "$KDRIVE" = yes; then
|
|||
;;
|
||||
esac
|
||||
KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
|
||||
KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $TSLIB_LIBS $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
|
||||
KDRIVE_LIBS="$XSERVERLIBS_LIBS $KDRIVE_LOCAL_LIBS"
|
||||
KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
|
||||
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
|
||||
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
|
||||
KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVERLIBS_LIBS"
|
||||
|
||||
# check if we can build Xephyr
|
||||
PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
|
||||
|
|
|
@ -60,8 +60,7 @@ ATI_LIBS = \
|
|||
|
||||
Xati_LDADD = \
|
||||
$(ATI_LIBS) \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xati_DEPENDENCIES = \
|
||||
libati.a \
|
||||
|
|
|
@ -22,8 +22,7 @@ CHIPS_LIBS = \
|
|||
|
||||
Xchips_LDADD = \
|
||||
$(CHIPS_LIBS) \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xchips_DEPENDENCIES = \
|
||||
libchips.a \
|
||||
|
|
|
@ -22,8 +22,7 @@ EPSON_LIBS = \
|
|||
|
||||
Xepson_LDADD = \
|
||||
$(EPSON_LIBS) \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xepson_DEPENDENCIES = \
|
||||
libepson.a \
|
||||
|
|
|
@ -16,8 +16,7 @@ Xfbdev_SOURCES = \
|
|||
|
||||
Xfbdev_LDADD = \
|
||||
libfbdev.a \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xfbdev_DEPENDENCIES = \
|
||||
libfbdev.a \
|
||||
|
|
|
@ -25,8 +25,7 @@ I810_LIBS = \
|
|||
|
||||
Xi810_LDADD = \
|
||||
$(I810_LIBS) \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xi810_DEPENDENCIES = \
|
||||
libi810.a \
|
||||
|
|
|
@ -29,8 +29,7 @@ MACH64_LIBS = \
|
|||
|
||||
Xmach64_LDADD = \
|
||||
$(MACH64_LIBS) \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xmach64_DEPENDENCIES = \
|
||||
libmach64.a \
|
||||
|
|
|
@ -24,8 +24,7 @@ MGA_LIBS = \
|
|||
|
||||
Xmga_LDADD = \
|
||||
$(MGA_LIBS) \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xmga_DEPENDENCIES = \
|
||||
libmga.a \
|
||||
|
|
|
@ -25,8 +25,7 @@ NVIDIA_LIBS = \
|
|||
|
||||
Xnvidia_LDADD = \
|
||||
$(NVIDIA_LIBS) \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xnvidia_DEPENDENCIES = \
|
||||
libnvidia.a \
|
||||
|
|
|
@ -23,8 +23,7 @@ PM2_LIBS = \
|
|||
|
||||
Xpm2_LDADD = \
|
||||
$(PM2_LIBS) \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xpm2_DEPENDENCIES = \
|
||||
libpm2.a \
|
||||
|
|
|
@ -22,8 +22,7 @@ R128_LIBS = \
|
|||
|
||||
Xr128_LDADD = \
|
||||
$(R128_LIBS) \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xr128_DEPENDENCIES = \
|
||||
libr128.a \
|
||||
|
|
|
@ -7,9 +7,8 @@ bin_PROGRAMS = Xsdl
|
|||
|
||||
Xsdl_SOURCES = sdl.c
|
||||
|
||||
Xsdl_LDADD = @KDRIVE_PURE_LIBS@ \
|
||||
Xsdl_LDADD = \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@ \
|
||||
@XSDL_LIBS@
|
||||
|
||||
Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
|
||||
|
|
|
@ -27,8 +27,7 @@ SMI_LIBS = \
|
|||
|
||||
Xsmi_LDADD = \
|
||||
$(SMI_LIBS) \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xsmi_DEPENDENCIES = \
|
||||
libsmi.a \
|
||||
|
|
|
@ -21,8 +21,7 @@ Xvesa_SOURCES = \
|
|||
|
||||
Xvesa_LDADD = \
|
||||
libvesa.a \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xvesa_DEPENDENCIES = \
|
||||
libvesa.a \
|
||||
|
|
|
@ -23,8 +23,7 @@ VIA_LIBS = \
|
|||
|
||||
Xvia_LDADD = \
|
||||
$(VIA_LIBS) \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@
|
||||
@KDRIVE_LIBS@
|
||||
|
||||
Xvia_DEPENDENCIES = \
|
||||
libvia.a \
|
||||
|
|
Loading…
Reference in New Issue