4 files changed, 51 insertions, 109 deletions
diff --git a/loginutils/Config.in b/loginutils/Config.in
index 6e45b706a..f434585ef 100644
--- a/loginutils/Config.in
+++ b/loginutils/Config.in
@@ -5,7 +5,7 @@
 menu "Login/Password Management Utilities"
-config CONFIG_FEATURE_SHADOWPASSWDS
+config FEATURE_SHADOWPASSWDS
        bool "Support for shadow passwords"
        default n
        help
@@ -13,10 +13,10 @@ config CONFIG_FEATURE_SHADOWPASSWDS
          readable by root and thus the encrypted passwords are no longer
          publicly readable.
-config CONFIG_USE_BB_SHADOW
+config USE_BB_SHADOW
        bool "  Use busybox shadow password functions"
        default y
-        depends on CONFIG_USE_BB_PWD_GRP && CONFIG_FEATURE_SHADOWPASSWDS
+        depends on USE_BB_PWD_GRP && FEATURE_SHADOWPASSWDS
        help
            If you leave this disabled, busybox will use the system's shadow
            password handling functions.  And if you are using the GNU C library
@@ -32,7 +32,7 @@ config CONFIG_USE_BB_SHADOW
            able to use PAM to access shadow passwords from remote LDAP
            password servers and whatnot.
-config CONFIG_USE_BB_PWD_GRP
+config USE_BB_PWD_GRP
        bool "Use internal password and group functions rather than system functions"
        default n
        help
@@ -53,86 +53,86 @@ config CONFIG_USE_BB_PWD_GRP
            If you enable this option, it will add about 1.5k to busybox.
-config CONFIG_ADDGROUP
+config ADDGROUP
        bool "addgroup"
        default n
        help
          Utility for creating a new group account.
-config CONFIG_DELGROUP
+config DELGROUP
        bool "delgroup"
        default n
        help
          Utility for deleting a group account.
-config CONFIG_ADDUSER
+config ADDUSER
        bool "adduser"
        default n
        help
          Utility for creating a new user account.
-config CONFIG_DELUSER
+config DELUSER
        bool "deluser"
        default n
        help
          Utility for deleting a user account.
-config CONFIG_GETTY
+config GETTY
        bool "getty"
        default n
-        select CONFIG_FEATURE_SYSLOG
+        select FEATURE_SYSLOG
        help
          getty lets you log in on a tty, it is normally invoked by init.
-config CONFIG_FEATURE_UTMP
+config FEATURE_UTMP
        bool "Support utmp file"
-        depends on CONFIG_GETTY || CONFIG_LOGIN || CONFIG_SU || CONFIG_WHO
+        depends on GETTY || LOGIN || SU || WHO
        default n
        help
          The file /var/run/utmp is used to track who is currently logged in.
-config CONFIG_FEATURE_WTMP
+config FEATURE_WTMP
        bool "Support wtmp file"
-        depends on CONFIG_GETTY || CONFIG_LOGIN || CONFIG_SU || CONFIG_LAST
+        depends on GETTY || LOGIN || SU || LAST
        default n
-        select CONFIG_FEATURE_UTMP
+        select FEATURE_UTMP
        help
          The file /var/run/wtmp is used to track when user's have logged into
          and logged out of the system.
-config CONFIG_LOGIN
+config LOGIN
        bool "login"
        default n
-        select CONFIG_FEATURE_SUID
+        select FEATURE_SUID
-        select CONFIG_FEATURE_SYSLOG
+        select FEATURE_SYSLOG
        help
          login is used when signing onto a system.
          Note that Busybox binary must be setuid root for this applet to
          work properly.
-config CONFIG_LOGIN_SCRIPTS
+config LOGIN_SCRIPTS
        bool "Support for login scripts"
-        depends on CONFIG_LOGIN
+        depends on LOGIN
        default n
        help
          Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT
          just prior to swithching from root to logged-in user.
-config CONFIG_FEATURE_SECURETTY
+config FEATURE_SECURETTY
        bool "Support for /etc/securetty"
        default y
-        depends on CONFIG_LOGIN
+        depends on LOGIN
        help
          The file  /etc/securetty  is used by (some versions of) login(1).
          The file contains the device names of tty lines (one per line,
          without leading /dev/) on which root is allowed to login.
-config CONFIG_PASSWD
+config PASSWD
        bool "passwd"
        default n
-        select CONFIG_FEATURE_SUID
+        select FEATURE_SUID
-        select CONFIG_FEATURE_SYSLOG
+        select FEATURE_SYSLOG
        help
          passwd changes passwords for user and group accounts.  A normal user
          may only change the password for his/her own account, the super user
@@ -142,11 +142,11 @@ config CONFIG_PASSWD
          Note that Busybox binary must be setuid root for this applet to
          work properly.
