diff --git a/configure.ac b/configure.ac index f1e7f73836..06473ef055 100644 --- a/configure.ac +++ b/configure.ac @@ -1815,7 +1815,8 @@ if test "$KDRIVE" = yes; then ;; esac 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 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_CFLAGS]) AC_SUBST([KDRIVE_PURE_LIBS]) +AC_SUBST([KDRIVE_LOCAL_LIBS]) AC_SUBST([KDRIVE_LIBS]) AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes]) AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes]) diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am index 61c1c844bc..d7996fc7ae 100644 --- a/hw/kdrive/ati/Makefile.am +++ b/hw/kdrive/ati/Makefile.am @@ -63,5 +63,7 @@ Xati_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xati_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/chips/Makefile.am b/hw/kdrive/chips/Makefile.am index a0a10d7157..4bb57131e8 100644 --- a/hw/kdrive/chips/Makefile.am +++ b/hw/kdrive/chips/Makefile.am @@ -25,5 +25,7 @@ Xchips_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xchips_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am index 1e820c0970..11fe4547f0 100644 --- a/hw/kdrive/ephyr/Makefile.am +++ b/hw/kdrive/ephyr/Makefile.am @@ -30,5 +30,7 @@ Xephyr_LDADD = \ @KDRIVE_LIBS@ \ @XEPHYR_LIBS@ +Xephyr_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/epson/Makefile.am b/hw/kdrive/epson/Makefile.am index d36230abe6..0ef8e45734 100644 --- a/hw/kdrive/epson/Makefile.am +++ b/hw/kdrive/epson/Makefile.am @@ -25,5 +25,7 @@ Xepson_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xepson_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am index b7a863bf6e..f7a94e1832 100644 --- a/hw/kdrive/fbdev/Makefile.am +++ b/hw/kdrive/fbdev/Makefile.am @@ -19,6 +19,8 @@ Xfbdev_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xfbdev_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) endif diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am index 79093da60e..b7aacd6d74 100644 --- a/hw/kdrive/i810/Makefile.am +++ b/hw/kdrive/i810/Makefile.am @@ -28,5 +28,7 @@ Xi810_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xi810_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am index b4d9a4eeff..1f8a3c31f0 100644 --- a/hw/kdrive/mach64/Makefile.am +++ b/hw/kdrive/mach64/Makefile.am @@ -32,5 +32,7 @@ Xmach64_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xmach64_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am index db1a9563d0..72bd539fb4 100644 --- a/hw/kdrive/mga/Makefile.am +++ b/hw/kdrive/mga/Makefile.am @@ -27,5 +27,7 @@ Xmga_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xmga_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am index 33bc3a911c..770ada23b3 100644 --- a/hw/kdrive/neomagic/Makefile.am +++ b/hw/kdrive/neomagic/Makefile.am @@ -39,5 +39,7 @@ Xneomagic_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xneomagic_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am index 79d2738a01..3aec124029 100644 --- a/hw/kdrive/nvidia/Makefile.am +++ b/hw/kdrive/nvidia/Makefile.am @@ -28,5 +28,7 @@ Xnvidia_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xnvidia_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/pm2/Makefile.am b/hw/kdrive/pm2/Makefile.am index ec70276c5e..6223abbc8f 100644 --- a/hw/kdrive/pm2/Makefile.am +++ b/hw/kdrive/pm2/Makefile.am @@ -26,5 +26,7 @@ Xpm2_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xpm2_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am index 1ca1a605bf..6b2ca8505d 100644 --- a/hw/kdrive/r128/Makefile.am +++ b/hw/kdrive/r128/Makefile.am @@ -25,5 +25,7 @@ Xr128_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xr128_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am index a6ac474b0e..d6a143b95a 100644 --- a/hw/kdrive/smi/Makefile.am +++ b/hw/kdrive/smi/Makefile.am @@ -30,5 +30,7 @@ Xsmi_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xsmi_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am index e062fe7775..934b995c70 100644 --- a/hw/kdrive/vesa/Makefile.am +++ b/hw/kdrive/vesa/Makefile.am @@ -24,5 +24,7 @@ Xvesa_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xvesa_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/via/Makefile.am b/hw/kdrive/via/Makefile.am index 1c5796963e..caf3f5f314 100644 --- a/hw/kdrive/via/Makefile.am +++ b/hw/kdrive/via/Makefile.am @@ -26,5 +26,7 @@ Xvia_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xvia_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)