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 'master' of /home/stefan/git/u-boot/u-boot
[oweals/u-boot.git]
/
board
/
esd
/
apc405
/
Makefile
diff --git
a/board/esd/apc405/Makefile
b/board/esd/apc405/Makefile
index 8529ec70c09a662aacec3ca58b508a0647837b66..024997e7753d460c0fca54b69a6fe4c4dd2271c3 100644
(file)
--- a/
board/esd/apc405/Makefile
+++ b/
board/esd/apc405/Makefile
@@
-1,5
+1,5
@@
#
#
-# (C) Copyright 2000
, 2001
+# (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,13
+22,20
@@
#
include $(TOPDIR)/config.mk
#
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 strataflash.o ../common/misc.o
+COBJS = $(BOARD).o strataflash.o ../common/misc.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
$(LIB): $(OBJS) $(SOBJS)
$(LIB): $(OBJS) $(SOBJS)
- $(AR)
crv
$@ $^
+ $(AR)
$(ARFLAGS)
$@ $^
clean:
rm -f $(SOBJS) $(OBJS)
clean:
rm -f $(SOBJS) $(OBJS)
@@
-38,9
+45,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
#########################################################################
#########################################################################