aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2008-03-07 10:00:04 +0000
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2008-03-07 10:00:04 +0000
commitd47bd2de38a6a7efb5e104c37af5761b530629a8 (patch)
treefc445a15868d0e04690efefced8a481963ff5f6c
parent5381e1c4862578b1265cdbe66cf65db3d7ca3b22 (diff)
downloadbuildroot-d47bd2de38a6a7efb5e104c37af5761b530629a8.tar.gz
buildroot-d47bd2de38a6a7efb5e104c37af5761b530629a8.tar.bz2
buildroot: move editors under package/editors and merge menus
Based on patch by Arnar Mar Sig.
-rw-r--r--package/Config.in15
-rw-r--r--package/editors/Config.in13
-rw-r--r--package/editors/ed/Config.in (renamed from package/ed/Config.in)0
-rw-r--r--package/editors/ed/ed.mk (renamed from package/ed/ed.mk)0
-rw-r--r--package/editors/nano/Config.in (renamed from package/nano/Config.in)0
-rw-r--r--package/editors/nano/nano.mk (renamed from package/nano/nano.mk)0
-rw-r--r--package/editors/uemacs/Config.in (renamed from package/uemacs/Config.in)0
-rw-r--r--package/editors/uemacs/uemacs-4.0.15-lt.01.patch (renamed from package/uemacs/uemacs-4.0.15-lt.01.patch)0
-rw-r--r--package/editors/uemacs/uemacs-4.0.15-lt.02.patch (renamed from package/uemacs/uemacs-4.0.15-lt.02.patch)0
-rw-r--r--package/editors/uemacs/uemacs.mk (renamed from package/uemacs/uemacs.mk)0
10 files changed, 12 insertions, 16 deletions
diff --git a/package/Config.in b/package/Config.in
index fe7265e2e8..951fd064f7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -11,7 +11,6 @@ source "package/coreutils/Config.in"
endif
source "package/diffutils/Config.in"
if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-source "package/ed/Config.in"
source "package/findutils/Config.in"
endif
source "package/flex/Config.in"
@@ -119,16 +118,8 @@ endif
if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
# busybox has an editor
-menuconfig BR2_TEXTEDIT_SUPPORT
- bool "Text editors"
- default y
- help
- Support for text editors
-
-if BR2_TEXTEDIT_SUPPORT
-source "package/nano/Config.in"
-source "package/uemacs/Config.in"
-endif
+# text editors
+source "package/editors/Config.in"
endif
@@ -490,6 +481,4 @@ source "package/magiccube4d/Config.in"
source "package/vice/Config.in"
endif
-source "package/editors/Config.in"
-
endmenu
diff --git a/package/editors/Config.in b/package/editors/Config.in
index b979df85aa..b4e7e40236 100644
--- a/package/editors/Config.in
+++ b/package/editors/Config.in
@@ -1,5 +1,12 @@
-menu "Editors"
+menuconfig BR2_TEXTEDIT_SUPPORT
+ bool "Text editors"
+ default y
+ help
+ Support for text editors
+if BR2_TEXTEDIT_SUPPORT
+source "package/editors/ed/Config.in"
+source "package/editors/nano/Config.in"
+source "package/editors/uemacs/Config.in"
source "package/editors/vim/Config.in"
-
-endmenu
+endif
diff --git a/package/ed/Config.in b/package/editors/ed/Config.in
index d14343fdf0..d14343fdf0 100644
--- a/package/ed/Config.in
+++ b/package/editors/ed/Config.in
diff --git a/package/ed/ed.mk b/package/editors/ed/ed.mk
index 00ce8567ea..00ce8567ea 100644
--- a/package/ed/ed.mk
+++ b/package/editors/ed/ed.mk
diff --git a/package/nano/Config.in b/package/editors/nano/Config.in
index 272c061eed..272c061eed 100644
--- a/package/nano/Config.in
+++ b/package/editors/nano/Config.in
diff --git a/package/nano/nano.mk b/package/editors/nano/nano.mk
index c50f140648..c50f140648 100644
--- a/package/nano/nano.mk
+++ b/package/editors/nano/nano.mk
diff --git a/package/uemacs/Config.in b/package/editors/uemacs/Config.in
index 6c78bd8ce9..6c78bd8ce9 100644
--- a/package/uemacs/Config.in
+++ b/package/editors/uemacs/Config.in
diff --git a/package/uemacs/uemacs-4.0.15-lt.01.patch b/package/editors/uemacs/uemacs-4.0.15-lt.01.patch
index 855dd35103..855dd35103 100644
--- a/package/uemacs/uemacs-4.0.15-lt.01.patch
+++ b/package/editors/uemacs/uemacs-4.0.15-lt.01.patch
diff --git a/package/uemacs/uemacs-4.0.15-lt.02.patch b/package/editors/uemacs/uemacs-4.0.15-lt.02.patch
index 946b3d5d6b..946b3d5d6b 100644
--- a/package/uemacs/uemacs-4.0.15-lt.02.patch
+++ b/package/editors/uemacs/uemacs-4.0.15-lt.02.patch
diff --git a/package/uemacs/uemacs.mk b/package/editors/uemacs/uemacs.mk
index 5abe943ee5..5abe943ee5 100644
--- a/package/uemacs/uemacs.mk
+++ b/package/editors/uemacs/uemacs.mk