diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2009-07-17 16:26:29 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2009-07-24 23:26:48 +0200 |
commit | 74ecbaa23da486182a1bb20b43361aaf2a478877 (patch) | |
tree | 2b884fababa50877fd39f1dc127d81446ef0bf87 /package/xvkbd | |
parent | b36a5894809b71b65da3fcfa8ba4b2a645c01194 (diff) |
xorg: remove the XSERVER variable
The XSERVER variable used to be defined by package/Makefile.in because
the X server package name was different depending on the type of X
server that was choosen. Nowadays, the name of the package is always
xserver_xorg-server, so there's no point in having this XSERVER
intermediate variable.
This patch makes all packages use xserver_xorg-server directly as a
dependency, and removes the XSERVER variable from package/Makefile.in.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/xvkbd')
-rw-r--r-- | package/xvkbd/Config.in | 1 | ||||
-rw-r--r-- | package/xvkbd/xvkbd.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/package/xvkbd/Config.in b/package/xvkbd/Config.in index eeef152cb..888367a2d 100644 --- a/package/xvkbd/Config.in +++ b/package/xvkbd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_XVKBD bool "xvkbd" + depends on BR2_PACKAGE_XORG7 help on-screen keyboard for X diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk index 510e3c402..d28780969 100644 --- a/package/xvkbd/xvkbd.mk +++ b/package/xvkbd/xvkbd.mk @@ -15,7 +15,7 @@ XVKBD_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_CC) \ XVKBD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install -XVKBD_DEPENDENCIES = uclibc $(XSERVER) +XVKBD_DEPENDENCIES = uclibc xserver_xorg-server $(eval $(call AUTOTARGETS,package,xvkbd)) |