summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-09-04 01:03:57 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-09-04 01:03:57 +0200
commit6741ae92f37caea8a22d1dcfaeab356f94b64676 (patch)
tree8abb7ed1b67b2b75733e02a923a229ed8176863f /common
parent360b4103677b27ad4018174a1d186218969d83a1 (diff)
parentf93286397ed2a7084efb0362a43ee09f11702349 (diff)
downloadu-boot-imx-6741ae92f37caea8a22d1dcfaeab356f94b64676.zip
u-boot-imx-6741ae92f37caea8a22d1dcfaeab356f94b64676.tar.gz
u-boot-imx-6741ae92f37caea8a22d1dcfaeab356f94b64676.tar.bz2
Merge with /home/m8/git/u-boot
Diffstat (limited to 'common')
-rw-r--r--common/Makefile23
1 files changed, 12 insertions, 11 deletions
diff --git a/common/Makefile b/common/Makefile
index eb0b5da..d626fe4 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -1,5 +1,5 @@
#
-# (C) Copyright 2004
+# (C) Copyright 2004-2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# See file CREDITS for list of people who contributed to this
@@ -23,7 +23,7 @@
include $(TOPDIR)/config.mk
-LIB = libcommon.a
+LIB = $(obj)libcommon.a
AOBJS =
@@ -53,28 +53,29 @@ COBJS = main.o ACEX1K.o altera.o bedbug.o circbuf.o \
usb.o usb_kbd.o usb_storage.o \
virtex2.o xilinx.o crc16.o xyzModem.o
-OBJS = $(AOBJS) $(COBJS)
+SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS))
CPPFLAGS += -I..
all: $(LIB) $(AOBJS)
-$(LIB): .depend $(OBJS)
+$(LIB): $(obj).depend $(OBJS)
$(AR) crv $@ $(OBJS)
-environment.o: environment.c ../tools/envcrc
+$(obj)environment.o: $(src)environment.c $(obj)../tools/envcrc
$(CC) $(AFLAGS) -Wa,--no-warn \
- -DENV_CRC=$(shell ../tools/envcrc) \
- -c -o $@ environment.c
+ -DENV_CRC=$(shell $(obj)../tools/envcrc) \
+ -c -o $@ $(src)environment.c
-../tools/envcrc:
+$(obj)../tools/envcrc:
$(MAKE) -C ../tools
#########################################################################
-.depend: Makefile $(AOBJS:.o=.S) $(COBJS:.o=.c)
- $(CC) -M $(CFLAGS) $(AOBJS:.o=.S) $(COBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
-sinclude .depend
+sinclude $(obj).depend
#########################################################################