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 /board/cds/mpc8541cds/Makefile | |
parent | b440d0ef72e6278973d3220c10136a4c0624c286 (diff) | |
parent | aeec782b020930732eab075af97212c3f03afcae (diff) | |
download | u-boot-imx-afa98843e4665add11b69496341053b268156e3a.zip u-boot-imx-afa98843e4665add11b69496341053b268156e3a.tar.gz u-boot-imx-afa98843e4665add11b69496341053b268156e3a.tar.bz2 |
Merge branch 'master' of http://www.denx.de/git/u-boot
Conflicts:
board/stxxtc/Makefile
Diffstat (limited to 'board/cds/mpc8541cds/Makefile')
-rw-r--r-- | board/cds/mpc8541cds/Makefile | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/board/cds/mpc8541cds/Makefile b/board/cds/mpc8541cds/Makefile index d202281..9aad5d5 100644 --- a/board/cds/mpc8541cds/Makefile +++ b/board/cds/mpc8541cds/Makefile @@ -1,6 +1,6 @@ # # Copyright 2004 Freescale Semiconductor. -# (C) Copyright 2001 +# (C) Copyright 2001-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -23,10 +23,13 @@ # 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/cadmus.o \ ../common/eeprom.o \ ../common/ft_board.o \ @@ -34,7 +37,11 @@ OBJS := $(BOARD).o \ SOBJS := init.o -$(LIB): $(OBJS) $(SOBJS) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(AR) crv $@ $(OBJS) clean: @@ -45,9 +52,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 ######################################################################### |