diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-09-19 08:51:24 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-09-19 08:51:24 -0500 |
| commit | afa98843e4665add11b69496341053b268156e3a (patch) | |
| tree | 116878b6b94920a5f282d0a16e4b9ad9dfaf57ff /fs/fat/Makefile | |
| parent | b440d0ef72e6278973d3220c10136a4c0624c286 (diff) | |
| parent | aeec782b020930732eab075af97212c3f03afcae (diff) | |
Merge branch 'master' of http://www.denx.de/git/u-boot
Conflicts:
board/stxxtc/Makefile
Diffstat (limited to 'fs/fat/Makefile')
| -rw-r--r-- | fs/fat/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/fs/fat/Makefile b/fs/fat/Makefile index e4627577b7..2fa428c4dc 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) +$(LIB): $(obj).depend $(OBJS) $(AR) crv $@ $(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 ######################################################################### |