Skip to content

Commit a36b575

Browse files
avargitster
authored andcommitted
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 0a43fb2 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent dab1b79 commit a36b575

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

contrib/scalar/Makefile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# The default target of this Makefile is...
2+
all::
3+
4+
include ../../config.mak.uname
5+
-include ../../config.mak.autogen
6+
-include ../../config.mak
7+
18
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
29
QUIET_SUBDIR1 =
310

@@ -12,12 +19,6 @@ else
1219
endif
1320
endif
1421

15-
all:
16-
17-
include ../../config.mak.uname
18-
-include ../../config.mak.autogen
19-
-include ../../config.mak
20-
2122
TARGETS = scalar$(X) scalar.o
2223
GITLIBS = ../../common-main.o ../../libgit.a ../../xdiff/lib.a
2324

0 commit comments

Comments
 (0)