-config CONFIG_SU
+config SU
        bool "su"
        default n
-        select CONFIG_FEATURE_SUID
+        select FEATURE_SUID
-        select CONFIG_FEATURE_SYSLOG
+        select FEATURE_SYSLOG
        help
          su is used to become another user during a login session.
          Invoked without a username, su defaults to becoming the super user.
@@ -154,25 +154,25 @@ config CONFIG_SU
          Note that Busybox binary must be setuid root for this applet to
          work properly.
-config CONFIG_SU_SYSLOG
+config SU_SYSLOG
        bool "Support for syslog in su"
        default y
-        depends on CONFIG_SU
+        depends on SU
        help
          Enables support for syslog in su.
-config CONFIG_SULOGIN
+config SULOGIN
        bool "sulogin"
        default n
-        select CONFIG_FEATURE_SYSLOG
+        select FEATURE_SYSLOG
        help
          sulogin is invoked when the system goes into single user
          mode (this is done through an entry in inittab).
-config CONFIG_VLOCK
+config VLOCK
        bool "vlock"
        default n
-        select CONFIG_FEATURE_SUID
+        select FEATURE_SUID
        help
          Build the "vlock" applet which allows you to lock (virtual) terminals.
diff --git a/loginutils/Kbuild b/loginutils/Kbuild
new file mode 100644
index 000000000..6c9d193e1
--- /dev/null
+++ b/loginutils/Kbuild
@@ -0,0 +1,17 @@
+# 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_ADDGROUP)  += addgroup.o
+lib-$(CONFIG_ADDUSER)   += adduser.o
+lib-$(CONFIG_GETTY)     += getty.o
+lib-$(CONFIG_LOGIN)     += login.o
+lib-$(CONFIG_PASSWD)    += passwd.o
+lib-$(CONFIG_SU)        += su.o
+lib-$(CONFIG_SULOGIN)   += sulogin.o
+lib-$(CONFIG_VLOCK)     += vlock.o
+lib-$(CONFIG_DELUSER)   += deluser.o
+lib-$(CONFIG_DELGROUP)  += deluser.o
diff --git a/loginutils/Makefile b/loginutils/Makefile
deleted file mode 100644
index b81f42964..000000000
--- a/loginutils/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)/loginutils
-LOGINUTILS_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/loginutils/Makefile.in b/loginutils/Makefile.in
deleted file mode 100644
index 0063762ab..000000000
--- a/loginutils/Makefile.in
+++ /dev/null
@@ -1,52 +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.
-LOGINUTILS_AR:=loginutils.a
-ifndef LOGINUTILS_DIR
-LOGINUTILS_DIR:=$(top_builddir)/loginutils/
-endif
-srcdir=$(top_srcdir)/loginutils
-LOGINUTILS-y:=
-LOGINUTILS-$(CONFIG_ADDGROUP)   += addgroup.o
-LOGINUTILS-$(CONFIG_ADDUSER)    += adduser.o
-LOGINUTILS-$(CONFIG_GETTY)      += getty.o
-LOGINUTILS-$(CONFIG_LOGIN)      += login.o
-LOGINUTILS-$(CONFIG_PASSWD)     += passwd.o
-LOGINUTILS-$(CONFIG_SU)         += su.o
-LOGINUTILS-$(CONFIG_SULOGIN)    += sulogin.o
-LOGINUTILS-$(CONFIG_VLOCK)      += vlock.o
-LOGINUTILS-$(CONFIG_DELUSER)    += deluser.o
-LOGINUTILS-$(CONFIG_DELGROUP)   += deluser.o
-LOGINUTILS-y:=$(sort $(LOGINUTILS-y))
-ifneq ($(strip $(LOGINUTILS-y)),)
-libraries-y+=$(LOGINUTILS_DIR)$(LOGINUTILS_AR)
-endif
-LOGINUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(LOGINUTILS-y))
-LOGINUTILS_SRC-a:=$(wildcard $(srcdir)/*.c)
-APPLET_SRC-y+=$(LOGINUTILS_SRC-y)
-APPLET_SRC-a+=$(LOGINUTILS_SRC-a)
-needcrypt-y:=
-needcrypt-$(CONFIG_LOGIN)       := y
-needcrypt-$(CONFIG_PASSWD)      := y
-needcrypt-$(CONFIG_SU)          := y
-needcrypt-$(CONFIG_SULOGIN)     := y
-needcrypt-$(CONFIG_VLOCK)       := y
-ifeq ($(needcrypt-y),y)
-  LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES))
-endif
-$(LOGINUTILS_DIR)$(LOGINUTILS_AR): $(patsubst %,$(LOGINUTILS_DIR)%, $(LOGINUTILS-y))
-        $(do_ar)
-$(LOGINUTILS_DIR)%.o: $(srcdir)/%.c
-        $(compile.c)