build system overhaul

4 files changed, 45 insertions, 89 deletions

diff --git a/findutils/Config.in b/findutils/Config.in
index 12387a44e..5a4476a98 100644
--- a/findutils/Config.in
+++ b/findutils/Config.in
@@ -5,152 +5,152 @@
 
 menu "Finding Utilities"
 
-config CONFIG_FIND
+config FIND
         bool "find"
         default n
         help
           find is used to search your system to find specified files.
 
-config CONFIG_FEATURE_FIND_PRINT0
+config FEATURE_FIND_PRINT0
         bool "Enable -print0 option"
         default y
-        depends on CONFIG_FIND
+        depends on FIND
         help
           Causes output names to be separated by a null character
           rather than a newline.  This allows names that contain
           newlines and other whitespace to be more easily
           interpreted by other programs.
 
-config CONFIG_FEATURE_FIND_MTIME
+config FEATURE_FIND_MTIME
         bool "Enable modified time matching (-mtime) option"
         default y
-        depends on CONFIG_FIND
+        depends on FIND
         help
           Allow searching based on the modification time of
           files, in days.
 
-config CONFIG_FEATURE_FIND_MMIN
+config FEATURE_FIND_MMIN
         bool "Enable modified time matching (-min) option"
         default y
-        depends on CONFIG_FIND
+        depends on FIND
         help
           Allow searching based on the modification time of
           files, in minutes.
 
-config CONFIG_FEATURE_FIND_PERM
+config FEATURE_FIND_PERM
         bool "Enable permissions matching (-perm) option"
         default y
-        depends on CONFIG_FIND
+        depends on FIND
         help
           Enable searching based on file permissions.
 
-config CONFIG_FEATURE_FIND_TYPE
+config FEATURE_FIND_TYPE
         bool "Enable filetype matching (-type) option"
         default y
-        depends on CONFIG_FIND
+        depends on FIND
         help
           Enable searching based on file type (file,
           directory, socket, device, etc.).
 
-config CONFIG_FEATURE_FIND_XDEV
+config FEATURE_FIND_XDEV
         bool "Enable stay in filesystem (-xdev) option"
         default y
-        depends on CONFIG_FIND
+        depends on FIND
         help
           This option will allow find to restrict searches to a single
           filesystem.
 
-config CONFIG_FEATURE_FIND_NEWER
+config FEATURE_FIND_NEWER
         bool "Enable -newer option for comparing file mtimes"
         default y
-        depends on CONFIG_FIND
+        depends on FIND
         help
           Support the 'find -newer' option for finding any files which have
           a modified time that is more recent than the specified FILE.
 
-config CONFIG_FEATURE_FIND_INUM
+config FEATURE_FIND_INUM
         bool "Enable inode number matching (-inum) option"
         default y
-        depends on CONFIG_FIND
+        depends on FIND
         help
           Support the 'find -inum' option for searching by inode number.
 
-config CONFIG_FEATURE_FIND_EXEC
+config FEATURE_FIND_EXEC
         bool "Enable (-exec) option allowing execution of commands"
         default y
-        depends on CONFIG_FIND
+        depends on FIND
         help
           Support the 'find -exec' option for executing commands based upon
           the files matched.
 
-config CONFIG_GREP
+config GREP
         bool "grep"
         default n
         help
           grep is used to search files for a specified pattern.
 
-config CONFIG_FEATURE_GREP_EGREP_ALIAS
+config FEATURE_GREP_EGREP_ALIAS
         bool "Support extended regular expressions (egrep & grep -E)"
         default y
-        depends on CONFIG_GREP
+        depends on GREP
         help
           Enabled support for extended regular expressions.  Extended
           regular expressions allow for alternation (foo|bar), grouping,
           and various repetition operators.
 
-config CONFIG_FEATURE_GREP_FGREP_ALIAS
+config FEATURE_GREP_FGREP_ALIAS
         bool "Alias fgrep to grep -F"
         default y
