From 7d219aab70e6951ab82c27c202cac05016696723 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 5 Oct 2006 10:17:08 +0000 Subject: build system overhaul --- console-tools/Config.in | 26 +++++++++++++------------- console-tools/Kbuild | 18 ++++++++++++++++++ console-tools/Makefile | 23 ----------------------- console-tools/Makefile.in | 38 -------------------------------------- 4 files changed, 31 insertions(+), 74 deletions(-) create mode 100644 console-tools/Kbuild delete mode 100644 console-tools/Makefile delete mode 100644 console-tools/Makefile.in (limited to 'console-tools') diff --git a/console-tools/Config.in b/console-tools/Config.in index ec2273c35..f1dbac531 100644 --- a/console-tools/Config.in +++ b/console-tools/Config.in @@ -5,81 +5,81 @@ menu "Console Utilities" -config CONFIG_CHVT +config CHVT bool "chvt" default n help This program is used to change to another terminal. Example: chvt 4 (change to terminal /dev/tty4) -config CONFIG_CLEAR +config CLEAR bool "clear" default n help This program clears the terminal screen. -config CONFIG_DEALLOCVT +config DEALLOCVT bool "deallocvt" default n help This program deallocates unused virtual consoles. -config CONFIG_DUMPKMAP +config DUMPKMAP bool "dumpkmap" default n help This program dumps the kernel's keyboard translation table to stdout, in binary format. You can then use loadkmap to load it. -config CONFIG_LOADFONT +config LOADFONT bool "loadfont" default n help This program loads a console font from standard input. -config CONFIG_LOADKMAP +config LOADKMAP bool "loadkmap" default n help This program loads a keyboard translation table from standard input. -config CONFIG_OPENVT +config OPENVT bool "openvt" default n help This program is used to start a command on an unused virtual terminal. -config CONFIG_RESET +config RESET bool "reset" default n help This program is used to reset the terminal screen, if it gets messed up. -config CONFIG_SETCONSOLE +config SETCONSOLE bool "setconsole" default n help This program redirects the system console to another device, like the current tty while logged in via telnet. -config CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS +config FEATURE_SETCONSOLE_LONG_OPTIONS bool "Enable long options" default n - depends on CONFIG_SET_CONSOLE && CONFIG_GETOPT_LONG + depends on SET_CONSOLE && GETOPT_LONG help Support long options for the setconsole applet. -config CONFIG_SETKEYCODES +config SETKEYCODES bool "setkeycodes" default n help This program loads entries into the kernel's scancode-to-keycode map, allowing unusual keyboards to generate usable keycodes. -config CONFIG_SETLOGCONS +config SETLOGCONS bool "setlogcons" default n help diff --git a/console-tools/Kbuild b/console-tools/Kbuild new file mode 100644 index 000000000..8e377c559 --- /dev/null +++ b/console-tools/Kbuild @@ -0,0 +1,18 @@ +# Makefile for busybox +# +# Copyright (C) 1999-2005 by Erik Andersen +# +# Licensed under the GPL v2, see the file LICENSE in this tarball. + +lib-y:= +lib-$(CONFIG_CHVT) += chvt.o +lib-$(CONFIG_CLEAR) += clear.o +lib-$(CONFIG_DEALLOCVT) += deallocvt.o +lib-$(CONFIG_DUMPKMAP) += dumpkmap.o +lib-$(CONFIG_SETCONSOLE) += setconsole.o +lib-$(CONFIG_LOADFONT) += loadfont.o +lib-$(CONFIG_LOADKMAP) += loadkmap.o +lib-$(CONFIG_OPENVT) += openvt.o +lib-$(CONFIG_RESET) += reset.o +lib-$(CONFIG_SETKEYCODES) += setkeycodes.o +lib-$(CONFIG_SETLOGCONS) += setlogcons.o diff --git a/console-tools/Makefile b/console-tools/Makefile deleted file mode 100644 index 87a242b51..000000000 --- a/console-tools/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2005 by Erik Andersen -# -# Licensed under the GPL v2, see the file LICENSE in this tarball. - -ifndef top_srcdir -top_srcdir=.. -endif -ifndef top_builddir -top_builddir=.. -endif -srcdir=$(top_srcdir)/console/tools -CONSOLETOOLS_DIR:=./ -include $(top_srcdir)/Rules.mak -include $(top_builddir)/.config -include $(srcdir)/Makefile.in -all: $(libraries-y) --include $(top_builddir)/.depend - -clean: - rm -f *.o *.a $(AR_TARGET) - diff --git a/console-tools/Makefile.in b/console-tools/Makefile.in deleted file mode 100644 index 437bcd0ec..000000000 --- a/console-tools/Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2005 by Erik Andersen -# -# Licensed under the GPL v2, see the file LICENSE in this tarball. - -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_DEALLOCVT) += deallocvt.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_SETKEYCODES) += setkeycodes.o -CONSOLETOOLS-$(CONFIG_SETLOGCONS) += setlogcons.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) - -$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR): $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS-y)) - $(do_ar) - -$(CONSOLETOOLS_DIR)%.o: $(srcdir)/%.c - $(compile.c) -- cgit v1.2.3