move several applets to more correct ex-project. No code changes.

15 files changed, 78 insertions, 78 deletions

diff --git a/coreutils/Config.in b/coreutils/Config.in
index be5e9527b..cb5241ef6 100644
--- a/coreutils/Config.in
+++ b/coreutils/Config.in
@@ -65,13 +65,6 @@ config CKSUM
         help
           cksum is used to calculate the CRC32 checksum of a file.
 
-config CMP
-        bool "cmp"
-        default n
-        help
-          cmp is used to compare two files and returns the result
-          to standard output.
-
 config COMM
         bool "comm"
         default n
@@ -142,38 +135,6 @@ config DF
           df reports the amount of disk space used and available
           on filesystems.
 
-config DIFF
-        bool "diff"
-        default n
-        help
-          diff compares two files or directories and outputs the
-          differences between them in a form that can be given to
-          the patch command.
-
-config FEATURE_DIFF_BINARY
-        bool "Enable checks for binary files"
-        default y
-        depends on DIFF
-        help
-          This option enables support for checking for binary files
-          before a comparison is carried out.
-
-config FEATURE_DIFF_DIR
-        bool "Enable directory support"
-        default y
-        depends on DIFF
-        help
-          This option enables support for directory and subdirectory
-          comparison.
-
-config FEATURE_DIFF_MINIMAL
-        bool "Enable -d option to find smaller sets of changes"
-        default n
-        depends on DIFF
-        help
-          Enabling this option allows the use of -d to make diff
-          try hard to find the smallest possible set of changes.
-
 config DIRNAME
         bool "dirname"
         default n
@@ -474,6 +435,20 @@ config PWD
         help
           pwd is used to print the current directory.
 
+config READLINK
+        bool "readlink"
+        default n
+        help
+          This program reads a symbolic link and returns the name
+          of the file it points to
+
+config FEATURE_READLINK_FOLLOW
+        bool "Enable canonicalization by following all symlinks (-f)"
+        default n
+        depends on READLINK
+        help
+          Enable the readlink option (-f).
+
 config REALPATH
         bool "realpath"
         default n
@@ -704,14 +679,6 @@ config UUENCODE
         help
           uuencode is used to uuencode a file.
 
-config WATCH
-        bool "watch"
-        default n
-        select DATE
-        help
-          watch is used to execute a program periodically, showing
-          output to the screen.
-
 config WC
         bool "wc"
         default n
diff --git a/coreutils/Kbuild b/coreutils/Kbuild
index 1c6e6ed23..fd67d6c85 100644
--- a/coreutils/Kbuild
+++ b/coreutils/Kbuild
@@ -18,14 +18,12 @@ lib-$(CONFIG_CHMOD)     += chmod.o
 lib-$(CONFIG_CHOWN)     += chown.o
 lib-$(CONFIG_CHROOT)    += chroot.o
 lib-$(CONFIG_CKSUM)     += cksum.o
-lib-$(CONFIG_CMP)       += cmp.o
 lib-$(CONFIG_COMM)      += comm.o
 lib-$(CONFIG_CP)        += cp.o
 lib-$(CONFIG_CUT)       += cut.o
 lib-$(CONFIG_DATE)      += date.o
 lib-$(CONFIG_DD)        += dd.o
 lib-$(CONFIG_DF)        += df.o
-lib-$(CONFIG_DIFF)      += diff.o
 lib-$(CONFIG_DIRNAME)   += dirname.o
 lib-$(CONFIG_DOS2UNIX)  += dos2unix.o
 lib-$(CONFIG_DU)        += du.o
@@ -54,6 +52,7 @@ lib-$(CONFIG_OD)        += od.o
 lib-$(CONFIG_PRINTENV)  += printenv.o
 lib-$(CONFIG_PRINTF)    += printf.o
 lib-$(CONFIG_PWD)       += pwd.o
+lib-$(CONFIG_READLINK)  += readlink.o
 lib-$(CONFIG_REALPATH)  += realpath.o
 lib-$(CONFIG_RM)        += rm.o
 lib-$(CONFIG_RMDIR)     += rmdir.o
