patch-2.1.31 linux/arch/m68k/Makefile

Next file: linux/arch/m68k/atari/joystick.c
Previous file: linux/arch/i386/mm/ioremap.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.30/linux/arch/m68k/Makefile linux/arch/m68k/Makefile
@@ -48,7 +48,7 @@
 
 HEAD := arch/m68k/kernel/head.o
 
-SUBDIRS += arch/m68k/kernel arch/m68k/mm arch/m68k/console arch/m68k/lib
+SUBDIRS += arch/m68k/kernel arch/m68k/mm arch/m68k/lib
 ARCHIVES := arch/m68k/kernel/kernel.o arch/m68k/mm/mm.o $(ARCHIVES)
 LIBS += arch/m68k/lib/lib.a
 
@@ -67,8 +67,11 @@
 SUBDIRS := $(SUBDIRS) arch/m68k/mac
 endif
 
+ifdef CONFIG_VT
 # add in console.a after {amiga,atari}.o that need it
 ARCHIVES := $(ARCHIVES) arch/m68k/console/console.a
+SUBDIRS := $(SUBDIRS) arch/m68k/console
+endif
 
 ifdef CONFIG_M68040
 ARCHIVES := $(ARCHIVES) arch/m68k/fpsp040/fpsp.o

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov