Merge branch 'next' of git://git.denx.de/u-boot-video

[people/ms/u-boot.git] / post / Makefile

diff --git a/post/Makefile b/post/Makefile
index 02b51544c2025124b75aa9f5b45c425e4ac90648..169d12632430f6ddaa7324c6b8c2d5a1a4472eac 100644 (file)
--- a/post/Makefile
+++ b/post/Makefile
@@ -21,11 +21,13 @@
 # MA 02111-1307 USA
 #
 
-include $(TOPDIR)/include/autoconf.mk
+include $(TOPDIR)/config.mk
+include $(OBJTREE)/include/autoconf.mk
 
 LIB                            = libpost.a
 GPLIB-$(CONFIG_HAS_POST)       += libgenpost.a
-COBJS-$(CONFIG_HAS_POST)       += post.o tests.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) += $(shell if [ -d lib_$(ARCH) ]; then echo \
@@ -37,8 +39,8 @@ SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d cpu/$(CPU) ]; then echo \
 SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d board/$(BOARD) ]; then echo \
                            "board/$(BOARD)/libpost$(BOARD).a"; 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))
@@ -46,12 +48,17 @@ 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)
 
 # specific POST libraries
-$(SPLIB): $(obj).depend
+$(SPLIB): $(obj).depend postdeps
        $(MAKE) -C $(dir $(subst $(obj),,$@))
 
 # the POST lib archive