diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-08 10:21:16 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-08 10:21:16 +0200 |
| commit | 74708bad1512a917a28c59646d1f9491f6fe9ea6 (patch) | |
| tree | 7f3bf126d8251e99dda6da042be1fe016d59e3c3 /package/xvkbd | |
| parent | 049cf426e32d6f789439d0d06905c977bfd25c02 (diff) | |
| parent | d0169fda2144ef5dfe25e801d58a227ed119a38c (diff) | |
Merge branch 'misc-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/xvkbd')
| -rw-r--r-- | package/xvkbd/Config.in | 1 | ||||
| -rw-r--r-- | package/xvkbd/xvkbd.mk | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/package/xvkbd/Config.in b/package/xvkbd/Config.in index 8a4b84765..a75687d21 100644 --- a/package/xvkbd/Config.in +++ b/package/xvkbd/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_XVKBD bool "xvkbd" depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXAW + select BR2_PACKAGE_XLIB_LIBXTST help on-screen keyboard for X diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk index b7da396db..7c74be7bc 100644 --- a/package/xvkbd/xvkbd.mk +++ b/package/xvkbd/xvkbd.mk @@ -10,12 +10,12 @@ XVKBD_AUTORECONF = NO XVKBD_INSTALL_STAGING = NO XVKBD_INSTALL_TARGET = YES -XVKBD_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_CC) \ +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_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -XVKBD_DEPENDENCIES = xserver_xorg-server xlib_libXaw +XVKBD_DEPENDENCIES = xserver_xorg-server xlib_libXaw xlib_libXtst $(eval $(call AUTOTARGETS,package,xvkbd)) |