build system overhaul

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 @@
 
 menu "Editors"
 
-config CONFIG_AWK
+config AWK
 	bool "awk"
 	default n
 	help
 	  Awk is used as a pattern scanning and processing language.  This is
 	  the BusyBox implementation of that programming language.
 
-config CONFIG_FEATURE_AWK_MATH
+config FEATURE_AWK_MATH
 	bool "Enable math functions (requires libm)"
 	default y
-	depends on CONFIG_AWK
+	depends on AWK
 	help
 	  Enable math functions of the Awk programming language.
 	  NOTE: This will require libm to be present for linking.
 
-config CONFIG_ED
+config ED
 	bool "ed"
 	default n
 	help
@@ -28,20 +28,20 @@ config CONFIG_ED
 	  Small, simple, evil.  Part of SUSv3.  If you're not already using
 	  this, you don't need it.
 
-config CONFIG_PATCH
+config PATCH
 	bool "patch"
 	default n
 	help
 	  Apply a unified diff formatted patch.
 
-config CONFIG_SED
+config SED
 	bool "sed"
 	default n
 	help
 	  sed is used to perform text transformations on a file
 	  or input from a pipeline.
 
-config CONFIG_VI
+config VI
 	bool "vi"
 	default n
 	help
@@ -50,79 +50,79 @@ config CONFIG_VI
 	  learning curve.  If you are not already comfortable with 'vi'
 	  you may wish to use something else.
 
-config CONFIG_FEATURE_VI_COLON
+config FEATURE_VI_COLON
 	bool "Enable \":\" colon commands (no \"ex\" mode)"
 	default y
-	depends on CONFIG_VI
+	depends on VI
 	help
 	  Enable a limited set of colon commands for vi.  This does not
 	  provide an "ex" mode.
 
-config CONFIG_FEATURE_VI_YANKMARK
+config FEATURE_VI_YANKMARK
 	bool "Enable yank/put commands and mark cmds"
 	default y
-	depends on CONFIG_VI
+	depends on VI
 	help
 	  This will enable you to use yank and put, as well as mark in
 	  busybox vi.
 
-config CONFIG_FEATURE_VI_SEARCH
+config FEATURE_VI_SEARCH
 	bool "Enable search and replace cmds"
 	default y
-	depends on CONFIG_VI
+	depends on VI
 	help
 	  Select this if you wish to be able to do search and replace in
 	  busybox vi.
 
-config CONFIG_FEATURE_VI_USE_SIGNALS
+config FEATURE_VI_USE_SIGNALS
 	bool "Catch signals"
 	default y
-	depends on CONFIG_VI
+	depends on VI
 	help
 	  Selecting this option will make busybox vi signal aware.  This will
 	  make busybox vi support SIGWINCH to deal with Window Changes, catch
 	  Ctrl-Z and Ctrl-C and alarms.
 
-config CONFIG_FEATURE_VI_DOT_CMD
+config FEATURE_VI_DOT_CMD
 	bool "Remember previous cmd and \".\" cmd"
 	default y
-	depends on CONFIG_VI
+	depends on VI
 	help
 	  Make busybox vi remember the last command and be able to repeat it.
 
-config CONFIG_FEATURE_VI_READONLY
+config FEATURE_VI_READONLY
 	bool "Enable -R option and \"view\" mode"
 	default y
-	depends on CONFIG_VI
+	depends on VI
 	help
 	  Enable the read-only command line option, which allows the user to
 	  open a file in read-only mode.
 
-config CONFIG_FEATURE_VI_SETOPTS
+config FEATURE_VI_SETOPTS
 	bool "Enable set-able options, ai ic showmatch"
 	default y
-	depends on CONFIG_VI
+	depends on VI
 	help
 	  Enable the editor to set some (ai, ic, showmatch) options.
 
-config CONFIG_FEATURE_VI_SET
+config FEATURE_VI_SET
 	bool "Support for :set"
 	default y
-	depends on CONFIG_VI
+	depends on VI
 	help
 	  Support for ":set".
 
-config CONFIG_FEATURE_VI_WIN_RESIZE
+config FEATURE_VI_WIN_RESIZE
 	bool "Handle window resize"
 	default y
-	depends on CONFIG_VI
+	depends on VI
 	help
 	  Make busybox vi behave nicely with terminals that get resized.
 
-config CONFIG_FEATURE_VI_OPTIMIZE_CURSOR
+config FEATURE_VI_OPTIMIZE_CURSOR
 	bool "Optimize cursor movement"
 	default y
-	depends on CONFIG_VI
+	depends on VI
 	help
 	  This will make the cursor movement faster, but requires more memory
 	  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 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
+#
+# Licensed under the GPL v2, see the file LICENSE in this tarball.
+
+lib-y:=
+lib-$(CONFIG_AWK)       += awk.o
+lib-$(CONFIG_ED)        += ed.o
+lib-$(CONFIG_PATCH)     += patch.o
+lib-$(CONFIG_SED)       += sed.o
+lib-$(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 @@
-# Makefile for busybox
-#
-# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
-#
-# Licensed under the GPL v2, see the file LICENSE in this tarball.
-
-ifndef top_srcdir
-top_srcdir=..
-endif
-ifndef top_builddir
-top_builddir=..
-endif
-srcdir=$(top_srcdir)/editors
-EDITOR_DIR:=./
-include $(top_srcdir)/Rules.mak
-include $(top_builddir)/.config
-include $(srcdir)/Makefile.in
-all: $(libraries-y)
--include $(top_builddir)/.depend
-
-clean:
-	rm -f *.o *.a $(AR_TARGET)
-
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 @@
-# Makefile for busybox
-#
-# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
-#
-# Licensed under the GPL v2, see the file LICENSE in this tarball.
-
-EDITOR_AR:=editors.a
-ifndef $(EDITOR_DIR)
-EDITOR_DIR:=$(top_builddir)/editors/
-endif
-srcdir=$(top_srcdir)/editors
-
-EDITOR-y:=
-EDITOR-$(CONFIG_AWK)       += awk.o
-EDITOR-$(CONFIG_ED)        += ed.o
-EDITOR-$(CONFIG_PATCH)     += patch.o
-EDITOR-$(CONFIG_SED)       += sed.o
-EDITOR-$(CONFIG_VI)        += vi.o
-
-ifneq ($(strip $(EDITOR-y)),)
-libraries-y+=$(EDITOR_DIR)$(EDITOR_AR)
-endif
-
-EDITOR_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(EDITOR-y))
-EDITOR_SRC-a:=$(wildcard $(srcdir)/*.c)
-APPLET_SRC-y+=$(EDITOR_SRC-y)
-APPLET_SRC-a+=$(EDITOR_SRC-a)
-
-needlibm-y:=
-needlibm-$(CONFIG_FEATURE_AWK_MATH) := y
-
-ifeq ($(needlibm-y),y)
-  LIBRARIES := -lm $(filter-out -lm,$(LIBRARIES))
-endif
-
-$(EDITOR_DIR)$(EDITOR_AR): $(patsubst %,$(EDITOR_DIR)%, $(EDITOR-y))
-	$(do_ar)
-
-$(EDITOR_DIR)%.o: $(srcdir)/%.c
-	$(compile.c)