-        depends on CONFIG_GREP
+        depends on GREP
         help
           fgrep sees the search pattern as a normal string rather than
           regular expressions.
           grep -F is always builtin, this just creates the fgrep alias.
 
-config CONFIG_FEATURE_GREP_CONTEXT
+config FEATURE_GREP_CONTEXT
         bool "Enable before and after context flags (-A, -B and -C)"
         default y
-        depends on CONFIG_GREP
+        depends on GREP
         help
           Print the specified number of leading (-B) and/or trailing (-A)
           context surrounding our matching lines.
           Print the specified number of context lines (-C).
 
-config CONFIG_XARGS
+config XARGS
         bool "xargs"
         default n
         help
           xargs is used to execute a specified command on
           every item from standard input.
 
-config CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
+config FEATURE_XARGS_SUPPORT_CONFIRMATION
         bool "Enable prompt and confirmation option -p"
         default n
-        depends on CONFIG_XARGS
+        depends on XARGS
         help
           Support prompt the user about whether to run each command
           line and read a line from the terminal.
 
-config CONFIG_FEATURE_XARGS_SUPPORT_QUOTES
+config FEATURE_XARGS_SUPPORT_QUOTES
         bool "Enable support single and double quotes and backslash"
         default n
-        depends on CONFIG_XARGS
+        depends on XARGS
         help
           Default xargs unsupport single and double quotes
           and backslash for can use aruments with spaces.
 
-config CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT
+config FEATURE_XARGS_SUPPORT_TERMOPT
         bool "Enable support options -x"
         default n
-        depends on CONFIG_XARGS
+        depends on XARGS
         help
           Enable support exit if the size (see the -s or -n option)
           is exceeded.
 
-config CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM
+config FEATURE_XARGS_SUPPORT_ZERO_TERM
         bool "Enable null terminated option -0"
         default n
-        depends on CONFIG_XARGS
+        depends on XARGS
         help
           Enable input filenames are terminated by a null character
           instead of by whitespace, and the quotes and backslash
diff --git a/findutils/Kbuild b/findutils/Kbuild
new file mode 100644
index 000000000..7b504bacf
--- /dev/null
+++ b/findutils/Kbuild
@@ -0,0 +1,10 @@
+# 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_FIND)      += find.o
+lib-$(CONFIG_GREP)      += grep.o
+lib-$(CONFIG_XARGS)     += xargs.o
diff --git a/findutils/Makefile b/findutils/Makefile
deleted file mode 100644
index f152c8126..000000000
--- a/findutils/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)/findutils
-FINDUTILS_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/findutils/Makefile.in b/findutils/Makefile.in
deleted file mode 100644
index 25a2d38d3..000000000
--- a/findutils/Makefile.in
+++ /dev/null
@@ -1,31 +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.
-
-FINDUTILS_AR:=findutils.a
-ifndef $(FINDUTILS_DIR)
-FINDUTILS_DIR:=$(top_builddir)/findutils/
-endif
-srcdir=$(top_srcdir)/findutils
-
-FINDUTILS-y:=
-FINDUTILS-$(CONFIG_FIND)        += find.o
-FINDUTILS-$(CONFIG_GREP)        += grep.o
-FINDUTILS-$(CONFIG_XARGS)       += xargs.o
-
-ifneq ($(strip $(FINDUTILS-y)),)
-libraries-y+=$(FINDUTILS_DIR)$(FINDUTILS_AR)
-endif
-
-FINDUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(FINDUTILS-y))
-FINDUTILS_SRC-a:=$(wildcard $(srcdir)/*.c)
-APPLET_SRC-y+=$(FINDUTILS_SRC-y)
-APPLET_SRC-a+=$(FINDUTILS_SRC-a)
-
-$(FINDUTILS_DIR)$(FINDUTILS_AR): $(patsubst %,$(FINDUTILS_DIR)%, $(FINDUTILS-y))
-        $(do_ar)
-
-$(FINDUTILS_DIR)%.o: $(srcdir)/%.c
-        $(compile.c)