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

[pandora-u-boot.git] / board / siemens / SCM / Makefile

diff --git a/board/siemens/SCM/Makefile b/board/siemens/SCM/Makefile
index b7e26ff..07db9d4 100644 (file)
--- a/board/siemens/SCM/Makefile
+++ b/board/siemens/SCM/Makefile
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2001
+# (C) Copyright 2001-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
@@ -23,20 +23,27 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = lib$(BOARD).a
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common $(obj)../../tqc/tqm8xx)
+endif
 
-OBJS   = scm.o flash.o fpga_scm.o ../common/fpga.o \
-         ../../tqm8xx/load_sernum_ethaddr.o
+LIB    = $(obj)lib$(BOARD).o
 
+COBJS  = scm.o flash.o fpga_scm.o ../common/fpga.o \
+         ../../tqc/tqm8xx/load_sernum_ethaddr.o
 
-$(LIB):        .depend $(OBJS)
-       $(AR) crv $@ $^
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+SOBJS  := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):        $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
 
 #########################################################################
 
-.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
 
 #########################################################################