From a0bf3110668d2e9cb9ecf4826fe2a17a1d229b58 Mon Sep 17 00:00:00 2001 From: kozyilmaz Date: Wed, 15 Aug 2018 13:27:27 +0300 Subject: [PATCH] Squashed 'tools/' changes from 3e8a2cb..dacf7e0 dacf7e0 Merge commit '94626228c9cbd85f12b4bd940d0c558aabdd1705' 9462622 Squashed 'libmakefile/' changes from 23f6a23..7bf892c git-subtree-dir: tools git-subtree-split: dacf7e0175d9cc8e5ce609b7f9bf16f3c16fe993 --- libmakefile/Makefile.lib | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libmakefile/Makefile.lib b/libmakefile/Makefile.lib index 5463297..0b232d1 100644 --- a/libmakefile/Makefile.lib +++ b/libmakefile/Makefile.lib @@ -44,6 +44,7 @@ # 20180228 - rename distdir to dist.dir # 20180718 - fix @.cmd # 20180723 - use file_cflags-y if exists +# 20180807 - fix circular dependency with complex makefile setup # # Example @@ -704,7 +705,7 @@ define target-defaults_base $($1_objects_m): .$1/%.o: .$1/%.d $(MAKEFILE_LIST) $($1_objects_e): $(MAKEFILE_LIST) - $(target-depends): $(filter-out $($1_depends), $($1_depends-y)) + $(target-depends): $(filter-out $(target-builds) $($1_depends), $($1_depends-y)) $1: .$1/$1 $(MAKEFILE_LIST) $(do_cp)