summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-05 10:17:08 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-05 10:17:08 +0000
commit7d219aab70e6951ab82c27c202cac05016696723 (patch)
tree4c0679bfa391f71aee9b51505a5d3dc8f60a0cf7 /editors
parent8f8f268cfdecb4cabeb2e649a73afc7a485aeff5 (diff)
downloadbusybox-w32-7d219aab70e6951ab82c27c202cac05016696723.tar.gz
busybox-w32-7d219aab70e6951ab82c27c202cac05016696723.tar.bz2
busybox-w32-7d219aab70e6951ab82c27c202cac05016696723.zip
build system overhaul
Diffstat (limited to 'editors')
-rw-r--r--editors/Config.in54
-rw-r--r--editors/Kbuild12
-rw-r--r--editors/Makefile23
-rw-r--r--editors/Makefile.in40
4 files changed, 39 insertions, 90 deletions
diff --git a/editors/Config.in b/editors/Config.in
index 14c316c08..4ba009019 100644
--- a/editors/Config.in
+++ b/editors/Config.in
@@ -5,22 +5,22 @@
5 5
6menu "Editors" 6menu "Editors"
7 7
8config CONFIG_AWK 8config AWK
9 bool "awk" 9 bool "awk"
10 default n 10 default n
11 help 11 help
12 Awk is used as a pattern scanning and processing language. This is 12 Awk is used as a pattern scanning and processing language. This is
13 the BusyBox implementation of that programming language. 13 the BusyBox implementation of that programming language.
14 14
15config CONFIG_FEATURE_AWK_MATH 15config FEATURE_AWK_MATH
16 bool "Enable math functions (requires libm)" 16 bool "Enable math functions (requires libm)"
17 default y 17 default y
18 depends on CONFIG_AWK 18 depends on AWK
19 help 19 help
20 Enable math functions of the Awk programming language. 20 Enable math functions of the Awk programming language.
21 NOTE: This will require libm to be present for linking. 21 NOTE: This will require libm to be present for linking.
22 22
23config CONFIG_ED 23config ED
24 bool "ed" 24 bool "ed"
25 default n 25 default n
26 help 26 help
@@ -28,20 +28,20 @@ config CONFIG_ED
28 Small, simple, evil. Part of SUSv3. If you're not already using 28 Small, simple, evil. Part of SUSv3. If you're not already using
29 this, you don't need it. 29 this, you don't need it.
30 30
31config CONFIG_PATCH 31config PATCH
32 bool "patch" 32 bool "patch"
33 default n 33 default n
34 help 34 help
35 Apply a unified diff formatted patch. 35 Apply a unified diff formatted patch.
36 36
37config CONFIG_SED 37config SED
38 bool "sed" 38 bool "sed"
39 default n 39 default n
40 help 40 help
41 sed is used to perform text transformations on a file 41 sed is used to perform text transformations on a file
42 or input from a pipeline. 42 or input from a pipeline.
43 43
44config CONFIG_VI 44config VI
45 bool "vi" 45 bool "vi"
46 default n 46 default n
47 help 47 help
@@ -50,79 +50,79 @@ config CONFIG_VI
50 learning curve. If you are not already comfortable with 'vi' 50 learning curve. If you are not already comfortable with 'vi'
51 you may wish to use something else. 51 you may wish to use something else.
52 52
53config CONFIG_FEATURE_VI_COLON 53config FEATURE_VI_COLON
54 bool "Enable \":\" colon commands (no \"ex\" mode)" 54 bool "Enable \":\" colon commands (no \"ex\" mode)"
55 default y 55 default y
56 depends on CONFIG_VI 56 depends on VI
57 help 57 help
58 Enable a limited set of colon commands for vi. This does not 58 Enable a limited set of colon commands for vi. This does not
59 provide an "ex" mode. 59 provide an "ex" mode.
60 60
61config CONFIG_FEATURE_VI_YANKMARK 61config FEATURE_VI_YANKMARK
62 bool "Enable yank/put commands and mark cmds" 62 bool "Enable yank/put commands and mark cmds"
63 default y 63 default y
64 depends on CONFIG_VI 64 depends on VI
65 help 65 help
66 This will enable you to use yank and put, as well as mark in 66 This will enable you to use yank and put, as well as mark in
67 busybox vi. 67 busybox vi.
68 68
69config CONFIG_FEATURE_VI_SEARCH 69config FEATURE_VI_SEARCH
70 bool "Enable search and replace cmds" 70 bool "Enable search and replace cmds"
71 default y 71 default y
72 depends on CONFIG_VI 72 depends on VI
73 help 73 help
74 Select this if you wish to be able to do search and replace in 74 Select this if you wish to be able to do search and replace in
75 busybox vi. 75 busybox vi.
76 76
77config CONFIG_FEATURE_VI_USE_SIGNALS 77config FEATURE_VI_USE_SIGNALS
78 bool "Catch signals" 78 bool "Catch signals"
79 default y 79 default y
80 depends on CONFIG_VI 80 depends on VI
81 help 81 help
82 Selecting this option will make busybox vi signal aware. This will 82 Selecting this option will make busybox vi signal aware. This will
83 make busybox vi support SIGWINCH to deal with Window Changes, catch 83 make busybox vi support SIGWINCH to deal with Window Changes, catch
84 Ctrl-Z and Ctrl-C and alarms. 84 Ctrl-Z and Ctrl-C and alarms.
85 85
86config CONFIG_FEATURE_VI_DOT_CMD 86config FEATURE_VI_DOT_CMD
87 bool "Remember previous cmd and \".\" cmd" 87 bool "Remember previous cmd and \".\" cmd"
88 default y 88 default y
89 depends on CONFIG_VI 89 depends on VI
90 help 90 help
91 Make busybox vi remember the last command and be able to repeat it. 91 Make busybox vi remember the last command and be able to repeat it.
92 92
93config CONFIG_FEATURE_VI_READONLY 93config FEATURE_VI_READONLY
94 bool "Enable -R option and \"view\" mode" 94 bool "Enable -R option and \"view\" mode"
95 default y 95 default y
96 depends on CONFIG_VI 96 depends on VI
97 help 97 help
98 Enable the read-only command line option, which allows the user to 98 Enable the read-only command line option, which allows the user to
99 open a file in read-only mode. 99 open a file in read-only mode.
100 100
101config CONFIG_FEATURE_VI_SETOPTS 101config FEATURE_VI_SETOPTS
102 bool "Enable set-able options, ai ic showmatch" 102 bool "Enable set-able options, ai ic showmatch"
103 default y 103 default y
104 depends on CONFIG_VI 104 depends on VI
105 help 105 help
106 Enable the editor to set some (ai, ic, showmatch) options. 106 Enable the editor to set some (ai, ic, showmatch) options.
107 107
108config CONFIG_FEATURE_VI_SET 108config FEATURE_VI_SET
109 bool "Support for :set" 109 bool "Support for :set"
110 default y 110 default y
111 depends on CONFIG_VI 111 depends on VI
112 help 112 help
113 Support for ":set". 113 Support for ":set".
114 114
115config CONFIG_FEATURE_VI_WIN_RESIZE 115config FEATURE_VI_WIN_RESIZE
116 bool "Handle window resize" 116 bool "Handle window resize"
117 default y 117 default y
118 depends on CONFIG_VI 118 depends on VI
119 help 119 help
120 Make busybox vi behave nicely with terminals that get resized. 120 Make busybox vi behave nicely with terminals that get resized.
121 121
122config CONFIG_FEATURE_VI_OPTIMIZE_CURSOR 122config FEATURE_VI_OPTIMIZE_CURSOR
123 bool "Optimize cursor movement" 123 bool "Optimize cursor movement"
124 default y 124 default y
125 depends on CONFIG_VI 125 depends on VI
126 help 126 help
127 This will make the cursor movement faster, but requires more memory 127 This will make the cursor movement faster, but requires more memory
128 and it makes the applet a tiny bit larger. 128 and it makes the applet a tiny bit larger.
diff --git a/editors/Kbuild b/editors/Kbuild
new file mode 100644
index 000000000..d991e1faf
--- /dev/null
+++ b/editors/Kbuild
@@ -0,0 +1,12 @@
1# Makefile for busybox
2#
3# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6
7lib-y:=
8lib-$(CONFIG_AWK) += awk.o
9lib-$(CONFIG_ED) += ed.o
10lib-$(CONFIG_PATCH) += patch.o
11lib-$(CONFIG_SED) += sed.o
12lib-$(CONFIG_VI) += vi.o
diff --git a/editors/Makefile b/editors/Makefile
deleted file mode 100644
index 22790095a..000000000
--- a/editors/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
1# Makefile for busybox
2#
3# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6
7ifndef top_srcdir
8top_srcdir=..
9endif
10ifndef top_builddir
11top_builddir=..
12endif
13srcdir=$(top_srcdir)/editors
14EDITOR_DIR:=./
15include $(top_srcdir)/Rules.mak
16include $(top_builddir)/.config
17include $(srcdir)/Makefile.in
18all: $(libraries-y)
19-include $(top_builddir)/.depend
20
21clean:
22 rm -f *.o *.a $(AR_TARGET)
23
diff --git a/editors/Makefile.in b/editors/Makefile.in
deleted file mode 100644
index 9a46e32c2..000000000
--- a/editors/Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
1# Makefile for busybox
2#
3# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6
7EDITOR_AR:=editors.a
8ifndef $(EDITOR_DIR)
9EDITOR_DIR:=$(top_builddir)/editors/
10endif
11srcdir=$(top_srcdir)/editors
12
13EDITOR-y:=
14EDITOR-$(CONFIG_AWK) += awk.o
15EDITOR-$(CONFIG_ED) += ed.o
16EDITOR-$(CONFIG_PATCH) += patch.o
17EDITOR-$(CONFIG_SED) += sed.o
18EDITOR-$(CONFIG_VI) += vi.o
19
20ifneq ($(strip $(EDITOR-y)),)
21libraries-y+=$(EDITOR_DIR)$(EDITOR_AR)
22endif
23
24EDITOR_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(EDITOR-y))
25EDITOR_SRC-a:=$(wildcard $(srcdir)/*.c)
26APPLET_SRC-y+=$(EDITOR_SRC-y)
27APPLET_SRC-a+=$(EDITOR_SRC-a)
28
29needlibm-y:=
30needlibm-$(CONFIG_FEATURE_AWK_MATH) := y
31
32ifeq ($(needlibm-y),y)
33 LIBRARIES := -lm $(filter-out -lm,$(LIBRARIES))
34endif
35
36$(EDITOR_DIR)$(EDITOR_AR): $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y))
37 $(do_ar)
38
39$(EDITOR_DIR)%.o: $(srcdir)/%.c
40 $(compile.c)