xvkbd: fix X.org dependencies

xvkbd is a X.org client application, so there is no reason to depend
on the X.org server. Instead, depend on the X.org client libraries
that xvkbd actually links against.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/xvkbd/Config.in b/package/xvkbd/Config.in
index a75687d213e86a29023b8b189a5bc02cc4420023..bd3f2aa8a0d590eebd5b11dabc3c1603531bbcff 100644 (file)
--- a/package/xvkbd/Config.in
+++ b/package/xvkbd/Config.in
@@ -1,7 +1,14 @@
 config BR2_PACKAGE_XVKBD
        bool "xvkbd"
        depends on BR2_PACKAGE_XORG7
+       select BR2_PACKAGE_XLIB_LIBICE
+       select BR2_PACKAGE_XLIB_LIBSM
+       select BR2_PACKAGE_XLIB_LIBX11
        select BR2_PACKAGE_XLIB_LIBXAW
+       select BR2_PACKAGE_XLIB_LIBXEXT
+       select BR2_PACKAGE_XLIB_LIBXMU
+       select BR2_PACKAGE_XLIB_LIBXPM
+       select BR2_PACKAGE_XLIB_LIBXT
        select BR2_PACKAGE_XLIB_LIBXTST
        help
          on-screen keyboard for X

diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index ec6302703b2c910c43f55b289970ade6e153d847..ae81f84d33969fa6d82c31462956d2314382e49e 100644 (file)
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -10,7 +10,16 @@ XVKBD_SITE = http://homepage3.nifty.com/tsato/xvkbd
 XVKBD_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_CC)" \
                                CFLAGS="-O2 -I$(STAGING_DIR)/usr/include" USRLIBDIR="$(STAGING_DIR)/usr/lib"
 
-XVKBD_DEPENDENCIES = xserver_xorg-server xlib_libXaw xlib_libXtst
+XVKBD_DEPENDENCIES = \
+       xlib_libICE \
+       xlib_libSM \
+       xlib_libX11 \
+       xlib_libXaw \
+       xlib_libXext \
+       xlib_libXmu \
+       xlib_libXpm \
+       xlib_libXt \
+       xlib_libXtst
 
 $(eval $(autotools-package))