summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2008-06-05 08:34:56 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2008-06-05 08:34:56 +0000
commit59545e22ad6859724516b577b55adc226c3586cd (patch)
treeab8f8052ae5f25c6adb985543aac9d5ec9944f92
parentb55c494bd83c0d3a43774017eca19ba9e8c12d60 (diff)
downloadptxdist-59545e22ad6859724516b577b55adc226c3586cd.tar.gz
ptxdist-59545e22ad6859724516b577b55adc226c3586cd.tar.xz
* host-libxcb.in, host-libxml2.in, libxcb.in, qtopia.in, tslib.in, xorg-app.in, xorg-cursor.in, xorg-data.in, xorg-driver.in, xorg-server.in:
fixed indention git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8355 33e552b5-05e3-0310-8538-816dae2090ed
-rw-r--r--rules/host-libxcb.in1
-rw-r--r--rules/host-libxml2.in10
-rw-r--r--rules/libxcb.in1
-rw-r--r--rules/qtopia.in2
-rw-r--r--rules/tslib.in2
-rw-r--r--rules/xorg-app.in2
-rw-r--r--rules/xorg-cursor.in2
-rw-r--r--rules/xorg-data.in2
-rw-r--r--rules/xorg-driver.in4
-rw-r--r--rules/xorg-server.in2
10 files changed, 10 insertions, 18 deletions
diff --git a/rules/host-libxcb.in b/rules/host-libxcb.in
index c2a0650ee..6c9341577 100644
--- a/rules/host-libxcb.in
+++ b/rules/host-libxcb.in
@@ -2,6 +2,5 @@ config HOST_LIBXCB
bool
select HOST_XCB_PROTO
select HOST_LIBXSLT
- select HOST_LIBXSLT_XSLTPROC
select HOST_LIBPTHREAD_STUBS
select HOST_XORG_LIB_XAU
diff --git a/rules/host-libxml2.in b/rules/host-libxml2.in
index d762ffec8..14c491c18 100644
--- a/rules/host-libxml2.in
+++ b/rules/host-libxml2.in
@@ -1,12 +1,6 @@
-#
-# LibXML2 - Options updated as of 2.6.19
-# Options valid for 2.6.20 as well. ZLIB missing in both.
-#
-
-menuconfig HOST_LIBXML2
+config HOST_LIBXML2
bool
- select HOST_ZLIB if HOST_LIBXML2_ZLIB
- prompt "libxml2 "
+ select HOST_ZLIB
help
Libxml2 is a XML C parser and toolkit. XML itself is a
metalanguage to design markup languages, i.e. text
diff --git a/rules/libxcb.in b/rules/libxcb.in
index ff04aa6a6..e721f93cf 100644
--- a/rules/libxcb.in
+++ b/rules/libxcb.in
@@ -8,7 +8,6 @@ menuconfig LIBXCB
# Is the line below the correct solution for this behavior?
select XORG_LIB_XDMCP if XORG_SERVER_EXT_XDMCP
select HOST_LIBXSLT
- select HOST_LIBXSLT_XSLTPROC
help
The X protocol C-language Binding (XCB) is a replacement for Xlib
featuring a small footprint, latency hiding, direct access to the
diff --git a/rules/qtopia.in b/rules/qtopia.in
index b44fb968f..82f989774 100644
--- a/rules/qtopia.in
+++ b/rules/qtopia.in
@@ -1,7 +1,7 @@
menuconfig QTOPIA
tristate
select TSLIB if QTOPIA_TSLIB
- prompt "qtopia core "
+ prompt "qtopia core "
help
QTopia Core is Trolltech's Widget Library formerly known as
QT Embedded.
diff --git a/rules/tslib.in b/rules/tslib.in
index 489e9aa29..ca941a181 100644
--- a/rules/tslib.in
+++ b/rules/tslib.in
@@ -1,6 +1,6 @@
menuconfig TSLIB
tristate
- prompt "tslib (touch library) "
+ prompt "tslib (touch library) "
help
Tslib is an abstraction layer for touchscreen panel events,
as well as a filter stack for the manipulation of those
diff --git a/rules/xorg-app.in b/rules/xorg-app.in
index 412d7b6de..b2cb8079d 100644
--- a/rules/xorg-app.in
+++ b/rules/xorg-app.in
@@ -1,7 +1,7 @@
# xorg application configuration
menuconfig XORG_APP
- bool "xorg applications "
+ bool "xorg applications "
source "rules/xorg-app-xdm.in"
source "rules/xorg-app-xhost.in"
diff --git a/rules/xorg-cursor.in b/rules/xorg-cursor.in
index b3a505767..cabf43cf2 100644
--- a/rules/xorg-cursor.in
+++ b/rules/xorg-cursor.in
@@ -1,6 +1,6 @@
menuconfig XORG_CURSOR
tristate
- prompt "xorg cursor themes "
+ prompt "xorg cursor themes "
select XORG_LIB_X11_CURSOR
select XORG_LIB_XCURSOR
diff --git a/rules/xorg-data.in b/rules/xorg-data.in
index 4c5dde988..0e258b4bc 100644
--- a/rules/xorg-data.in
+++ b/rules/xorg-data.in
@@ -1,6 +1,6 @@
# xorg data configuration
-menu "xorg data "
+menu "xorg data "
source "rules/xorg-data-xbitmaps.in"
source "rules/xorg-data-xkbdata.in"
diff --git a/rules/xorg-driver.in b/rules/xorg-driver.in
index 1520461eb..adb863c20 100644
--- a/rules/xorg-driver.in
+++ b/rules/xorg-driver.in
@@ -1,7 +1,7 @@
# xorg driver configuration
menuconfig XORG_DRIVER_INPUT
- bool "xorg input drivers "
+ bool "xorg input drivers "
source "rules/xorg-driver-input-evdev.in"
source "rules/xorg-driver-input-keyboard.in"
@@ -10,7 +10,7 @@ source "rules/xorg-driver-input-tslib.in"
source "rules/xorg-driver-input-void.in"
menuconfig XORG_DRIVER_VIDEO
- bool "xorg video drivers "
+ bool "xorg video drivers "
source "rules/xorg-driver-video-apm.in"
source "rules/xorg-driver-video-ati.in"
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index bc205956a..2aae43d2d 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -10,7 +10,7 @@
#
menuconfig XORG_SERVER
tristate
- prompt "xorg server "
+ prompt "xorg server "
# Always required:
select XORG_LIB_X11
select XORG_LIB_XAW