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/master
[oweals/u-boot.git]
/
board
/
psyent
/
pk1c20
/
Makefile
diff --git
a/board/psyent/pk1c20/Makefile
b/board/psyent/pk1c20/Makefile
index 5c1db036bf9d99391b50f0b02290e840ebc78154..2568a68ede6d444de15483ca676863a727879aff 100644
(file)
--- a/
board/psyent/pk1c20/Makefile
+++ b/
board/psyent/pk1c20/Makefile
@@
-1,5
+1,5
@@
#
#
-# (C) Copyright 2001-200
4
+# (C) Copyright 2001-200
6
# 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
@@
-12,7
+12,7
@@
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
@@
-22,17
+22,22
@@
#
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
COMOBJS := ../common/AMDLV065D.o
COMOBJS := ../common/AMDLV065D.o
-
OBJS
:= $(BOARD).o led.o $(COMOBJS)
+
COBJS
:= $(BOARD).o led.o $(COMOBJS)
-SOBJS =
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
-$(LIB):
$(OBJS) $(S
OBJS)
- $(AR)
crv $@ $^
+$(LIB):
$(obj).depend $(
OBJS)
+ $(AR)
$(ARFLAGS) $@ $(OBJS)
clean:
rm -f $(SOBJS) $(OBJS)
clean:
rm -f $(SOBJS) $(OBJS)
@@
-42,9
+47,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
#########################################################################
#########################################################################