Skip to content

Commit 0d5d7db

Browse files
gitstergitster
committed
Merge branch 'jk/make-fix-dependencies'
Build clean-up. * jk/make-fix-dependencies: Makefile: silence perl/PM.stamp recipe Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS Makefile: drop dependency between git-instaweb and gitweb
2 parents 103b6f9 + 7c37a5d commit 0d5d7db

File tree

1 file changed

+25
-24
lines changed

1 file changed

+25
-24
lines changed

‎Makefile‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,7 +1747,7 @@ $(SCRIPT_PERL_GEN): perl/perl.mak
17471747
perl/perl.mak: perl/PM.stamp
17481748

17491749
perl/PM.stamp: FORCE
1750-
$(QUIET_GEN)$(FIND) perl -type f -name '*.pm' | sort >$@+ && \
1750+
@$(FIND) perl -type f -name '*.pm' | sort >$@+ && \
17511751
{ cmp $@+ $@ >/dev/null 2>/dev/null || mv $@+ $@; } && \
17521752
$(RM) $@+
17531753

@@ -1784,7 +1784,7 @@ GIT-PERL-DEFINES: FORCE
17841784
gitweb:
17851785
$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
17861786

1787-
git-instaweb: git-instaweb.sh gitweb GIT-SCRIPT-DEFINES
1787+
git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
17881788
$(QUIET_GEN)$(cmd_munge_script) && \
17891789
chmod +x $@+ && \
17901790
mv $@+ $@
@@ -2103,46 +2103,47 @@ GIT-LDFLAGS: FORCE
21032103
# that runs GIT-BUILD-OPTIONS, and then again to protect it
21042104
# and the first level quoting from the shell that runs "echo".
21052105
GIT-BUILD-OPTIONS: FORCE
2106-
@echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@
2107-
@echo PERL_PATH=\''$(subst ','\'',$(PERL_PATH_SQ))'\' >>$@
2108-
@echo DIFF=\''$(subst ','\'',$(subst ','\'',$(DIFF)))'\' >>$@
2109-
@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@
2110-
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
2111-
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
2112-
@echo NO_EXPAT=\''$(subst ','\'',$(subst ','\'',$(NO_EXPAT)))'\' >>$@
2113-
@echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@
2114-
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
2115-
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
2116-
@echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@
2106+
@echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@+
2107+
@echo PERL_PATH=\''$(subst ','\'',$(PERL_PATH_SQ))'\' >>$@+
2108+
@echo DIFF=\''$(subst ','\'',$(subst ','\'',$(DIFF)))'\' >>$@+
2109+
@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@+
2110+
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@+
2111+
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@+
2112+
@echo NO_EXPAT=\''$(subst ','\'',$(subst ','\'',$(NO_EXPAT)))'\' >>$@+
2113+
@echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@+
2114+
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@+
2115+
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@+
2116+
@echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@+
21172117
ifdef TEST_OUTPUT_DIRECTORY
2118-
@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@
2118+
@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+
21192119
endif
21202120
ifdef GIT_TEST_OPTS
2121-
@echo GIT_TEST_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_OPTS)))'\' >>$@
2121+
@echo GIT_TEST_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_OPTS)))'\' >>$@+
21222122
endif
21232123
ifdef GIT_TEST_CMP
2124-
@echo GIT_TEST_CMP=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_CMP)))'\' >>$@
2124+
@echo GIT_TEST_CMP=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_CMP)))'\' >>$@+
21252125
endif
21262126
ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
2127-
@echo GIT_TEST_CMP_USE_COPIED_CONTEXT=YesPlease >>$@
2127+
@echo GIT_TEST_CMP_USE_COPIED_CONTEXT=YesPlease >>$@+
21282128
endif
2129-
@echo NO_GETTEXT=\''$(subst ','\'',$(subst ','\'',$(NO_GETTEXT)))'\' >>$@
2130-
@echo GETTEXT_POISON=\''$(subst ','\'',$(subst ','\'',$(GETTEXT_POISON)))'\' >>$@
2129+
@echo NO_GETTEXT=\''$(subst ','\'',$(subst ','\'',$(NO_GETTEXT)))'\' >>$@+
2130+
@echo GETTEXT_POISON=\''$(subst ','\'',$(subst ','\'',$(GETTEXT_POISON)))'\' >>$@+
21312131
ifdef GIT_PERF_REPEAT_COUNT
2132-
@echo GIT_PERF_REPEAT_COUNT=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_REPEAT_COUNT)))'\' >>$@
2132+
@echo GIT_PERF_REPEAT_COUNT=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_REPEAT_COUNT)))'\' >>$@+
21332133
endif
21342134
ifdef GIT_PERF_REPO
2135-
@echo GIT_PERF_REPO=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_REPO)))'\' >>$@
2135+
@echo GIT_PERF_REPO=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_REPO)))'\' >>$@+
21362136
endif
21372137
ifdef GIT_PERF_LARGE_REPO
2138-
@echo GIT_PERF_LARGE_REPO=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_LARGE_REPO)))'\' >>$@
2138+
@echo GIT_PERF_LARGE_REPO=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_LARGE_REPO)))'\' >>$@+
21392139
endif
21402140
ifdef GIT_PERF_MAKE_OPTS
2141-
@echo GIT_PERF_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_MAKE_OPTS)))'\' >>$@
2141+
@echo GIT_PERF_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_MAKE_OPTS)))'\' >>$@+
21422142
endif
21432143
ifdef TEST_GIT_INDEX_VERSION
2144-
@echo TEST_GIT_INDEX_VERSION=\''$(subst ','\'',$(subst ','\'',$(TEST_GIT_INDEX_VERSION)))'\' >>$@
2144+
@echo TEST_GIT_INDEX_VERSION=\''$(subst ','\'',$(subst ','\'',$(TEST_GIT_INDEX_VERSION)))'\' >>$@+
21452145
endif
2146+
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
21462147

21472148
### Detect Python interpreter path changes
21482149
ifndef NO_PYTHON

0 commit comments

Comments
 (0)