summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-03-03 16:04:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-03-03 22:14:54 (GMT)
commita36b575aab3abe47a634e30ffe40c1a6d1dbb6da (patch)
treeb3deacb91de0107798f4d080c989e704a13ef314
parentdab1b7905d0b295f1acef9785bb2b9cbb0fdec84 (diff)
downloadgit-a36b575aab3abe47a634e30ffe40c1a6d1dbb6da.zip
git-a36b575aab3abe47a634e30ffe40c1a6d1dbb6da.tar.gz
git-a36b575aab3abe47a634e30ffe40c1a6d1dbb6da.tar.bz2
scalar Makefile: use "The default target of..." pattern
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--contrib/scalar/Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/contrib/scalar/Makefile b/contrib/scalar/Makefile
index 231b1ee..1e9b969 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