aboutsummaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
commitdf10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch)
tree49493696039b285aa751a5bc884fc70c9c85e878 /loginutils
parentc5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff)
downloadbusybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz
busybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.bz2
- revert back to r14406
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/Makefile.in22
1 files changed, 15 insertions, 7 deletions
diff --git a/loginutils/Makefile.in b/loginutils/Makefile.in
index 959cb4f57..c11bbfc03 100644
--- 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
@@ -18,6 +22,9 @@ LOGINUTILS-$(CONFIG_VLOCK) += vlock.o
LOGINUTILS-$(CONFIG_DELUSER) += deluser.o
LOGINUTILS-$(CONFIG_DELGROUP) += delgroup.o
+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 +37,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)