X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=post%2FMakefile;h=55b7d2114282e43a71e90ae645d64b8241654c5d;hb=a7778f8fbee098c78b1fa1e1331313a7e217fb30;hp=f32af951624ceb56ecbc9061771e12bc10ef7ddd;hpb=3c4bd60de15d79ddfc0cf3170a55847b2025d93f;p=u-boot

diff --git a/post/Makefile b/post/Makefile
index f32af95162..55b7d21142 100644
--- a/post/Makefile
+++ b/post/Makefile
@@ -21,11 +21,55 @@
 # MA 02111-1307 USA
 #
 
+include $(TOPDIR)/config.mk
+include $(OBJTREE)/include/autoconf.mk
 
-SUBDIRS = drivers cpu lib_$(ARCH) board/$(BOARDDIR)
+LIB				= libpost.o
+GPLIB-$(CONFIG_HAS_POST)	+= libgenpost.o
+COBJS-$(CONFIG_HAS_POST)	+= post.o
+COBJS-$(CONFIG_POST_STD_LIST)	+= tests.o
 
-LIB	= libpost.a
+SPLIB-$(CONFIG_HAS_POST) = drivers/libpostdrivers.o
+SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d lib_$(ARCH) ]; then echo \
+			    "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).o"; fi)
+SPLIB-$(CONFIG_HAS_POST) += $(shell if [ -d board/$(BOARD) ]; then echo \
+			    "board/$(BOARD)/libpost$(BOARD).o"; fi)
 
-COBJS	= post.o tests.o
+GPLIB	:= $(addprefix $(obj),$(GPLIB-y))
+SPLIB	:= $(addprefix $(obj),$(SPLIB-y))
+COBJS	:= $(COBJS-y)
+SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+LIB	:= $(obj)$(LIB)
 
-include $(TOPDIR)/post/rules.mk
+all:	$(LIB)
+
+postdeps:
+	@for lib in $(SPLIB-y) ; do \
+		$(MAKE) -C `dirname $$lib` all ; \
+	done
+
+# generic POST library
+$(GPLIB): $(obj).depend $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
+
+# specific POST libraries
+$(SPLIB): $(obj).depend postdeps
+	$(MAKE) -C $(dir $(subst $(obj),,$@))
+
+# the POST lib archive
+$(LIB): $(GPLIB) $(SPLIB)
+	$(call cmd_link_o_target, $^)
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################