frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Dodji Seketeli 2007-09-05 17:46:49 +02:00
parent 28e48cd8e6
commit 6c89d1237c
15 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -1868,7 +1868,7 @@ if test "$KDRIVE" = yes; then
KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS" 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' KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
case $host_os in case $host_os in
*linux*) *linux*)
@ -1877,8 +1877,10 @@ if test "$KDRIVE" = yes; then
;; ;;
esac esac
KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' 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_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
KDRIVE_LIBS="$XSERVERLIBS_LIBS $KDRIVE_LOCAL_LIBS" 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 # check if we can build Xephyr
PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])

3
hw/kdrive/ati/Makefile.am
View File

@ -60,8 +60,7 @@ ATI_LIBS = \
Xati_LDADD = \ Xati_LDADD = \
$(ATI_LIBS) \ $(ATI_LIBS) \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xati_DEPENDENCIES = \ Xati_DEPENDENCIES = \
libati.a \ libati.a \

3
hw/kdrive/chips/Makefile.am
View File

@ -22,8 +22,7 @@ CHIPS_LIBS = \
Xchips_LDADD = \ Xchips_LDADD = \
$(CHIPS_LIBS) \ $(CHIPS_LIBS) \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xchips_DEPENDENCIES = \ Xchips_DEPENDENCIES = \
libchips.a \ libchips.a \

3
hw/kdrive/epson/Makefile.am
View File

@ -22,8 +22,7 @@ EPSON_LIBS = \
Xepson_LDADD = \ Xepson_LDADD = \
$(EPSON_LIBS) \ $(EPSON_LIBS) \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xepson_DEPENDENCIES = \ Xepson_DEPENDENCIES = \
libepson.a \ libepson.a \

3
hw/kdrive/fbdev/Makefile.am
View File

@ -16,8 +16,7 @@ Xfbdev_SOURCES = \
Xfbdev_LDADD = \ Xfbdev_LDADD = \
libfbdev.a \ libfbdev.a \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xfbdev_DEPENDENCIES = \ Xfbdev_DEPENDENCIES = \
libfbdev.a \ libfbdev.a \

3
hw/kdrive/i810/Makefile.am
View File

@ -25,8 +25,7 @@ I810_LIBS = \
Xi810_LDADD = \ Xi810_LDADD = \
$(I810_LIBS) \ $(I810_LIBS) \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xi810_DEPENDENCIES = \ Xi810_DEPENDENCIES = \
libi810.a \ libi810.a \

3
hw/kdrive/mach64/Makefile.am
View File

@ -29,8 +29,7 @@ MACH64_LIBS = \
Xmach64_LDADD = \ Xmach64_LDADD = \
$(MACH64_LIBS) \ $(MACH64_LIBS) \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xmach64_DEPENDENCIES = \ Xmach64_DEPENDENCIES = \
libmach64.a \ libmach64.a \

3
hw/kdrive/mga/Makefile.am
View File

@ -24,8 +24,7 @@ MGA_LIBS = \
Xmga_LDADD = \ Xmga_LDADD = \
$(MGA_LIBS) \ $(MGA_LIBS) \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xmga_DEPENDENCIES = \ Xmga_DEPENDENCIES = \
libmga.a \ libmga.a \

3
hw/kdrive/nvidia/Makefile.am
View File

@ -25,8 +25,7 @@ NVIDIA_LIBS = \
Xnvidia_LDADD = \ Xnvidia_LDADD = \
$(NVIDIA_LIBS) \ $(NVIDIA_LIBS) \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xnvidia_DEPENDENCIES = \ Xnvidia_DEPENDENCIES = \
libnvidia.a \ libnvidia.a \

3
hw/kdrive/pm2/Makefile.am
View File

@ -23,8 +23,7 @@ PM2_LIBS = \
Xpm2_LDADD = \ Xpm2_LDADD = \
$(PM2_LIBS) \ $(PM2_LIBS) \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xpm2_DEPENDENCIES = \ Xpm2_DEPENDENCIES = \
libpm2.a \ libpm2.a \

3
hw/kdrive/r128/Makefile.am
View File

@ -22,8 +22,7 @@ R128_LIBS = \
Xr128_LDADD = \ Xr128_LDADD = \
$(R128_LIBS) \ $(R128_LIBS) \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xr128_DEPENDENCIES = \ Xr128_DEPENDENCIES = \
libr128.a \ libr128.a \

3
hw/kdrive/sdl/Makefile.am
View File

@ -7,9 +7,8 @@ bin_PROGRAMS = Xsdl
Xsdl_SOURCES = sdl.c Xsdl_SOURCES = sdl.c
Xsdl_LDADD = @KDRIVE_PURE_LIBS@ \ Xsdl_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ \
@XSDL_LIBS@ @XSDL_LIBS@
Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@

3
hw/kdrive/smi/Makefile.am
View File

@ -27,8 +27,7 @@ SMI_LIBS = \
Xsmi_LDADD = \ Xsmi_LDADD = \
$(SMI_LIBS) \ $(SMI_LIBS) \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xsmi_DEPENDENCIES = \ Xsmi_DEPENDENCIES = \
libsmi.a \ libsmi.a \

3
hw/kdrive/vesa/Makefile.am
View File

@ -21,8 +21,7 @@ Xvesa_SOURCES = \
Xvesa_LDADD = \ Xvesa_LDADD = \
libvesa.a \ libvesa.a \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xvesa_DEPENDENCIES = \ Xvesa_DEPENDENCIES = \
libvesa.a \ libvesa.a \

3
hw/kdrive/via/Makefile.am
View File

@ -23,8 +23,7 @@ VIA_LIBS = \
Xvia_LDADD = \ Xvia_LDADD = \
$(VIA_LIBS) \ $(VIA_LIBS) \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@
@XSERVER_LIBS@
Xvia_DEPENDENCIES = \ Xvia_DEPENDENCIES = \
libvia.a \ libvia.a \