From df10094870c28cc0c6c5577c9aa03b8ede9cb8a6 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Mon, 13 Mar 2006 19:04:00 +0000
Subject: - revert back to r14406

---
 init/Makefile.in | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'init')

diff --git a/init/Makefile.in b/init/Makefile.in
index ef5eb1c58..a48ead446 100644
--- a/init/Makefile.in
+++ b/init/Makefile.in
@@ -4,9 +4,13 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
-srcdir:=$(top_srcdir)/init
-objdir:=$(top_builddir)/init
+INIT_AR:=init.a
+ifndef $(INIT_DIR)
+INIT_DIR:=$(top_builddir)/init/
+endif
+srcdir=$(top_srcdir)/init
 
+INIT-y:=
 INIT-$(CONFIG_HALT)			+= halt.o
 INIT-$(CONFIG_INIT)			+= init.o
 INIT-$(CONFIG_MESG)			+= mesg.o
@@ -23,14 +27,17 @@ endif
 
 INIT-$(CONFIG_INIT_SHARED)        += init_shared.o
 
+ifneq ($(strip $(INIT-y)),)
+libraries-y+=$(INIT_DIR)$(INIT_AR)
+endif
+
 INIT_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(INIT-y))
 INIT_SRC-a:=$(wildcard $(srcdir)/*.c)
 APPLET_SRC-y+=$(INIT_SRC-y)
 APPLET_SRC-a+=$(INIT_SRC-a)
 
-init_OBJ:=  $(patsubst %,$(objdir)/%,$(INIT-y))
-
-$(init_OBJ): $(objdir)/%.o: $(srcdir)/%.c
-$(objdir)/init.a: $(init_OBJ)
-libraries-y:=$(libraries-y) $(objdir)/init.a
+$(INIT_DIR)$(INIT_AR): $(patsubst %,$(INIT_DIR)%, $(INIT-y))
+	$(do_ar)
 
+$(INIT_DIR)%.o: $(srcdir)/%.c
+	$(compile.c)
-- 
cgit v1.2.3