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 /fs/fat/Makefile | |
parent | 4a39616da41840bbc5b4c3f69df9861c2e6a8425 (diff) | |
parent | 2255b2d2044d434463eb2661e18018e50f1643d9 (diff) | |
download | blackbird-obmc-uboot-fb883a521e04437acfe989de3e152b2e4866856b.tar.gz blackbird-obmc-uboot-fb883a521e04437acfe989de3e152b2e4866856b.zip |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'fs/fat/Makefile')
-rw-r--r-- | fs/fat/Makefile | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/fs/fat/Makefile b/fs/fat/Makefile index e4627577b7..87af73b7eb 100644 --- a/fs/fat/Makefile +++ b/fs/fat/Makefile @@ -19,28 +19,27 @@ # MA 02111-1307 USA # -TOPDIR=../../ - include $(TOPDIR)/config.mk -LIB = libfat.a +LIB = $(obj)libfat.a AOBJS = COBJS = fat.o file.o -OBJS = $(AOBJS) $(COBJS) +SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) all: $(LIB) $(AOBJS) -$(LIB): .depend $(OBJS) - $(AR) crv $@ $(OBJS) +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) ######################################################################### -.depend: Makefile $(AOBJS:.o=.S) $(COBJS:.o=.c) - $(CC) -M $(CFLAGS) $(AOBJS:.o=.S) $(COBJS:.o=.c) > $@ +# defines $(obj).depend target +include $(SRCTREE)/rules.mk -sinclude .depend +sinclude $(obj).depend ######################################################################### |