Patch from Jason Schoon to add optional SIGUSR1 support to dd.

[oweals/busybox.git] / loginutils / Makefile.in

diff --git a/loginutils/Makefile.in b/loginutils/Makefile.in
index 959cb4f57e4abb6d272cbe4c9886faa915ec2d2c..0063762ab5cce71a4a739e31fe58250dacb42d69 100644 (file)
--- a/loginutils/Makefile.in
+++ b/loginutils/Makefile.in
@@ -4,9 +4,13 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
-srcdir:=$(top_srcdir)/loginutils
-objdir:=$(top_builddir)/loginutils
+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
@@ -16,8 +20,13 @@ LOGINUTILS-$(CONFIG_SU)              += su.o
 LOGINUTILS-$(CONFIG_SULOGIN)   += sulogin.o
 LOGINUTILS-$(CONFIG_VLOCK)     += vlock.o
 LOGINUTILS-$(CONFIG_DELUSER)   += deluser.o
-LOGINUTILS-$(CONFIG_DELGROUP)  += delgroup.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)
@@ -30,13 +39,14 @@ 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_OBJ:=  $(patsubst %,$(objdir)/%,$(LOGINUTILS-y))
-
-$(loginutils_OBJ): $(objdir)/%.o: $(srcdir)/%.c
-$(objdir)/loginutils.a: $(loginutils_OBJ)
-libraries-y:=$(libraries-y) $(objdir)/loginutils.a
+$(LOGINUTILS_DIR)$(LOGINUTILS_AR): $(patsubst %,$(LOGINUTILS_DIR)%, $(LOGINUTILS-y))
+       $(do_ar)
 
+$(LOGINUTILS_DIR)%.o: $(srcdir)/%.c
+       $(compile.c)