projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mimc200' into next
[oweals/u-boot.git]
/
post
/
Makefile
diff --git
a/post/Makefile
b/post/Makefile
index 02b51544c2025124b75aa9f5b45c425e4ac90648..769e9c63966b939658b0b55470de292dcaead882 100644
(file)
--- a/
post/Makefile
+++ b/
post/Makefile
@@
-21,7
+21,8
@@
# MA 02111-1307 USA
#
# 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
LIB = libpost.a
GPLIB-$(CONFIG_HAS_POST) += libgenpost.a
@@
-37,8
+38,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)
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))
COBJS := $(COBJS-y)
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
@@
-46,12
+47,17
@@
LIB := $(obj)$(LIB)
all: $(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
# 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
$(MAKE) -C $(dir $(subst $(obj),,$@))
# the POST lib archive