diff options
author | Wolfgang Denk <wd@denx.de> | 2008-07-06 01:15:17 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-07-06 01:15:17 +0200 |
commit | d86a0a6f7fe433787edf06aecba9fd6abfecab48 (patch) | |
tree | 005ba8a000e7bdcab42c1df6339bf7e51dcda2ca /cpu/sh3/Makefile | |
parent | a524e112b424c6843800ea2f19d3a8cf01d0aa94 (diff) | |
parent | f492dd636fbbae529e17533995bc6e5813c007f6 (diff) | |
download | u-boot-imx-d86a0a6f7fe433787edf06aecba9fd6abfecab48.zip u-boot-imx-d86a0a6f7fe433787edf06aecba9fd6abfecab48.tar.gz u-boot-imx-d86a0a6f7fe433787edf06aecba9fd6abfecab48.tar.bz2 |
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
Conflicts:
board/amirix/ap1000/serial.c
board/exbitgen/exbitgen.c
board/exbitgen/flash.c
board/ml2/serial.c
board/xilinx/ml300/serial.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'cpu/sh3/Makefile')
-rw-r--r-- | cpu/sh3/Makefile | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/cpu/sh3/Makefile b/cpu/sh3/Makefile index 7679248..a7eb1e2 100644 --- a/cpu/sh3/Makefile +++ b/cpu/sh3/Makefile @@ -31,19 +31,27 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).a -START = start.o +SOBJS = start.o OBJS = cpu.o interrupts.o watchdog.o time.o cache.o -all: .depend $(START) $(LIB) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) -$(LIB): $(OBJS) - $(AR) crv $@ $(OBJS) +$(LIB): $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend ######################################################################### -.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 ######################################################################### |