- fixes parallel builds (make -j)

- use less resources for the buildsystem itself


git-svn-id: svn://busybox.net/trunk/busybox@14407 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 8 insertions, 18 deletions

diff --git a/shell/Makefile.in b/shell/Makefile.in
index fcd93f345..43e2acd09 100644
--- a/shell/Makefile.in
+++ b/shell/Makefile.in
@@ -4,30 +4,20 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
-SHELL_AR:=shell.a
-ifndef $(SHELL_DIR)
-SHELL_DIR:=$(top_builddir)/shell/
-endif
 srcdir=$(top_srcdir)/shell
+objdir=$(top_builddir)/shell
 
-SHELLT-y:=
-SHELLT-$(CONFIG_ASH)                            += ash.o
-SHELLT-$(CONFIG_HUSH)                           += hush.o
-SHELLT-$(CONFIG_LASH)                           += lash.o
-SHELLT-$(CONFIG_MSH)                            += msh.o
-SHELLT-$(CONFIG_FEATURE_COMMAND_EDITING)        += cmdedit.o
+SHELL-$(CONFIG_ASH)                             += ash.o
+SHELL-$(CONFIG_HUSH)                            += hush.o
+SHELL-$(CONFIG_LASH)                            += lash.o
+SHELL-$(CONFIG_MSH)                             += msh.o
+SHELL-$(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-y:=$(patsubst %.o,$(srcdir)/%.c,$(SHELL-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))
-        $(do_ar)
+shell_OBJ:=  $(patsubst %,$(objdir)/%,$(SHELL-y))
 
-$(SHELL_DIR)%.o: $(srcdir)/%.c
-        $(compile.c)