Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your

Makefiles.

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/m68k/atari/Makefile b/arch/m68k/atari/Makefile
index bfc82284a..363368f5c 100644
--- a/arch/m68k/atari/Makefile
+++ b/arch/m68k/atari/Makefile
@@ -8,14 +8,14 @@
 # Note 2! The CFLAGS definitions are now in the main makefile...
 
 O_TARGET := atari.o
-O_OBJS	 := config.o time.o debug.o atakeyb.o ataints.o stdma.o atasound.o \
-            joystick.o stram.o
-OX_OBJS  := atari_ksyms.o
+
+export-objs	:= atari_ksyms.o
+
+obj-y		:= config.o time.o debug.o atakeyb.o ataints.o stdma.o \
+			atasound.o joystick.o stram.o atari_ksyms.o
 
 ifdef CONFIG_PCI
-ifdef CONFIG_HADES
-O_OBJS += hades-pci.o
-endif
+obj-$(CONFIG_HADES)	+= hades-pci.o
 endif
 
 include $(TOPDIR)/Rules.make