projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'denx-coldfire' into coldfire-aug2007
[oweals/u-boot.git]
/
board
/
esd
/
cms700
/
Makefile
diff --git
a/board/esd/cms700/Makefile
b/board/esd/cms700/Makefile
index a11ee82aa23c3d3a9f159506cfa0364d98a56dc5..0d4ab2d13a943da890511c0e18076da3e3a3b669 100644
(file)
--- a/
board/esd/cms700/Makefile
+++ b/
board/esd/cms700/Makefile
@@
-1,5
+1,5
@@
#
#
-# (C) Copyright 2000
+# (C) Copyright 2000
-2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# See file CREDITS for list of people who contributed to this
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# See file CREDITS for list of people who contributed to this
@@
-22,18
+22,28
@@
#
include $(TOPDIR)/config.mk
#
include $(TOPDIR)/config.mk
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common/xilinx_jtag)
+endif
-LIB = lib$(BOARD).a
+LIB =
$(obj)
lib$(BOARD).a
# Objects for Xilinx JTAG programming (CPLD)
CPLD = ../common/xilinx_jtag/lenval.o \
../common/xilinx_jtag/micro.o \
../common/xilinx_jtag/ports.o
# Objects for Xilinx JTAG programming (CPLD)
CPLD = ../common/xilinx_jtag/lenval.o \
../common/xilinx_jtag/micro.o \
../common/xilinx_jtag/ports.o
-OBJS = $(BOARD).o flash.o ../common/misc.o $(CPLD)
+COBJS = $(BOARD).o flash.o \
+ ../common/misc.o \
+ $(CPLD) \
+ ../common/esd405ep_nand.o \
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
$(LIB): $(OBJS) $(SOBJS)
$(LIB): $(OBJS) $(SOBJS)
- $(AR)
crv
$@ $(OBJS)
+ $(AR)
$(ARFLAGS)
$@ $(OBJS)
clean:
rm -f $(SOBJS) $(OBJS)
clean:
rm -f $(SOBJS) $(OBJS)
@@
-43,9
+53,9
@@
distclean: clean
#########################################################################
#########################################################################
-.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
- $(CC) -M $(CFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
-sinclude .depend
+sinclude
$(obj)
.depend
#########################################################################
#########################################################################