From 461fa68d20861811487944d22291db5a13410e20 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Wed, 2 Jul 2008 23:00:14 +0200 Subject: Cleanup: replace hard-wired $(AR) 'crv' settings by $(ARFLAGS) Signed-off-by: Wolfgang Denk --- board/ms7722se/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/ms7722se/Makefile') diff --git a/board/ms7722se/Makefile b/board/ms7722se/Makefile index 6dec013..b384687 100644 --- a/board/ms7722se/Makefile +++ b/board/ms7722se/Makefile @@ -30,7 +30,7 @@ OBJS := ms7722se.o SOBJS := lowlevel_init.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) -- cgit v1.1 From a30cc5a340e7f8f5f85a0e08e7f6c4106ce117c4 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Wed, 2 Jul 2008 23:38:50 +0200 Subject: Cleanup: fix out-of-tree building for some boards Signed-off-by: Wolfgang Denk --- board/ms7722se/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'board/ms7722se/Makefile') diff --git a/board/ms7722se/Makefile b/board/ms7722se/Makefile index b384687..41e0faf 100644 --- a/board/ms7722se/Makefile +++ b/board/ms7722se/Makefile @@ -24,11 +24,15 @@ include $(TOPDIR)/config.mk -LIB = lib$(BOARD).a +LIB = $(obj)lib$(BOARD).a OBJS := ms7722se.o SOBJS := lowlevel_init.o +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + $(LIB): $(OBJS) $(SOBJS) $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) @@ -40,9 +44,9 @@ distclean: clean ######################################################################### -.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) - $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ +# defines $(obj).depend target +include $(SRCTREE)/rules.mk --include .depend +sinclude $(obj).depend ######################################################################### -- cgit v1.1 From c8a3b109f07f02342d097b30908965f7261d9f15 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Wed, 2 Jul 2008 23:49:18 +0200 Subject: Cleanup out-or-tree building for some boards (.depend) Signed-off-by: Wolfgang Denk --- board/ms7722se/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/ms7722se/Makefile') diff --git a/board/ms7722se/Makefile b/board/ms7722se/Makefile index 41e0faf..744744e 100644 --- a/board/ms7722se/Makefile +++ b/board/ms7722se/Makefile @@ -40,7 +40,7 @@ clean: rm -f $(SOBJS) $(OBJS) distclean: clean - rm -f $(LIB) core *.bak .depend + rm -f $(LIB) core *.bak $(obj).depend ######################################################################### -- cgit v1.1 From 9e23fe0560b84e324dc5f0ff8813dab2aa34f074 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 8 Jul 2008 12:03:24 +0900 Subject: sh: Fix SH-boards compile error By Cleanup out-or-tree building for some boards (.depend) (commit:c8a3b109f07f02342d097b30908965f7261d9f15) because filse ware changed, some SH-boards have compile error. I revised this problem. Signed-off-by: Nobuhiro Iwamatsu --- board/ms7722se/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/ms7722se/Makefile') diff --git a/board/ms7722se/Makefile b/board/ms7722se/Makefile index 744744e..b203b6d 100644 --- a/board/ms7722se/Makefile +++ b/board/ms7722se/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -OBJS := ms7722se.o +COBJS := ms7722se.o SOBJS := lowlevel_init.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -- cgit v1.1