summaryrefslogtreecommitdiff
path: root/cpu/nios/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-09-04 01:03:57 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-09-04 01:03:57 +0200
commit6741ae92f37caea8a22d1dcfaeab356f94b64676 (patch)
tree8abb7ed1b67b2b75733e02a923a229ed8176863f /cpu/nios/Makefile
parent360b4103677b27ad4018174a1d186218969d83a1 (diff)
parentf93286397ed2a7084efb0362a43ee09f11702349 (diff)
downloadu-boot-imx-6741ae92f37caea8a22d1dcfaeab356f94b64676.zip
u-boot-imx-6741ae92f37caea8a22d1dcfaeab356f94b64676.tar.gz
u-boot-imx-6741ae92f37caea8a22d1dcfaeab356f94b64676.tar.bz2
Merge with /home/m8/git/u-boot
Diffstat (limited to 'cpu/nios/Makefile')
-rw-r--r--cpu/nios/Makefile24
1 files changed, 14 insertions, 10 deletions
diff --git a/cpu/nios/Makefile b/cpu/nios/Makefile
index 7855325..cdab7b0 100644
--- a/cpu/nios/Makefile
+++ b/cpu/nios/Makefile
@@ -1,5 +1,5 @@
#
-# (C) Copyright 2000
+# (C) Copyright 2000-2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# See file CREDITS for list of people who contributed to this
@@ -23,22 +23,26 @@
include $(TOPDIR)/config.mk
-LIB = lib$(CPU).a
+LIB = $(obj)lib$(CPU).a
START = start.o
-AOBJS = traps.o
-OBJS = cpu.o interrupts.o serial.o asmi.o spi.o
+SOBJS = traps.o
+COBJS = cpu.o interrupts.o serial.o asmi.o spi.o
-all: .depend $(START) $(LIB)
+SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
+START := $(addprefix $(obj),$(START))
-$(LIB): $(OBJS) $(AOBJS)
- $(AR) crv $@ $(OBJS) $(AOBJS)
+all: $(obj).depend $(START) $(LIB)
+
+$(LIB): $(OBJS)
+ $(AR) crv $@ $(OBJS)
#########################################################################
-.depend: Makefile $(START:.o=.S) $(OBJS:.o=.c) $(AOBJS:.o=.S)
- $(CC) -M $(CFLAGS) $(START:.o=.S) $(OBJS:.o=.c) $(AOBJS:.o=.S) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
-sinclude .depend
+sinclude $(obj).depend
#########################################################################