pull Rules.mak from top_srcdir as pointed out by Robert P. J. Day on the mailing...

[oweals/busybox.git] / console-tools / Makefile.in

diff --git a/console-tools/Makefile.in b/console-tools/Makefile.in
index bc03356437c02900764170a92c108ae6a1480940..437bcd0eca695a7af1ebecd2fba6fa498297bfad 100644 (file)
--- a/console-tools/Makefile.in
+++ b/console-tools/Makefile.in
@@ -1,40 +1,38 @@
 # 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
+# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 #
+# Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 CONSOLETOOLS_AR:=console-tools.a
 ifndef $(CONSOLETOOLS_DIR)
-CONSOLETOOLS_DIR:=$(TOPDIR)console-tools/
+CONSOLETOOLS_DIR:=$(top_builddir)/console-tools/
 endif
+srcdir=$(top_srcdir)/console-tools
 
-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
+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_DIR-y))
-       $(AR) -ro $@ $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS_DIR-y))
+$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR): $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS-y))
+       $(do_ar)
 
+$(CONSOLETOOLS_DIR)%.o: $(srcdir)/%.c
+       $(compile.c)