summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorErwin Rol <erwin@erwinrol.com>2006-02-21 10:06:25 +0000
committerErwin Rol <erwin@erwinrol.com>2006-02-21 10:06:25 +0000
commit95d7e891f1faab20038608e46dc4d1cfd9a54431 (patch)
tree1a5e75c963855bfa8ffffe1430c8f8fd0fa5d541 /rules
parent8528362c1b74584a50b736c572654df7d6cacb68 (diff)
downloadptxdist-95d7e891f1faab20038608e46dc4d1cfd9a54431.tar.gz
ptxdist-95d7e891f1faab20038608e46dc4d1cfd9a54431.tar.xz
move driver config to xserver menu
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@4670 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
-rw-r--r--rules/Kconfig1
-rw-r--r--rules/xorg-driver-input-mouse.in2
-rw-r--r--rules/xorg-driver.in1
-rw-r--r--rules/xorg-server.in3
4 files changed, 6 insertions, 1 deletions
diff --git a/rules/Kconfig b/rules/Kconfig
index 85a4e880e..5b8f9bfb9 100644
--- a/rules/Kconfig
+++ b/rules/Kconfig
@@ -165,7 +165,6 @@ source "rules/mesa.in"
source "rules/realvnc.in"
source "rules/xfree430.in"
source "rules/xorg-server.in"
-source "rules/xorg-driver.in"
source "rules/xorg-proto.in"
source "rules/xorg-lib.in"
source "rules/xorg-app.in"
diff --git a/rules/xorg-driver-input-mouse.in b/rules/xorg-driver-input-mouse.in
index 4a7d4c3eb..026ae7448 100644
--- a/rules/xorg-driver-input-mouse.in
+++ b/rules/xorg-driver-input-mouse.in
@@ -1,6 +1,8 @@
config XORG_DRIVER_INPUT_MOUSE
bool
depends on XORG_DRIVER
+ select XORG_SERVER
+ select XORG_PROTO_X
prompt "Mouse"
help
FIXME
diff --git a/rules/xorg-driver.in b/rules/xorg-driver.in
index 2698a0489..d87d6e587 100644
--- a/rules/xorg-driver.in
+++ b/rules/xorg-driver.in
@@ -1,6 +1,7 @@
# xorg driver configuration
menuconfig XORG_DRIVER
+ depends on XORG_SERVER
bool "xorg drivers "
menu "Input Drivers "
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index 63370fa05..e65cf7e7a 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -89,6 +89,9 @@ config XORG_SERVER_XPRINT
prompt "Xprint server and extension"
help
--enable-xprint
+# ----------------------------------------------------------------------------
+
+source "rules/xorg-driver.in"
# ----------------------------------------------------------------------------