@@ -79,7 +78,6 @@ lib-$(CONFIG_UNIQ)      += uniq.o
 lib-$(CONFIG_USLEEP)    += usleep.o
 lib-$(CONFIG_UUDECODE)  += uudecode.o
 lib-$(CONFIG_UUENCODE)  += uuencode.o
-lib-$(CONFIG_WATCH)     += watch.o
 lib-$(CONFIG_WC)        += wc.o
 lib-$(CONFIG_WHO)       += who.o
 lib-$(CONFIG_WHOAMI)    += whoami.o
diff --git a/debianutils/readlink.c b/coreutils/readlink.c
index d454cbf19..d454cbf19 100644
--- a/debianutils/readlink.c
+++ b/coreutils/readlink.c
diff --git a/debianutils/Config.in b/debianutils/Config.in
index c49197666..50ccac803 100644
--- a/debianutils/Config.in
+++ b/debianutils/Config.in
@@ -17,20 +17,6 @@ config PIPE_PROGRESS
         help
           Display a dot to indicate pipe activity.
 
-config READLINK
-        bool "readlink"
-        default n
-        help
-          This program reads a symbolic link and returns the name
-          of the file it points to
-
-config FEATURE_READLINK_FOLLOW
-        bool "Enable canonicalization by following all symlinks (-f)"
-        default n
-        depends on READLINK
-        help
-          Enable the readlink option (-f).
-
 config RUN_PARTS
         bool "run-parts"
         default n
diff --git a/debianutils/Kbuild b/debianutils/Kbuild
index 99df6a536..bcf6126ad 100644
--- a/debianutils/Kbuild
+++ b/debianutils/Kbuild
@@ -5,9 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
-lib-$(CONFIG_MKTEMP)            += mktemp.o
-lib-$(CONFIG_PIPE_PROGRESS)     += pipe_progress.o
-lib-$(CONFIG_READLINK)          += readlink.o
-lib-$(CONFIG_RUN_PARTS)         += run_parts.o
-lib-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o
-lib-$(CONFIG_WHICH)             += which.o
+lib-$(CONFIG_MKTEMP)            += mktemp.o
+lib-$(CONFIG_PIPE_PROGRESS)     += pipe_progress.o
+lib-$(CONFIG_RUN_PARTS)         += run_parts.o
+lib-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o
+lib-$(CONFIG_WHICH)             += which.o
diff --git a/editors/Config.in b/editors/Config.in
index 936004c9b..3361d89f1 100644
--- a/editors/Config.in
+++ b/editors/Config.in
@@ -20,6 +20,45 @@ config FEATURE_AWK_MATH
           Enable math functions of the Awk programming language.
           NOTE: This will require libm to be present for linking.
 
+config CMP
+        bool "cmp"
+        default n
+        help
+          cmp is used to compare two files and returns the result
+          to standard output.
+
+config DIFF
+        bool "diff"
+        default n
+        help
+          diff compares two files or directories and outputs the
+          differences between them in a form that can be given to
+          the patch command.
+
+config FEATURE_DIFF_BINARY
+        bool "Enable checks for binary files"
+        default y
+        depends on DIFF
+        help
+          This option enables support for checking for binary files
+          before a comparison is carried out.
+
+config FEATURE_DIFF_DIR
+        bool "Enable directory support"
+        default y
+        depends on DIFF
+        help
+          This option enables support for directory and subdirectory
+          comparison.
+
+config FEATURE_DIFF_MINIMAL
+        bool "Enable -d option to find smaller sets of changes"
+        default n
+        depends on DIFF
+        help
+          Enabling this option allows the use of -d to make diff
+          try hard to find the smallest possible set of changes.
+
 config ED
         bool "ed"
         default n
diff --git a/editors/Kbuild b/editors/Kbuild
index d991e1faf..76302aa76 100644
--- a/editors/Kbuild
+++ b/editors/Kbuild
@@ -6,6 +6,8 @@
 
 lib-y:=
 lib-$(CONFIG_AWK)       += awk.o
