summaryrefslogtreecommitdiffstats
path: root/arch/m68k/atari
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-01-10 17:17:53 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-01-10 17:17:53 +0000
commitb2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch)
tree954a648692e7da983db1d2470953705f6a729264 /arch/m68k/atari
parentc9c06167e7933d93a6e396174c68abf242294abb (diff)
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'arch/m68k/atari')
-rw-r--r--arch/m68k/atari/Makefile12
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