Announce 1.2.1

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

diff --git a/loginutils/Makefile.in b/loginutils/Makefile.in
index cb8733f42c6faabadc4408722e2092adcd83c206..0063762ab5cce71a4a739e31fe58250dacb42d69 100644 (file)
--- a/loginutils/Makefile.in
+++ b/loginutils/Makefile.in
@@ -1,21 +1,8 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# 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
@@ -33,9 +20,18 @@ 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)
+APPLET_SRC-y+=$(LOGINUTILS_SRC-y)
+APPLET_SRC-a+=$(LOGINUTILS_SRC-a)
 
 needcrypt-y:=
 needcrypt-$(CONFIG_LOGIN)      := y
@@ -46,12 +42,11 @@ needcrypt-$(CONFIG_VLOCK)   := y
 
 
 ifeq ($(needcrypt-y),y)
-  LIBRARIES += -lcrypt
+  LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES))
 endif
 
 $(LOGINUTILS_DIR)$(LOGINUTILS_AR): $(patsubst %,$(LOGINUTILS_DIR)%, $(LOGINUTILS-y))
-       $(AR) $(ARFLAGS) $@ $(patsubst %,$(LOGINUTILS_DIR)%, $(LOGINUTILS-y))
+       $(do_ar)
 
 $(LOGINUTILS_DIR)%.o: $(srcdir)/%.c
-       $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-
+       $(compile.c)