Just like in other servers, use KDRIVE_LIBS as the set of in-tree libraries needed by the server and KDRIVE_SYS_LIBS as the set of out-of-tree libraries needed by the server.
Also fix a missing in-tree dependency in Xephyr. Its Makefile had libexa.la in _LDADD but was missing it from _DEPENDENCIES. Signed-off-by: Tomas Carnecky <[email protected]> --- configure.ac | 13 +++++-------- hw/kdrive/ephyr/Makefile.am | 4 +++- hw/kdrive/fake/Makefile.am | 5 +++-- hw/kdrive/fbdev/Makefile.am | 5 +++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index aaae567..e8873f9 100644 --- a/configure.ac +++ b/configure.ac @@ -2088,8 +2088,6 @@ if test "$KDRIVE" = yes; then KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS" - KDRIVE_PURE_LIBS="$FB_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $MIEXT_SHADOW_LIB $COMPOSITE_LIB" - KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la' case $host_os in *linux*) KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.la' @@ -2117,10 +2115,10 @@ if test "$KDRIVE" = yes; then ;; esac KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la' - KDRIVE_LOCAL_LIBS="$MAIN_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB" - KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $KDRIVE_PURE_LIBS" - KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $XSERVER_LIBS $XKB_STUB_LIB" - KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS" + KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la' + + KDRIVE_LIBS="$MAIN_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $FB_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $MIEXT_SHADOW_LIB $COMPOSITE_LIB $KDRIVE_OS_LIB $XSERVER_LIBS $XKB_STUB_LIB" + KDRIVE_SYS_LIBS="$TSLIB_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS" AC_SUBST([XEPHYR_LIBS]) AC_SUBST([XEPHYR_INCS]) @@ -2128,9 +2126,8 @@ fi 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]) +AC_SUBST([KDRIVE_SYS_LIBS]) AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes]) AM_CONDITIONAL(KDRIVE_EVDEV, [test "x$KDRIVE_EVDEV" = xyes]) AM_CONDITIONAL(KDRIVE_KBD, [test "x$KDRIVE_KBD" = xyes]) diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am index 8646703..f3a7eed 100644 --- a/hw/kdrive/ephyr/Makefile.am +++ b/hw/kdrive/ephyr/Makefile.am @@ -69,6 +69,7 @@ Xephyr_LDADD = \ $(LIBXEPHYR_HOSTDRI) \ $(top_builddir)/exa/libexa.la \ @KDRIVE_LIBS@ \ + @KDRIVE_SYS_LIBS@ \ @XEPHYR_LIBS@ Xephyr_DEPENDENCIES = \ @@ -76,7 +77,8 @@ Xephyr_DEPENDENCIES = \ libxephyr-hostx.la \ $(LIBXEPHYR_HOSTXV) \ $(LIBXEPHYR_HOSTDRI) \ - @KDRIVE_LOCAL_LIBS@ + $(top_builddir)/exa/libexa.la \ + @KDRIVE_LIBS@ Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am index 6d3ed05..179f362 100644 --- a/hw/kdrive/fake/Makefile.am +++ b/hw/kdrive/fake/Makefile.am @@ -18,13 +18,14 @@ Xfake_SOURCES = \ Xfake_LDADD = \ libfake.la \ - @KDRIVE_LIBS@ + @KDRIVE_LIBS@ \ + @KDRIVE_SYS_LIBS@ Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) Xfake_DEPENDENCIES = \ libfake.la \ - @KDRIVE_LOCAL_LIBS@ + @KDRIVE_LIBS@ relink: $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS) diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am index ec9df95..4bc8513 100644 --- a/hw/kdrive/fbdev/Makefile.am +++ b/hw/kdrive/fbdev/Makefile.am @@ -16,11 +16,12 @@ Xfbdev_SOURCES = \ Xfbdev_LDADD = \ libfbdev.la \ - @KDRIVE_LIBS@ + @KDRIVE_LIBS@ \ + @KDRIVE_SYS_LIBS@ Xfbdev_DEPENDENCIES = \ libfbdev.la \ - $(KDRIVE_PURE_LIBS) + $(KDRIVE_LIBS) Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -- 1.7.2.1.g43c6fa _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
