summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2006-03-13 19:04:00 +0000
committerBernhard Reutner-Fischer2006-03-13 19:04:00 +0000
commitdf10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch)
tree49493696039b285aa751a5bc884fc70c9c85e878 /init
parentc5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff)
downloadbusybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.zip
busybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz
- revert back to r14406
Diffstat (limited to 'init')
-rw-r--r--init/Makefile.in21
1 files changed, 14 insertions, 7 deletions
diff --git a/init/Makefile.in b/init/Makefile.in
index ef5eb1c..a48ead4 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)