Merge branch 'master' of http://www.denx.de/git/u-boot

[karo-tx-uboot.git] / common / Makefile

diff --git a/common/Makefile b/common/Makefile
index a62bc16e85d8032ef7c78573e577829f965867aa..5ff8f93503bc83e5145129f8d8fae5a32970daba 100644 (file)
--- 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 cmd_mac.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
 
 #########################################################################