+lib-$(CONFIG_CMP)       += cmp.o
+lib-$(CONFIG_DIFF)      += diff.o
 lib-$(CONFIG_ED)        += ed.o
 lib-$(CONFIG_PATCH)     += patch.o
 lib-$(CONFIG_SED)       += sed.o
diff --git a/coreutils/cmp.c b/editors/cmp.c
index e5dda80ff..e5dda80ff 100644
--- a/coreutils/cmp.c
+++ b/editors/cmp.c
diff --git a/coreutils/diff.c b/editors/diff.c
index 830c15ea6..830c15ea6 100644
--- a/coreutils/diff.c
+++ b/editors/diff.c
diff --git a/miscutils/Config.in b/miscutils/Config.in
index a1ed24368..170310fda 100644
--- a/miscutils/Config.in
+++ b/miscutils/Config.in
@@ -290,12 +290,6 @@ config MT
           to advance or rewind a tape past a specified number of archive
           files on the tape.
 
-config NMETER
-        bool "nmeter"
-        default n
-        help
-          nmeter prints various system parameters continuously.
-
 config RAIDAUTORUN
         bool "raidautorun"
         default n
diff --git a/miscutils/Kbuild b/miscutils/Kbuild
index 455113764..22b4564df 100644
--- a/miscutils/Kbuild
+++ b/miscutils/Kbuild
@@ -19,7 +19,6 @@ lib-$(CONFIG_LESS)        += less.o
 lib-$(CONFIG_MAKEDEVS)    += makedevs.o
 lib-$(CONFIG_MOUNTPOINT)  += mountpoint.o
 lib-$(CONFIG_MT)          += mt.o
-lib-$(CONFIG_NMETER)      += nmeter.o
 lib-$(CONFIG_RAIDAUTORUN) += raidautorun.o
 lib-$(CONFIG_READAHEAD)   += readahead.o
 lib-$(CONFIG_RUNLEVEL)    += runlevel.o
diff --git a/procps/Config.in b/procps/Config.in
index 91319103f..b834fbf96 100644
--- a/procps/Config.in
+++ b/procps/Config.in
@@ -43,6 +43,12 @@ config KILLALL5
         default n
         depends on KILL
 
+config NMETER
+        bool "nmeter"
+        default n
+        help
+          Prints selected system stats continuously, one line per update.
+
 config PIDOF
         bool "pidof"
         default n
@@ -130,6 +136,14 @@ config UPTIME
           the system has been running, how many users are currently logged
           on, and the system load averages for the past 1, 5, and 15 minutes.
 
+config WATCH
+        bool "watch"
+        default n
+        #huh?? select DATE
+        help
+          watch is used to execute a program periodically, showing
+          output to the screen.
+
 
 endmenu
 
diff --git a/procps/Kbuild b/procps/Kbuild
index 33f616fc2..c75be291b 100644
--- a/procps/Kbuild
+++ b/procps/Kbuild
@@ -6,12 +6,14 @@
 
 lib-y:=
 lib-$(CONFIG_FREE)      += free.o
+lib-$(CONFIG_FUSER)     += fuser.o
 lib-$(CONFIG_KILL)      += kill.o
 lib-$(CONFIG_ASH)       += kill.o  # used for built-in kill by ash
+lib-$(CONFIG_NMETER)    += nmeter.o
 lib-$(CONFIG_PIDOF)     += pidof.o
 lib-$(CONFIG_PS)        += ps.o
 lib-$(CONFIG_RENICE)    += renice.o
 lib-$(CONFIG_BB_SYSCTL) += sysctl.o
 lib-$(CONFIG_TOP)       += top.o
 lib-$(CONFIG_UPTIME)    += uptime.o
-lib-$(CONFIG_FUSER)     += fuser.o
+lib-$(CONFIG_WATCH)     += watch.o
diff --git a/miscutils/nmeter.c b/procps/nmeter.c
index 1d58eb2c1..1d58eb2c1 100644
--- a/miscutils/nmeter.c
+++ b/procps/nmeter.c
diff --git a/coreutils/watch.c b/procps/watch.c
index 2ad0564cd..2ad0564cd 100644
--- a/coreutils/watch.c
+++ b/procps/watch.c