diff options
| author |  Victoria Dye <vdye@github.com> | 2022-04-05 22:35:36 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-04-06 10:19:57 -0700 |
| commit | f2a2876f5a4a9c5250d8f64bd468677d506a956a (patch) | |
| tree | 177cb24e0c719b009f2ee2614bd3fdfc41a8e219 | |
| parent | Documentation/Makefile: fix "make info" regression in dad9cd7d518 (diff) | |
| download | tgif-f2a2876f5a4a9c5250d8f64bd468677d506a956a.tar.xz | |
contrib/scalar: fix 'all' target in Makefile
Add extra ':' to second 'all' target definition to allow 'scalar' to build.
Without this fix, the 'all:' and 'all::' targets together cause a build
failure when 'scalar' build is enabled with 'INCLUDE_SCALAR':
Makefile:14: *** target file `all' has both : and :: entries. Stop.
Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | contrib/scalar/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/scalar/Makefile b/contrib/scalar/Makefile index 5e86d78e19..37f283f35d 100644 --- a/contrib/scalar/Makefile +++ b/contrib/scalar/Makefile @@ -11,7 +11,7 @@ include ../../config.mak.uname TARGETS = scalar$(X) scalar.o GITLIBS = ../../common-main.o ../../libgit.a ../../xdiff/lib.a -all: scalar$(X) ../../bin-wrappers/scalar +all:: scalar$(X) ../../bin-wrappers/scalar $(GITLIBS): $(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) $(subst ../../,,$@) |