2 files changed, 49 insertions, 22 deletions

diff --git a/console-tools/Makefile b/console-tools/Makefile
index a67e4bb7b..2cea319ad 100644
--- a/console-tools/Makefile
+++ b/console-tools/Makefile
@@ -1,6 +1,6 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+# Copyright (C) 1999-2002 Erik Andersen <andersee@debian.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
@@ -17,27 +17,14 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-TOPDIR   :=..
-L_TARGET := console-tools.a
-
-obj-y           :=
-obj-n           :=
-obj-            :=
-
-obj-$(CONFIG_CHVT)              += chvt.o
-obj-$(CONFIG_CLEAR)             += clear.o
-obj-$(CONFIG_DEALLOCVT)         += deallocvt.o
-obj-$(CONFIG_DUMPKMAP)          += dumpkmap.o
-obj-$(CONFIG_LOADACM)           += loadacm.o
-obj-$(CONFIG_LOADFONT)          += loadfont.o
-obj-$(CONFIG_LOADKMAP)          += loadkmap.o
-obj-$(CONFIG_RESET)             += reset.o
-obj-$(CONFIG_SETKEYCODES)       += setkeycodes.o
-
-
-# Hand off to toplevel Rules.mak
-include $(TOPDIR)/Rules.mak
+TOPDIR:= ../
+CONSOLETOOLS_DIR:=./
+include $(TOPDIR).config
+include $(TOPDIR)Rules.mak
+include Makefile.in
+all: $(libraries-y)
+-include $(TOPDIR).depend
 
 clean:
-        rm -f $(L_TARGET) *.o core
+        rm -f *.o *.a $(AR_TARGET)
 
diff --git a/console-tools/Makefile.in b/console-tools/Makefile.in
new file mode 100644
index 000000000..bc0335643
--- /dev/null
+++ b/console-tools/Makefile.in
@@ -0,0 +1,40 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999-2002 Erik Andersen <andersee@debian.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
+#
+
+CONSOLETOOLS_AR:=console-tools.a
+ifndef $(CONSOLETOOLS_DIR)
+CONSOLETOOLS_DIR:=$(TOPDIR)console-tools/
+endif
+
+CONSOLETOOLS_DIR-y:=
+CONSOLETOOLS_DIR-$(CONFIG_CHVT)         += chvt.o
+CONSOLETOOLS_DIR-$(CONFIG_CLEAR)        += clear.o
+CONSOLETOOLS_DIR-$(CONFIG_DEALLOCVT)    += deallocvt.o
+CONSOLETOOLS_DIR-$(CONFIG_DUMPKMAP)     += dumpkmap.o
+CONSOLETOOLS_DIR-$(CONFIG_LOADACM)      += loadacm.o
+CONSOLETOOLS_DIR-$(CONFIG_LOADFONT)     += loadfont.o
+CONSOLETOOLS_DIR-$(CONFIG_LOADKMAP)     += loadkmap.o
+CONSOLETOOLS_DIR-$(CONFIG_RESET)        += reset.o
+CONSOLETOOLS_DIR-$(CONFIG_SETKEYCODES)  += setkeycodes.o
+
+libraries-y+=$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR)
+
+$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR): $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS_DIR-y))
+        $(AR) -ro $@ $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS_DIR-y))
+