aboutsummaryrefslogtreecommitdiff
path: root/console-tools
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
commitdf10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch)
tree49493696039b285aa751a5bc884fc70c9c85e878 /console-tools
parentc5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff)
downloadbusybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz
busybox-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.bz2
- revert back to r14406
Diffstat (limited to 'console-tools')
-rw-r--r--console-tools/Makefile.in33
1 files changed, 19 insertions, 14 deletions
diff --git a/console-tools/Makefile.in b/console-tools/Makefile.in
index 7994e0f08..f14e338e1 100644
--- a/console-tools/Makefile.in
+++ b/console-tools/Makefile.in
@@ -4,29 +4,34 @@
#
# Licensed under the GPL v2, see the file LICENSE in this tarball.
-srcdir:=$(top_srcdir)/console-tools
-objdir:=$(top_builddir)/console-tools
+CONSOLETOOLS_AR:=console-tools.a
+ifndef $(CONSOLETOOLS_DIR)
+CONSOLETOOLS_DIR:=$(top_builddir)/console-tools/
+endif
+srcdir=$(top_srcdir)/console-tools
+CONSOLETOOLS-y:=
CONSOLETOOLS-$(CONFIG_CHVT) += chvt.o
-CONSOLETOOLS-$(CONFIG_CLEAR) += clear.o
+CONSOLETOOLS-$(CONFIG_CLEAR) += clear.o
CONSOLETOOLS-$(CONFIG_DEALLOCVT) += deallocvt.o
-CONSOLETOOLS-$(CONFIG_DUMPKMAP) += dumpkmap.o
+CONSOLETOOLS-$(CONFIG_DUMPKMAP) += dumpkmap.o
CONSOLETOOLS-$(CONFIG_SETCONSOLE) += setconsole.o
-CONSOLETOOLS-$(CONFIG_LOADFONT) += loadfont.o
-CONSOLETOOLS-$(CONFIG_LOADKMAP) += loadkmap.o
-CONSOLETOOLS-$(CONFIG_OPENVT) += openvt.o
-CONSOLETOOLS-$(CONFIG_RESET) += reset.o
+CONSOLETOOLS-$(CONFIG_LOADFONT) += loadfont.o
+CONSOLETOOLS-$(CONFIG_LOADKMAP) += loadkmap.o
+CONSOLETOOLS-$(CONFIG_OPENVT) += openvt.o
+CONSOLETOOLS-$(CONFIG_RESET) += reset.o
CONSOLETOOLS-$(CONFIG_SETKEYCODES) += setkeycodes.o
-
+ifneq ($(strip $(CONSOLETOOLS-y)),)
+libraries-y+=$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR)
+endif
CONSOLETOOLS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(CONSOLETOOLS-y))
CONSOLETOOLS_SRC-a:=$(wildcard $(srcdir)/*.c)
APPLET_SRC-y+=$(CONSOLETOOLS_SRC-y)
APPLET_SRC-a+=$(CONSOLETOOLS_SRC-a)
-console-tools_OBJ:= $(patsubst %,$(objdir)/%,$(CONSOLETOOLS-y))
-
-$(console-tools_OBJ): $(objdir)/%.o: $(srcdir)/%.c
-$(objdir)/console-tools.a: $(console-tools_OBJ)
-libraries-y:=$(libraries-y) $(objdir)/console-tools.a
+$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR): $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS-y))
+ $(do_ar)
+$(CONSOLETOOLS_DIR)%.o: $(srcdir)/%.c
+ $(compile.c)