summaryrefslogtreecommitdiff
path: root/board/altera/ep1s10/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@nyx.denx.de>2006-10-11 14:15:21 +0200
committerWolfgang Denk <wd@nyx.denx.de>2006-10-11 14:15:21 +0200
commitfb883a521e04437acfe989de3e152b2e4866856b (patch)
tree0cf61f45ae693082b24ced9c1da9a87bdd0cabbd /board/altera/ep1s10/Makefile
parent4a39616da41840bbc5b4c3f69df9861c2e6a8425 (diff)
parent2255b2d2044d434463eb2661e18018e50f1643d9 (diff)
downloadu-boot-imx-fb883a521e04437acfe989de3e152b2e4866856b.zip
u-boot-imx-fb883a521e04437acfe989de3e152b2e4866856b.tar.gz
u-boot-imx-fb883a521e04437acfe989de3e152b2e4866856b.tar.bz2
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'board/altera/ep1s10/Makefile')
-rw-r--r--board/altera/ep1s10/Makefile25
1 files changed, 15 insertions, 10 deletions
diff --git a/board/altera/ep1s10/Makefile b/board/altera/ep1s10/Makefile
index a92b258..7a8caf7 100644
--- a/board/altera/ep1s10/Makefile
+++ b/board/altera/ep1s10/Makefile
@@ -1,5 +1,5 @@
#
-# (C) Copyright 2001-2004
+# (C) Copyright 2001-2006
# 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
-# 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
@@ -22,17 +22,22 @@
#
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 ../common/epled.o
-OBJS := $(BOARD).o $(COMOBJS)
+COBJS := $(BOARD).o $(COMOBJS)
-SOBJS =
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
-$(LIB): $(OBJS) $(SOBJS)
- $(AR) crv $@ $^
+$(LIB): $(obj).depend $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(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
#########################################################################