development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 10:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cc/no-gitk-build-dependency'

Browse source 
Remove leftover bits from an earlier change to move gitk in its own
subdirectory.  Reimplementing the dependency tracking rules needs
to be done in gitk history separately.

* cc/no-gitk-build-dependency:
  Makefile: replace "echo 1>..." with "echo >..."
  Makefile: detect when PYTHON_PATH changes
  Makefile: remove tracking of TCLTK_PATH
This commit is contained in:
Junio C Hamano 2013-01-06 22:11:30 -08:00
parent 4f43e9726a 1a59d881de
commit 1fd365d5ef
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,8 +1,8 @@
/GIT-BUILD-OPTIONS /GIT-BUILD-OPTIONS
/GIT-CFLAGS /GIT-CFLAGS
/GIT-LDFLAGS /GIT-LDFLAGS
/GIT-GUI-VARS
/GIT-PREFIX /GIT-PREFIX
/GIT-PYTHON-VARS
/GIT-SCRIPT-DEFINES /GIT-SCRIPT-DEFINES
/GIT-USER-AGENT /GIT-USER-AGENT
/GIT-VERSION-FILE /GIT-VERSION-FILE
@ -171,7 +171,6 @@
/git-whatchanged /git-whatchanged
/git-write-tree /git-write-tree
/git-core-*/?* /git-core-*/?*
/gitk-git/gitk-wish
/gitweb/GITWEB-BUILD-OPTIONS /gitweb/GITWEB-BUILD-OPTIONS
/gitweb/gitweb.cgi /gitweb/gitweb.cgi
/gitweb/static/gitweb.js /gitweb/static/gitweb.js

26
Makefile
View file

@ -2221,7 +2221,7 @@ endef
GIT-SCRIPT-DEFINES: FORCE GIT-SCRIPT-DEFINES: FORCE
@FLAGS='$(SCRIPT_DEFINES)'; \ @FLAGS='$(SCRIPT_DEFINES)'; \
if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \ if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \
echo 1>&2 " * new script parameters"; \ echo >&2 " * new script parameters"; \
echo "$$FLAGS" >$@; \ echo "$$FLAGS" >$@; \
fi fi
@ -2283,7 +2283,7 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
endif # NO_PERL endif # NO_PERL
ifndef NO_PYTHON ifndef NO_PYTHON
$(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
$(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
$(QUIET_GEN)$(RM) $@ $@+ && \ $(QUIET_GEN)$(RM) $@ $@+ && \
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \ INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
@ -2602,7 +2602,7 @@ TRACK_PREFIX = $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ):\
GIT-PREFIX: FORCE GIT-PREFIX: FORCE
@FLAGS='$(TRACK_PREFIX)'; \ @FLAGS='$(TRACK_PREFIX)'; \
if test x"$$FLAGS" != x"`cat GIT-PREFIX 2>/dev/null`" ; then \ if test x"$$FLAGS" != x"`cat GIT-PREFIX 2>/dev/null`" ; then \
echo 1>&2 " * new prefix flags"; \ echo >&2 " * new prefix flags"; \
echo "$$FLAGS" >GIT-PREFIX; \ echo "$$FLAGS" >GIT-PREFIX; \
fi fi
@ -2611,7 +2611,7 @@ TRACK_CFLAGS = $(CC):$(subst ','\'',$(ALL_CFLAGS)):$(USE_GETTEXT_SCHEME)
GIT-CFLAGS: FORCE GIT-CFLAGS: FORCE
@FLAGS='$(TRACK_CFLAGS)'; \ @FLAGS='$(TRACK_CFLAGS)'; \
if test x"$$FLAGS" != x"`cat GIT-CFLAGS 2>/dev/null`" ; then \ if test x"$$FLAGS" != x"`cat GIT-CFLAGS 2>/dev/null`" ; then \
echo 1>&2 " * new build flags"; \ echo >&2 " * new build flags"; \
echo "$$FLAGS" >GIT-CFLAGS; \ echo "$$FLAGS" >GIT-CFLAGS; \
fi fi
@ -2620,7 +2620,7 @@ TRACK_LDFLAGS = $(subst ','\'',$(ALL_LDFLAGS))
GIT-LDFLAGS: FORCE GIT-LDFLAGS: FORCE
@FLAGS='$(TRACK_LDFLAGS)'; \ @FLAGS='$(TRACK_LDFLAGS)'; \
if test x"$$FLAGS" != x"`cat GIT-LDFLAGS 2>/dev/null`" ; then \ if test x"$$FLAGS" != x"`cat GIT-LDFLAGS 2>/dev/null`" ; then \
echo 1>&2 " * new link flags"; \ echo >&2 " * new link flags"; \
echo "$$FLAGS" >GIT-LDFLAGS; \ echo "$$FLAGS" >GIT-LDFLAGS; \
fi fi
@ -2662,14 +2662,14 @@ ifdef GIT_PERF_MAKE_OPTS
@echo GIT_PERF_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_MAKE_OPTS)))'\' >>$@ @echo GIT_PERF_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_MAKE_OPTS)))'\' >>$@
endif endif
### Detect Tck/Tk interpreter path changes ### Detect Python interpreter path changes
ifndef NO_TCLTK ifndef NO_PYTHON
TRACK_VARS = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)') TRACK_PYTHON = $(subst ','\'',-DPYTHON_PATH='$(PYTHON_PATH_SQ)')
GIT-GUI-VARS: FORCE GIT-PYTHON-VARS: FORCE
@VARS='$(TRACK_VARS)'; \ @VARS='$(TRACK_PYTHON)'; \
if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \ if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
echo 1>&2 " * new Tcl/Tk interpreter location"; \ echo >&2 " * new Python interpreter location"; \
echo "$$VARS" >$@; \ echo "$$VARS" >$@; \
fi fi
endif endif
@ -2948,8 +2948,8 @@ ifndef NO_TCLTK
$(MAKE) -C gitk-git clean $(MAKE) -C gitk-git clean
$(MAKE) -C git-gui clean $(MAKE) -C git-gui clean
endif endif
$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-GUI-VARS GIT-BUILD-OPTIONS $(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS
$(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES $(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES GIT-PYTHON-VARS
.PHONY: all install profile-clean clean strip .PHONY: all install profile-clean clean strip
.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell