- an empty middle term in ?: violates ISO C

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

diff --git a/console-tools/Makefile.in b/console-tools/Makefile.in
index 1c4ac5222b522abd25962480c2ebbb9cd6b6dde9..46cf524be28f3caa47cff79b4a5f5db035f9e622 100644 (file)
--- a/console-tools/Makefile.in
+++ b/console-tools/Makefile.in
@@ -1,33 +1,21 @@
 # Makefile for busybox
 #
-# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.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_SETCONSOLE)  += setconsole.o
 CONSOLETOOLS_DIR-$(CONFIG_LOADFONT)    += loadfont.o
 CONSOLETOOLS_DIR-$(CONFIG_LOADKMAP)    += loadkmap.o
 CONSOLETOOLS_DIR-$(CONFIG_OPENVT)      += openvt.o
@@ -37,5 +25,8 @@ 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))
+       $(AR) $(ARFLAGS) $@ $(patsubst %,$(CONSOLETOOLS_DIR)%, $(CONSOLETOOLS_DIR-y))
+
+$(CONSOLETOOLS_DIR)%.o: $(srcdir)/%.c
+       $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<