diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2006-09-04 01:03:57 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-09-04 01:03:57 +0200 |
commit | 6741ae92f37caea8a22d1dcfaeab356f94b64676 (patch) | |
tree | 8abb7ed1b67b2b75733e02a923a229ed8176863f /cpu/i386 | |
parent | 360b4103677b27ad4018174a1d186218969d83a1 (diff) | |
parent | f93286397ed2a7084efb0362a43ee09f11702349 (diff) | |
download | u-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/i386')
-rw-r--r-- | cpu/i386/Makefile | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/cpu/i386/Makefile b/cpu/i386/Makefile index c44412a..cd46dea 100644 --- 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,22 +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 -AOBJS = sc520_asm.o +SOBJS = sc520_asm.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): $(COBJS) $(AOBJS) - $(AR) crv $@ $(COBJS) $(AOBJS) +all: $(obj).depend $(START) $(LIB) + +$(LIB): $(OBJS) + $(AR) crv $@ $(OBJS) ######################################################################### -.depend: Makefile $(START:.o=.S) $(COBJS:.o=.c) $(AOBJS:.o=.S) - $(CC) -M $(CFLAGS) $(START:.o=.S) $(COBJS:.o=.c) $(AOBJS:.o=.S) > $@ +# defines $(obj).depend target +include $(SRCTREE)/rules.mk -sinclude .depend +sinclude $(obj).depend ######################################################################### |