Merge branch 'master' of ../master into next

[u-boot] / board / esd / cpci5200 / Makefile

diff --git a/board/esd/cpci5200/Makefile b/board/esd/cpci5200/Makefile
index 78ffa0f85a91a49901fa447abeb605a0bf10a696..d41cbcd959691978571c40f88ffe8be5febed322 100644 (file)
--- a/board/esd/cpci5200/Makefile
+++ b/board/esd/cpci5200/Makefile
@@ -26,12 +26,12 @@ include $(TOPDIR)/config.mk
 # $(shell mkdir -p $(obj)../common/xilinx_jtag)
 # endif
 
-LIB    = $(obj)lib$(BOARD).a
+LIB    = $(obj)lib$(BOARD).o
 
 # Objects for Xilinx JTAG programming (CPLD)
 # CPLD  = ../common/xilinx_jtag/lenval.o \
-#        ../common/xilinx_jtag/micro.o \
-#        ../common/xilinx_jtag/ports.o
+#        ../common/xilinx_jtag/micro.o \
+#        ../common/xilinx_jtag/ports.o
 
 # COBJS        = $(BOARD).o flash.o $(CPLD)
 COBJS  = $(BOARD).o strataflash.o
@@ -41,13 +41,13 @@ OBJS        := $(addprefix $(obj),$(COBJS))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(obj).depend $(OBJS)
-       $(AR) crv $@ $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
 
 clean:
        rm -f $(SOBJS) $(OBJS)
 
 distclean:     clean
-       rm -f $(LIB) core *.bak .depend
+       rm -f $(LIB) core *.bak $(obj).depend
 
 #########################################################################