Merge branch 'master' of /home/stefan/git/u-boot/u-boot

[oweals/u-boot.git] / cpu / i386 / Makefile

diff --git a/cpu/i386/Makefile b/cpu/i386/Makefile
index 1482398efe324880d1f9b95274b0e77a5501fc4e..50534b615b941326247a09455bf368fdbd0ebfc1 100644 (file)
--- a/cpu/i386/Makefile
+++ b/cpu/i386/Makefile
@@ -1,4 +1,7 @@
 #
+# (C) Copyright 2006
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
 # (C) Copyright 2002
 # Daniel Engström, Omicron Ceti AB, daniel@omicron.se.
 #
@@ -23,21 +26,26 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = lib$(CPU).a
+LIB    = $(obj)lib$(CPU).a
+
+START  = start.o start16.o reset.o
+COBJS  = serial.o interrupts.o cpu.o timer.o sc520.o
+SOBJS  = sc520_asm.o
+
+SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
+START  := $(addprefix $(obj),$(START))
 
-START  = start.o start16.o reset.o 
-OBJS   = serial.o interrupts.o cpu.o timer.o
-         
-all:   .depend $(START) $(LIB)
+all:   $(obj).depend $(START) $(LIB)
 
 $(LIB):        $(OBJS)
-       $(AR) crv $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################
 
-.depend:       Makefile $(START:.o=.S) $(OBJS:.o=.c)
-               $(CC) -M $(CFLAGS) $(START:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
 
-sinclude .depend
+sinclude $(obj).depend
 
 #########################################################################