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 with /home/wd/git/u-boot/custodian/u-boot-net
[oweals/u-boot.git]
/
board
/
amcc
/
ocotea
/
Makefile
diff --git
a/board/amcc/ocotea/Makefile
b/board/amcc/ocotea/Makefile
index af223d2c5596f9a37b2c3c3d349ea418b6297b27..a758650e591c91304541ac05581f99063b9b3e33 100644
(file)
--- a/
board/amcc/ocotea/Makefile
+++ b/
board/amcc/ocotea/Makefile
@@
-1,5
+1,5
@@
#
#
-# (C) Copyright 2002
+# (C) Copyright 2002
-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
@@
-23,13
+23,17
@@
include $(TOPDIR)/config.mk
include $(TOPDIR)/config.mk
-LIB = lib$(BOARD).a
+LIB =
$(obj)
lib$(BOARD).a
-
OBJS
= $(BOARD).o flash.o
+
COBJS
= $(BOARD).o flash.o
SOBJS = init.o
SOBJS = init.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)
@@
-39,9
+43,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
#########################################################################
#########################################################################