diff options
| author | Wolfgang Denk <wd@nyx.denx.de> | 2006-10-11 14:15:21 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@nyx.denx.de> | 2006-10-11 14:15:21 +0200 |
| commit | fb883a521e04437acfe989de3e152b2e4866856b (patch) | |
| tree | 0cf61f45ae693082b24ced9c1da9a87bdd0cabbd /board/canmb | |
| parent | 4a39616da41840bbc5b4c3f69df9861c2e6a8425 (diff) | |
| parent | 2255b2d2044d434463eb2661e18018e50f1643d9 (diff) | |
| download | u-boot-imx-fb883a521e04437acfe989de3e152b2e4866856b.zip u-boot-imx-fb883a521e04437acfe989de3e152b2e4866856b.tar.gz u-boot-imx-fb883a521e04437acfe989de3e152b2e4866856b.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'board/canmb')
| -rw-r--r-- | board/canmb/Makefile | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/board/canmb/Makefile b/board/canmb/Makefile index 607833f..23d410d 100644 --- a/board/canmb/Makefile +++ b/board/canmb/Makefile @@ -1,5 +1,5 @@ # -# (C) Copyright 2005 +# (C) Copyright 2005-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -22,14 +22,21 @@ # include $(TOPDIR)/config.mk +#ifneq ($(OBJTREE),$(SRCTREE)) +#$(shell mkdir -p $(obj)../common) +#endif -LIB = lib$(BOARD).a +LIB = $(obj)lib$(BOARD).a -OBJS := $(BOARD).o +COBJS := $(BOARD).o #../common/flash.o ../common/vpd.o ../common/am79c874.o -$(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) clean: rm -f $(SOBJS) $(OBJS) @@ -39,9 +46,9 @@ distclean: clean ######################################################################### -.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) - $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ +# defines $(obj).depend target +include $(SRCTREE)/rules.mk --include .depend +sinclude $(obj).depend ######################################################################### |