diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-14 01:15:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-14 01:15:58 +0300 |
| commit | f0beebdb7b068f7698d5854b770cd3407059e097 (patch) | |
| tree | bc4d1bed0dd924e723b9ee2c72f45b77e05bf1f9 | |
| parent | d7bc8521518d4821c5d2e18742991a6ad05efee1 (diff) | |
| parent | c234e8a0ecfaa53f88b228e50fafe849402f6c49 (diff) | |
Merge branch 'ab/make-sparse-for-real'
Prevent "make sparse" from running for the source files that
haven't been modified.
* ab/make-sparse-for-real:
Makefile: make the "sparse" target non-.PHONY
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 6be9de41ae..80c6bf6f3a 100644 --- a/.gitignore +++ b/.gitignore @@ -225,6 +225,7 @@ *.lib *.res *.sln +*.sp *.suo *.ncb *.vcproj @@ -2903,11 +2903,13 @@ check-sha1:: t/helper/test-tool$X SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ)) -$(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE +$(SP_OBJ): %.sp: %.c %.o GIT-CFLAGS $(QUIET_SP)cgcc -no-compile $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) \ - $(SPARSE_FLAGS) $(SP_EXTRA_FLAGS) $< + -Wsparse-error \ + $(SPARSE_FLAGS) $(SP_EXTRA_FLAGS) $< && \ + >$@ -.PHONY: sparse $(SP_OBJ) +.PHONY: sparse sparse: $(SP_OBJ) EXCEPT_HDRS := $(GENERATED_H) unicode-width.h compat/% xdiff/% @@ -3235,6 +3237,7 @@ clean: profile-clean coverage-clean cocciclean $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X $(RM) $(TEST_PROGRAMS) $(RM) $(FUZZ_PROGRAMS) + $(RM) $(SP_OBJ) $(RM) $(HCC) $(RM) -r bin-wrappers $(dep_dirs) $(compdb_dir) compile_commands.json $(RM) -r po/build/ |