summaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
commitdcec8a13bf565e47942a1751a9cec21bec5648fe (patch)
tree548b69625b18cc2e88c3e68d0923be546c9ebb03 /arch/alpha/kernel/Makefile
parent2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff)
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash. o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'arch/alpha/kernel/Makefile')
-rw-r--r--arch/alpha/kernel/Makefile18
1 files changed, 14 insertions, 4 deletions
diff --git a/arch/alpha/kernel/Makefile b/arch/alpha/kernel/Makefile
index ba0aee556..8d09ea8c4 100644
--- a/arch/alpha/kernel/Makefile
+++ b/arch/alpha/kernel/Makefile
@@ -8,9 +8,9 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
.S.s:
- $(CPP) -D__ASSEMBLY__ -traditional $< -o $*.s
+ $(CPP) -D__ASSEMBLY__ $(AFLAGS) -traditional $< -o $*.s
.S.o:
- $(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
+ $(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $< -o $*.o
all: kernel.o head.o
@@ -35,19 +35,29 @@ endif
ifdef CONFIG_ALPHA_T2
O_OBJS += t2.o
endif
+ifdef CONFIG_ALPHA_TSUNAMI
+O_OBJS += tsunami.o
+endif
+ifdef CONFIG_ALPHA_MCPCIA
+O_OBJS += mcpcia.o
+endif
+
ifneq ($(CONFIG_ALPHA_PC164)$(CONFIG_ALPHA_LX164),nn)
O_OBJS += smc37c93x.o
endif
-ifdef CONFIG_ALPHA_SX164
+ifneq ($(CONFIG_ALPHA_SX164)$(CONFIG_ALPHA_MIATA)$(CONFIG_ALPHA_DP264),nnn)
O_OBJS += smc37c669.o
endif
+ifdef SMP
+O_OBJS += smp.o
+endif
all: kernel.o head.o
head.o: head.s
head.s: head.S $(TOPDIR)/include/asm-alpha/system.h
- $(CPP) -traditional -o $*.s $<
+ $(CPP) -traditional $(AFLAGS) -o $*.s $<
include $(TOPDIR)/Rules.make