X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=post%2FMakefile;h=55b7d2114282e43a71e90ae645d64b8241654c5d;hb=a7778f8fbee098c78b1fa1e1331313a7e217fb30;hp=c737729f9e0c366b19907733c35a73fb268e1824;hpb=19cf2ec90d8ce52da60c1693693c4048cb810967;p=u-boot

diff --git a/post/Makefile b/post/Makefile
index c737729f9e..55b7d21142 100644
--- a/post/Makefile
+++ b/post/Makefile
@@ -22,24 +22,25 @@
 #
 
 include $(TOPDIR)/config.mk
-include $(TOPDIR)/include/autoconf.mk
+include $(OBJTREE)/include/autoconf.mk
 
-LIB				= libpost.a
-GPLIB-$(CONFIG_HAS_POST)	+= libgenpost.a
-COBJS-$(CONFIG_HAS_POST)	+= post.o tests.o
+LIB				= libpost.o
+GPLIB-$(CONFIG_HAS_POST)	+= libgenpost.o
+COBJS-$(CONFIG_HAS_POST)	+= post.o
+COBJS-$(CONFIG_POST_STD_LIST)	+= tests.o
 
-SPLIB-$(CONFIG_HAS_POST) = drivers/libpostdrivers.a
+SPLIB-$(CONFIG_HAS_POST) = drivers/libpostdrivers.o
 SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d lib_$(ARCH) ]; then echo \
-			    "lib_$(ARCH)/libpost$(ARCH).a"; fi)
-SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d lib_$(ARCH)/fpu ]; then echo \
-			    "lib_$(ARCH)/fpu/libpost$(ARCH)fpu.a"; fi)
+			    "lib_$(ARCH)/libpost$(ARCH).o"; fi)
+SPLIB-$(CONFIG_SYS_POST_FPU) += $(shell if [ -d lib_$(ARCH)/fpu ]; then echo \
+			    "lib_$(ARCH)/fpu/libpost$(ARCH)fpu.o"; fi)
 SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d cpu/$(CPU) ]; then echo \
-			    "cpu/$(CPU)/libpost$(CPU).a"; fi)
+			    "cpu/$(CPU)/libpost$(CPU).o"; fi)
 SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d board/$(BOARD) ]; then echo \
-			    "board/$(BOARD)/libpost$(BOARD).a"; fi)
+			    "board/$(BOARD)/libpost$(BOARD).o"; fi)
 
-GPLIB	:= $(GPLIB-y)
-SPLIB	:= $(SPLIB-y)
+GPLIB	:= $(addprefix $(obj),$(GPLIB-y))
+SPLIB	:= $(addprefix $(obj),$(SPLIB-y))
 COBJS	:= $(COBJS-y)
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
@@ -47,19 +48,22 @@ LIB	:= $(obj)$(LIB)
 
 all:	$(LIB)
 
+postdeps:
+	@for lib in $(SPLIB-y) ; do \
+		$(MAKE) -C `dirname $$lib` all ; \
+	done
+
 # generic POST library
 $(GPLIB): $(obj).depend $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
 
 # specific POST libraries
-$(SPLIB): $(obj).depend
+$(SPLIB): $(obj).depend postdeps
 	$(MAKE) -C $(dir $(subst $(obj),,$@))
 
 # the POST lib archive
 $(LIB): $(GPLIB) $(SPLIB)
-	(echo create $(LIB); for lib in $(GPLIB) $(SPLIB) ; \
-	 do echo addlib $$lib; done; echo save) \
-	| $(AR) -M
+	$(call cmd_link_o_target, $^)
 
 #########################################################################