libpayload: Fix immediate rebuild after a clean
After running make clean, most of build/ directory gets deleted. It is (re)created in the "prepare" make target, but that was libpayload.a dependency after the $OBJS, while OBJS building already needs to dump its created object files there. Simply rearrange the make target dependencies to get at least "make clean;make" working.
Signed-off-by: Mart Raudsepp mart.raudsepp@artecdesign.ee --- libpayload/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libpayload/Makefile b/libpayload/Makefile index f2536e9..32c3957 100644 --- a/libpayload/Makefile +++ b/libpayload/Makefile @@ -111,7 +111,7 @@ copystuff: $(obj)/$(ARCHDIR-y)/head.S.o $(obj)/lib/libpayload.a $(Q)cp $(obj)/$(ARCHDIR-y)/head.S.o $(src)/lib/$(ARCHDIR-y)/head.o $(Q)cp $(obj)/lib/libpayload.a $(src)/lib
-$(obj)/lib/libpayload.a: $(OBJS) prepare +$(obj)/lib/libpayload.a: prepare $(OBJS) $(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AR) rc $@ $(OBJS)
Mart Raudsepp wrote:
libpayload: Fix immediate rebuild after a clean
After running make clean, most of build/ directory gets deleted. It is (re)created in the "prepare" make target, but that was libpayload.a dependency after the $OBJS, while OBJS building already needs to dump its created object files there. Simply rearrange the make target dependencies to get at least "make clean;make" working.
Signed-off-by: Mart Raudsepp mart.raudsepp@artecdesign.ee
Acked-by Jordan Crouse jordan@cosmicpenguin.net
r3771. Thanks.
libpayload/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libpayload/Makefile b/libpayload/Makefile index f2536e9..32c3957 100644 --- a/libpayload/Makefile +++ b/libpayload/Makefile @@ -111,7 +111,7 @@ copystuff: $(obj)/$(ARCHDIR-y)/head.S.o $(obj)/lib/libpayload.a $(Q)cp $(obj)/$(ARCHDIR-y)/head.S.o $(src)/lib/$(ARCHDIR-y)/head.o $(Q)cp $(obj)/lib/libpayload.a $(src)/lib
-$(obj)/lib/libpayload.a: $(OBJS) prepare +$(obj)/lib/libpayload.a: prepare $(OBJS) $(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AR) rc $@ $(OBJS)
-
Jordan Crouse -
Mart Raudsepp