4 files changed, 29 insertions, 72 deletions

diff --git a/sysklogd/Config.in b/sysklogd/Config.in
index 399315208..9875b3c12 100644
--- a/sysklogd/Config.in
+++ b/sysklogd/Config.in
@@ -5,7 +5,7 @@
 
 menu "System Logging Utilities"
 
-config CONFIG_SYSLOGD
+config SYSLOGD
         bool "syslogd"
         default n
         help
@@ -20,18 +20,18 @@ config CONFIG_SYSLOGD
           wrong.  And something almost always will go wrong if
           you wait long enough....
 
-config CONFIG_FEATURE_ROTATE_LOGFILE
+config FEATURE_ROTATE_LOGFILE
         bool "Rotate message files"
         default n
-        depends on CONFIG_SYSLOGD
+        depends on SYSLOGD
         help
           This enables syslogd to rotate the message files
           on his own. No need to use an external rotatescript.
 
-config CONFIG_FEATURE_REMOTE_LOG
+config FEATURE_REMOTE_LOG
         bool "Remote Log support"
         default n
-        depends on CONFIG_SYSLOGD
+        depends on SYSLOGD
         help
           When you enable this feature, the syslogd utility can
           be used to send system log messages to another system
@@ -42,10 +42,10 @@ config CONFIG_FEATURE_REMOTE_LOG
           measure to prevent system logs from being tampered with
           by an intruder.
 
-config CONFIG_FEATURE_IPC_SYSLOG
+config FEATURE_IPC_SYSLOG
         bool "Circular Buffer support"
         default n
-        depends on CONFIG_SYSLOGD
+        depends on SYSLOGD
         help
           When you enable this feature, the syslogd utility will
           use a circular buffer to record system log messages.
@@ -56,28 +56,28 @@ config CONFIG_FEATURE_IPC_SYSLOG
           entire filesystem, which may cause your system to
           break badly.
 
-config CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE
+config FEATURE_IPC_SYSLOG_BUFFER_SIZE
         int "    Circular buffer size in Kbytes (minimum 4KB)"
         default 16
-        depends on CONFIG_FEATURE_IPC_SYSLOG
+        depends on FEATURE_IPC_SYSLOG
         help
           This option sets the size of the circular buffer
           used to record system log messages.
 
-config CONFIG_LOGREAD
+config LOGREAD
         bool "logread"
         default y
-        depends on CONFIG_FEATURE_IPC_SYSLOG
+        depends on FEATURE_IPC_SYSLOG
         help
           If you enabled Circular Buffer support, you almost
           certainly want to enable this feature as well.  This
           utility will allow you to read the messages that are
           stored in the syslogd circular buffer.
 
-config CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
+config FEATURE_LOGREAD_REDUCED_LOCKING
         bool "logread double buffering"
         default n
-        depends on CONFIG_LOGREAD
+        depends on LOGREAD
         help
           'logread' ouput to slow serial terminals can have
           side effects on syslog because of the semaphore.
@@ -85,11 +85,11 @@ config CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
           from circular buffer, minimizing semaphore
           contention at some minor memory expense.
 
-config CONFIG_KLOGD
+config KLOGD
         bool "klogd"
         default n
-        depends on CONFIG_SYSLOGD
-        select CONFIG_FEATURE_SYSLOG
+        depends on SYSLOGD
+        select FEATURE_SYSLOG
         help
           klogd is a utility which intercepts and logs all
           messages from the Linux kernel and sends the messages
@@ -97,10 +97,10 @@ config CONFIG_KLOGD
           you wish to record the messages produced by the kernel,
           you should enable this option.
 
-config CONFIG_LOGGER
+config LOGGER
         bool "logger"
         default n
-        select CONFIG_FEATURE_SYSLOG
+        select FEATURE_SYSLOG
         help
             The logger utility allows you to send arbitrary text
             messages to the system log (i.e. the 'syslogd' utility) so
diff --git a/sysklogd/Kbuild b/sysklogd/Kbuild
new file mode 100644
index 000000000..0d5b2b929
--- /dev/null
+++ b/sysklogd/Kbuild
@@ -0,0 +1,11 @@
+# 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_KLOGD)             += klogd.o
+lib-$(CONFIG_LOGGER)            += logger.o
+lib-$(CONFIG_LOGREAD)           += logread.o
+lib-$(CONFIG_SYSLOGD)           += syslogd.o
diff --git a/sysklogd/Makefile b/sysklogd/Makefile
deleted file mode 100644
index 0ae4f1d35..000000000
--- a/sysklogd/Makefile
+++ /dev/null
@@ -1,22 +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)/sysklogd
-SYSKLOGD_DIR:=./
-include $(top_srcdir)/Rules.mak
-include $(top_builddir)/.config
-include Makefile.in
-all: $(libraries-y)
--include $(top_builddir)/.depend
-
-clean:
-        rm -f *.o *.a $(AR_TARGET)
diff --git a/sysklogd/Makefile.in b/sysklogd/Makefile.in
deleted file mode 100644
index 83f77be90..000000000
--- a/sysklogd/Makefile.in
+++ /dev/null
@@ -1,32 +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.
-
-SYSKLOGD_AR:=sysklogd.a
-ifndef $(SYSKLOGD_DIR)
-SYSKLOGD_DIR:=$(top_builddir)/sysklogd/
-endif
-srcdir=$(top_srcdir)/sysklogd
-
-SYSKLOGD-y:=
-SYSKLOGD-$(CONFIG_KLOGD)                += klogd.o
-SYSKLOGD-$(CONFIG_LOGGER)               += logger.o
-SYSKLOGD-$(CONFIG_LOGREAD)              += logread.o
-SYSKLOGD-$(CONFIG_SYSLOGD)              += syslogd.o
-
-ifneq ($(strip $(SYSKLOGD-y)),)
-libraries-y+=$(SYSKLOGD_DIR)$(SYSKLOGD_AR)
-endif
-
-SYSKLOGD_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(SYSKLOGD-y))
-SYSKLOGD_SRC-a:=$(wildcard $(srcdir)/*.c)
-APPLET_SRC-y+=$(SYSKLOGD_SRC-y)
-APPLET_SRC-a+=$(SYSKLOGD_SRC-a)
-
-$(SYSKLOGD_DIR)$(SYSKLOGD_AR): $(patsubst %,$(SYSKLOGD_DIR)%, $(SYSKLOGD-y))
-        $(do_ar)
-
-$(SYSKLOGD_DIR)%.o: $(srcdir)/%.c
-        $(compile.c)