浏览代码

xilinx-ppc4xx-generic: Fix Makefile to work with MAKEALL

config.mk only mkdirs $(obj), but we have objects shared with other
boards located on other dirs.

This patch mkdirs the needed dirs for the xlnx-generic boards.

Signed-off-by: Stefan Roese <sr@denx.de>
Ricardo Ribalda Delgado 14 年之前
父节点
当前提交
7e4c3a41ce
共有 2 个文件被更改,包括 7 次插入18 次删除
  1. 3 8
      board/xilinx/ppc405-generic/Makefile
  2. 4 10
      board/xilinx/ppc440-generic/Makefile

+ 3 - 8
board/xilinx/ppc405-generic/Makefile

@@ -27,12 +27,9 @@
 
 
 include $(TOPDIR)/config.mk
 include $(TOPDIR)/config.mk
 ifneq ($(OBJTREE),$(SRCTREE))
 ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../../xilinx/ppc405-generic)
 endif
 endif
 
 
-INCS		:=
-CFLAGS		+= $(INCS)
-HOSTCFLAGS	+= $(INCS)
-
 LIB	= $(obj)lib$(BOARD).o
 LIB	= $(obj)lib$(BOARD).o
 
 
 COBJS	+= ../../xilinx/ppc405-generic/xilinx_ppc405_generic.o
 COBJS	+= ../../xilinx/ppc405-generic/xilinx_ppc405_generic.o
@@ -41,10 +38,8 @@ SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 OBJS	:= $(addprefix $(obj),$(COBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
 
 
-all: $(LIB) $(SOBJS)
-
-$(LIB):	$(OBJS)
-	$(call cmd_link_o_target, $^)
+$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
+	$(call cmd_link_o_target, $(OBJS))
 
 
 clean:
 clean:
 	rm -f $(SOBJS) $(OBJS)
 	rm -f $(SOBJS) $(OBJS)

+ 4 - 10
board/xilinx/ppc440-generic/Makefile

@@ -27,26 +27,20 @@
 
 
 include $(TOPDIR)/config.mk
 include $(TOPDIR)/config.mk
 ifneq ($(OBJTREE),$(SRCTREE))
 ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../../xilinx/ppc440-generic)
 endif
 endif
 
 
-INCS		:=
-CFLAGS		+= $(INCS)
-HOSTCFLAGS	+= $(INCS)
-
 LIB	= $(obj)lib$(BOARD).o
 LIB	= $(obj)lib$(BOARD).o
 
 
 COBJS	+= ../../xilinx/ppc440-generic/xilinx_ppc440_generic.o
 COBJS	+= ../../xilinx/ppc440-generic/xilinx_ppc440_generic.o
-
-SOBJS	+= ../../xilinx/ppc440-generic/init.o
+SOBJS 	+= ../../xilinx/ppc440-generic/init.o
 
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 OBJS	:= $(addprefix $(obj),$(COBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
 SOBJS	:= $(addprefix $(obj),$(SOBJS))
 
 
-all: $(LIB) $(SOBJS)
-
-$(LIB):	$(OBJS)
-	$(call cmd_link_o_target, $^)
+$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
+	$(call cmd_link_o_target, $(OBJS))
 
 
 clean:
 clean:
 	rm -f $(SOBJS) $(OBJS)
 	rm -f $(SOBJS) $(OBJS)