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

Relink properly all kdrive servers when changes happen.

This commit is contained in:
Tiago Vignatti 2007-06-27 16:24:42 -03:00
parent 3860996d56
commit 62f43d8b33
16 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1815,7 +1815,8 @@ 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_LIBS="$XSERVERLIBS_LIBS $DIX_LIB $CONFIG_LIB $KDRIVE_LIB $TSLIB_LIBS $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB" 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"
# 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"])
@ -1829,6 +1830,7 @@ AC_SUBST([KDRIVE_INCS])
AC_SUBST([KDRIVE_PURE_INCS]) AC_SUBST([KDRIVE_PURE_INCS])
AC_SUBST([KDRIVE_CFLAGS]) AC_SUBST([KDRIVE_CFLAGS])
AC_SUBST([KDRIVE_PURE_LIBS]) AC_SUBST([KDRIVE_PURE_LIBS])
AC_SUBST([KDRIVE_LOCAL_LIBS])
AC_SUBST([KDRIVE_LIBS]) AC_SUBST([KDRIVE_LIBS])
AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes]) AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes])
AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes]) AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])

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

@ -63,5 +63,7 @@ Xati_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xati_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

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

@ -25,5 +25,7 @@ Xchips_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xchips_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

2
hw/kdrive/ephyr/Makefile.am
View File

@ -30,5 +30,7 @@ Xephyr_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XEPHYR_LIBS@ @XEPHYR_LIBS@
Xephyr_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

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

@ -25,5 +25,7 @@ Xepson_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xepson_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

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

@ -19,6 +19,8 @@ Xfbdev_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xfbdev_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
endif endif

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

@ -28,5 +28,7 @@ Xi810_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xi810_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

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

@ -32,5 +32,7 @@ Xmach64_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xmach64_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

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

@ -27,5 +27,7 @@ Xmga_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xmga_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

2
hw/kdrive/neomagic/Makefile.am
View File

@ -39,5 +39,7 @@ Xneomagic_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xneomagic_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

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

@ -28,5 +28,7 @@ Xnvidia_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xnvidia_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

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

@ -26,5 +26,7 @@ Xpm2_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xpm2_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

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

@ -25,5 +25,7 @@ Xr128_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xr128_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

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

@ -30,5 +30,7 @@ Xsmi_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xsmi_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

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

@ -24,5 +24,7 @@ Xvesa_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xvesa_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)

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

@ -26,5 +26,7 @@ Xvia_LDADD = \
@KDRIVE_LIBS@ \ @KDRIVE_LIBS@ \
@XSERVER_LIBS@ @XSERVER_LIBS@
Xvia_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
relink: relink:
rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)