Patch from Denis Vlasenko, tweak error messages.

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

diff --git a/shell/Makefile.in b/shell/Makefile.in
index c5be7ba7959e58ec6052327329439ca0751ba4f3..fcd93f34509b9a86d1048431b52c7ff054858400 100644 (file)
--- a/shell/Makefile.in
+++ b/shell/Makefile.in
@@ -1,26 +1,14 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 1999-2005 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
-
+# Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 SHELL_AR:=shell.a
 ifndef $(SHELL_DIR)
-SHELL_DIR:=$(TOPDIR)shell/
+SHELL_DIR:=$(top_builddir)/shell/
 endif
+srcdir=$(top_srcdir)/shell
 
 SHELLT-y:=
 SHELLT-$(CONFIG_ASH)                           += ash.o
@@ -29,8 +17,17 @@ SHELLT-$(CONFIG_LASH)                                += lash.o
 SHELLT-$(CONFIG_MSH)                           += msh.o
 SHELLT-$(CONFIG_FEATURE_COMMAND_EDITING)       += cmdedit.o
 
+ifneq ($(strip $(SHELLT-y)),)
 libraries-y+=$(SHELL_DIR)$(SHELL_AR)
+endif
+
+SHELLT_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(SHELLT-y))
+SHELLT_SRC-a:=$(wildcard $(srcdir)/*.c)
+APPLET_SRC-y+=$(SHELLT_SRC-y)
+APPLET_SRC-a+=$(SHELLT_SRC-a)
 
 $(SHELL_DIR)$(SHELL_AR): $(patsubst %,$(SHELL_DIR)%, $(SHELLT-y))
-       $(AR) -ro $@ $(patsubst %,$(SHELL_DIR)%, $(SHELLT-y))
+       $(do_ar)
 
+$(SHELL_DIR)%.o: $(srcdir)/%.c
+       $(compile.c)