| Message ID | patch-v5-1.8-7547bf3e481-20220303T160155Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a36b575aab3abe47a634e30ffe40c1a6d1dbb6da |
| Headers | show |
| Series | Makefile: optimize noop runs, add shared.mak | expand |
diff --git a/contrib/scalar/Makefile b/contrib/scalar/Makefile index 231b1ee1796..1e9b969f3df 100644 --- a/contrib/scalar/Makefile +++ b/contrib/scalar/Makefile @@ -1,3 +1,10 @@ +# The default target of this Makefile is... +all:: + +include ../../config.mak.uname +-include ../../config.mak.autogen +-include ../../config.mak + QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR1 = @@ -12,12 +19,6 @@ else endif endif -all: - -include ../../config.mak.uname --include ../../config.mak.autogen --include ../../config.mak - TARGETS = scalar$(X) scalar.o GITLIBS = ../../common-main.o ../../libgit.a ../../xdiff/lib.a
Make the "contrib/scalar/Makefile" be stylistically consistent with the top-level "Makefile" in first declaring "all" to be the default rule, followed by including other Makefile snippets. This adjusts code added in 0a43fb22026 (scalar: create a rudimentary executable, 2021-12-03), it further ensures that when we add another "include" file in a subsequent commit that the included file won't be the one to define our default target. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- contrib/scalar/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)