From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Jan 2013 06:11:30 +0000 (-0800)
Subject: Merge branch 'cc/no-gitk-build-dependency'
X-Git-Tag: v1.8.2-rc0~173
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1fd365d5efab58453d9200d51ddf6ec700e03d8b?hp=-c

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

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
---

1fd365d5efab58453d9200d51ddf6ec700e03d8b
diff --combined .gitignore
index 956ae2260d,32dc6b9ceb..8e8dc275db
--- a/.gitignore
+++ b/.gitignore
@@@ -1,8 -1,8 +1,8 @@@
  /GIT-BUILD-OPTIONS
  /GIT-CFLAGS
  /GIT-LDFLAGS
- /GIT-GUI-VARS
  /GIT-PREFIX
+ /GIT-PYTHON-VARS
  /GIT-SCRIPT-DEFINES
  /GIT-USER-AGENT
  /GIT-VERSION-FILE
@@@ -124,8 -124,7 +124,8 @@@
  /git-remote-ftps
  /git-remote-fd
  /git-remote-ext
 -/git-remote-testgit
 +/git-remote-testpy
 +/git-remote-testsvn
  /git-repack
  /git-replace
  /git-repo-config
@@@ -171,7 -170,6 +171,6 @@@
  /git-whatchanged
  /git-write-tree
  /git-core-*/?*
- /gitk-git/gitk-wish
  /gitweb/GITWEB-BUILD-OPTIONS
  /gitweb/gitweb.cgi
  /gitweb/static/gitweb.js
diff --combined Makefile
index 8e225cad7d,ef44bb82f4..56424b48b0
--- a/Makefile
+++ b/Makefile
@@@ -74,14 -74,10 +74,14 @@@ all:
  # Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks
  # d_type in struct dirent (Cygwin 1.5, fixed in Cygwin 1.7).
  #
 +# Define HAVE_STRINGS_H if you have strings.h and need it for strcasecmp.
 +#
  # Define NO_STRCASESTR if you don't have strcasestr.
  #
  # Define NO_MEMMEM if you don't have memmem.
  #
 +# Define NO_GETPAGESIZE if you don't have getpagesize.
 +#
  # Define NO_STRLCPY if you don't have strlcpy.
  #
  # Define NO_STRTOUMAX if you don't have both strtoimax and strtoumax in the
@@@ -169,10 -165,6 +169,10 @@@
  # Define NO_POLL if you do not have or don't want to use poll().
  # This also implies NO_SYS_POLL_H.
  #
 +# Define NEEDS_SYS_PARAM_H if you need to include sys/param.h to compile,
 +# *PLEASE* REPORT to git@vger.kernel.org if your platform needs this;
 +# we want to know more about the issue.
 +#
  # Define NO_PTHREADS if you do not have or do not want to use Pthreads.
  #
  # Define NO_PREAD if you have a problem with pread() system call (e.g.
@@@ -382,7 -374,7 +382,7 @@@ htmldir = share/doc/git-do
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
 -# DESTDIR=
 +# DESTDIR =
  pathsep = :
  
  export prefix bindir sharedir sysconfdir gitwebdir localedir
@@@ -478,7 -470,7 +478,7 @@@ SCRIPT_PERL += git-relink.per
  SCRIPT_PERL += git-send-email.perl
  SCRIPT_PERL += git-svn.perl
  
 -SCRIPT_PYTHON += git-remote-testgit.py
 +SCRIPT_PYTHON += git-remote-testpy.py
  SCRIPT_PYTHON += git-p4.py
  
  SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
@@@ -503,7 -495,6 +503,7 @@@ PROGRAM_OBJS += sh-i18n--envsubst.
  PROGRAM_OBJS += shell.o
  PROGRAM_OBJS += show-index.o
  PROGRAM_OBJS += upload-pack.o
 +PROGRAM_OBJS += remote-testsvn.o
  
  # Binary suffix, set to .exe for Windows builds
  X =
@@@ -583,9 -574,9 +583,9 @@@ endi
  export PERL_PATH
  export PYTHON_PATH
  
 -LIB_FILE=libgit.a
 -XDIFF_LIB=xdiff/lib.a
 -VCSSVN_LIB=vcs-svn/lib.a
 +LIB_FILE = libgit.a
 +XDIFF_LIB = xdiff/lib.a
 +VCSSVN_LIB = vcs-svn/lib.a
  
  LIB_H += xdiff/xinclude.h
  LIB_H += xdiff/xmacros.h
@@@ -754,7 -745,6 +754,7 @@@ LIB_OBJS += editor.
  LIB_OBJS += entry.o
  LIB_OBJS += environment.o
  LIB_OBJS += exec_cmd.o
 +LIB_OBJS += fetch-pack.o
  LIB_OBJS += fsck.o
  LIB_OBJS += gettext.o
  LIB_OBJS += gpg-interface.o
@@@ -772,7 -762,6 +772,7 @@@ LIB_OBJS += lockfile.
  LIB_OBJS += log-tree.o
  LIB_OBJS += mailmap.o
  LIB_OBJS += match-trees.o
 +LIB_OBJS += merge.o
  LIB_OBJS += merge-file.o
  LIB_OBJS += merge-recursive.o
  LIB_OBJS += mergesort.o
@@@ -807,7 -796,6 +807,7 @@@ LIB_OBJS += rerere.
  LIB_OBJS += resolve-undo.o
  LIB_OBJS += revision.o
  LIB_OBJS += run-command.o
 +LIB_OBJS += send-pack.o
  LIB_OBJS += sequencer.o
  LIB_OBJS += server-info.o
  LIB_OBJS += setup.o
@@@ -1094,7 -1082,6 +1094,7 @@@ ifeq ($(uname_O),Cygwin
  		NO_SYMLINK_HEAD = YesPlease
  		NO_IPV6 = YesPlease
  		OLD_ICONV = UnfortunatelyYes
 +		CYGWIN_V15_WIN32API = YesPlease
  	endif
  	NO_THREAD_SAFE_PREAD = YesPlease
  	NEEDS_LIBICONV = YesPlease
@@@ -1147,7 -1134,7 +1147,7 @@@ ifeq ($(uname_S),NetBSD
  endif
  ifeq ($(uname_S),AIX)
  	DEFAULT_PAGER = more
 -	NO_STRCASESTR=YesPlease
 +	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
  	NO_MKDTEMP = YesPlease
  	NO_MKSTEMPS = YesPlease
@@@ -1155,7 -1142,7 +1155,7 @@@
  	NO_NSEC = YesPlease
  	FREAD_READS_DIRECTORIES = UnfortunatelyYes
  	INTERNAL_QSORT = UnfortunatelyYes
 -	NEEDS_LIBICONV=YesPlease
 +	NEEDS_LIBICONV = YesPlease
  	BASIC_CFLAGS += -D_LARGE_FILES
  	ifeq ($(shell expr "$(uname_V)" : '[1234]'),1)
  		NO_PTHREADS = YesPlease
@@@ -1163,13 -1150,13 +1163,13 @@@
  		PTHREAD_LIBS = -lpthread
  	endif
  	ifeq ($(shell expr "$(uname_V).$(uname_R)" : '5\.1'),3)
 -		INLINE=''
 +		INLINE = ''
  	endif
  	GIT_TEST_CMP = cmp
  endif
  ifeq ($(uname_S),GNU)
  	# GNU/Hurd
 -	NO_STRLCPY=YesPlease
 +	NO_STRLCPY = YesPlease
  	NO_MKSTEMPS = YesPlease
  	HAVE_PATHS_H = YesPlease
  	LIBC_CONTAINS_LIBINTL = YesPlease
@@@ -1195,9 -1182,9 +1195,9 @@@ ifeq ($(uname_S),IRIX
  	NEEDS_LIBGEN = YesPlease
  endif
  ifeq ($(uname_S),IRIX64)
 -	NO_SETENV=YesPlease
 +	NO_SETENV = YesPlease
  	NO_UNSETENV = YesPlease
 -	NO_STRCASESTR=YesPlease
 +	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
  	NO_MKSTEMPS = YesPlease
  	NO_MKDTEMP = YesPlease
@@@ -1211,14 -1198,14 +1211,14 @@@
  	NO_REGEX = YesPlease
  	NO_FNMATCH_CASEFOLD = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
 -	SHELL_PATH=/usr/gnu/bin/bash
 +	SHELL_PATH = /usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
  endif
  ifeq ($(uname_S),HP-UX)
  	INLINE = __inline
 -	NO_IPV6=YesPlease
 -	NO_SETENV=YesPlease
 -	NO_STRCASESTR=YesPlease
 +	NO_IPV6 = YesPlease
 +	NO_SETENV = YesPlease
 +	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
  	NO_MKSTEMPS = YesPlease
  	NO_STRLCPY = YesPlease
@@@ -1361,7 -1348,6 +1361,7 @@@ ifeq ($(uname_S),NONSTOP_KERNEL
  	# Added manually, see above.
  	NEEDS_SSL_WITH_CURL = YesPlease
  	HAVE_LIBCHARSET_H = YesPlease
 +	HAVE_STRINGS_H = YesPlease
  	NEEDS_LIBICONV = YesPlease
  	NEEDS_LIBINTL_BEFORE_LIBICONV = YesPlease
  	NO_SYS_SELECT_H = UnfortunatelyYes
@@@ -1395,10 -1381,6 +1395,10 @@@
  	MKDIR_WO_TRAILING_SLASH = YesPlease
  	# RFE 10-120912-4693 submitted to HP NonStop development.
  	NO_SETITIMER = UnfortunatelyYes
 +	SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
 +	SHELL_PATH = /usr/local/bin/bash
 +	# as of H06.25/J06.14, we might better use this
 +	#SHELL_PATH = /usr/coreutils/bin/bash
  endif
  ifneq (,$(findstring MINGW,$(uname_S)))
  	pathsep = ;
@@@ -1446,7 -1428,7 +1446,7 @@@
  	X = .exe
  	SPARSE_FLAGS = -Wno-one-bit-signed-bitfield
  ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
 -	htmldir=doc/git/html/
 +	htmldir = doc/git/html/
  	prefix =
  	INSTALL = /bin/install
  	EXTLIBS += /mingw/lib/libz.a
@@@ -1457,22 -1439,6 +1457,22 @@@ els
  	NO_CURL = YesPlease
  endif
  endif
 +ifeq ($(uname_S),QNX)
 +	COMPAT_CFLAGS += -DSA_RESTART=0
 +	HAVE_STRINGS_H = YesPlease
 +	NEEDS_SOCKET = YesPlease
 +	NO_FNMATCH_CASEFOLD = YesPlease
 +	NO_GETPAGESIZE = YesPlease
 +	NO_ICONV = YesPlease
 +	NO_MEMMEM = YesPlease
 +	NO_MKDTEMP = YesPlease
 +	NO_MKSTEMPS = YesPlease
 +	NO_NSEC = YesPlease
 +	NO_PTHREADS = YesPlease
 +	NO_R_TO_GCC_LINKER = YesPlease
 +	NO_STRCASESTR = YesPlease
 +	NO_STRLCPY = YesPlease
 +endif
  
  -include config.mak.autogen
  -include config.mak
@@@ -1584,7 -1550,7 +1584,7 @@@ els
  		CURL_LIBCURL = -lcurl
  	endif
  	ifdef NEEDS_SSL_WITH_CURL
 -		CURL_LIBCURL +=	-lssl
 +		CURL_LIBCURL += -lssl
  		ifdef NEEDS_CRYPTO_WITH_SSL
  			CURL_LIBCURL += -lcrypto
  		endif
@@@ -1680,9 -1646,6 +1680,9 @@@ endi
  ifdef NO_D_INO_IN_DIRENT
  	BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
  endif
 +ifdef NO_GECOS_IN_PWENT
 +	BASIC_CFLAGS += -DNO_GECOS_IN_PWENT
 +endif
  ifdef NO_ST_BLOCKS_IN_STRUCT_STAT
  	BASIC_CFLAGS += -DNO_ST_BLOCKS_IN_STRUCT_STAT
  endif
@@@ -1776,9 -1739,6 +1776,9 @@@ endi
  ifdef NO_SYS_POLL_H
  	BASIC_CFLAGS += -DNO_SYS_POLL_H
  endif
 +ifdef NEEDS_SYS_PARAM_H
 +	BASIC_CFLAGS += -DNEEDS_SYS_PARAM_H
 +endif
  ifdef NO_INTTYPES_H
  	BASIC_CFLAGS += -DNO_INTTYPES_H
  endif
@@@ -1799,7 -1759,7 +1799,7 @@@ ifdef OBJECT_CREATION_USES_RENAME
  endif
  ifdef NO_STRUCT_ITIMERVAL
  	COMPAT_CFLAGS += -DNO_STRUCT_ITIMERVAL
 -	NO_SETITIMER=YesPlease
 +	NO_SETITIMER = YesPlease
  endif
  ifdef NO_SETITIMER
  	COMPAT_CFLAGS += -DNO_SETITIMER
@@@ -1890,9 -1850,6 +1890,9 @@@ ifdef NO_MEMME
  	COMPAT_CFLAGS += -DNO_MEMMEM
  	COMPAT_OBJS += compat/memmem.o
  endif
 +ifdef NO_GETPAGESIZE
 +	COMPAT_CFLAGS += -DNO_GETPAGESIZE
 +endif
  ifdef INTERNAL_QSORT
  	COMPAT_CFLAGS += -DINTERNAL_QSORT
  	COMPAT_OBJS += compat/qsort.o
@@@ -1918,10 -1875,6 +1918,10 @@@ ifdef HAVE_LIBCHARSET_
  	EXTLIBS += $(CHARSET_LIB)
  endif
  
 +ifdef HAVE_STRINGS_H
 +	BASIC_CFLAGS += -DHAVE_STRINGS_H
 +endif
 +
  ifdef HAVE_DEV_TTY
  	BASIC_CFLAGS += -DHAVE_DEV_TTY
  endif
@@@ -1936,9 -1889,6 +1936,9 @@@ ifdef NO_REGE
  	COMPAT_CFLAGS += -Icompat/regex
  	COMPAT_OBJS += compat/regex/regex.o
  endif
 +ifdef CYGWIN_V15_WIN32API
 +	COMPAT_CFLAGS += -DCYGWIN_V15_WIN32API
 +endif
  
  ifdef USE_NED_ALLOCATOR
         COMPAT_CFLAGS += -Icompat/nedmalloc
@@@ -1958,15 -1908,15 +1958,15 @@@ ifneq (,$(XDL_FAST_HASH)
  endif
  
  ifeq ($(TCLTK_PATH),)
 -NO_TCLTK=NoThanks
 +NO_TCLTK = NoThanks
  endif
  
  ifeq ($(PERL_PATH),)
 -NO_PERL=NoThanks
 +NO_PERL = NoThanks
  endif
  
  ifeq ($(PYTHON_PATH),)
 -NO_PYTHON=NoThanks
 +NO_PYTHON = NoThanks
  endif
  
  QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
@@@ -2013,13 -1963,13 +2013,13 @@@ PROFILE_DIR := $(CURDIR
  ifeq ("$(PROFILE)","GEN")
  	CFLAGS += -fprofile-generate=$(PROFILE_DIR) -DNO_NORETURN=1
  	EXTLIBS += -lgcov
 -	export CCACHE_DISABLE=t
 -	V=1
 +	export CCACHE_DISABLE = t
 +	V = 1
  else
  ifneq ("$(PROFILE)","")
  	CFLAGS += -fprofile-use=$(PROFILE_DIR) -fprofile-correction -DNO_NORETURN=1
 -	export CCACHE_DISABLE=t
 -	V=1
 +	export CCACHE_DISABLE = t
 +	V = 1
  endif
  endif
  
@@@ -2221,7 -2171,7 +2221,7 @@@ ende
  GIT-SCRIPT-DEFINES: FORCE
  	@FLAGS='$(SCRIPT_DEFINES)'; \
  	    if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \
- 		echo 1>&2 "    * new script parameters"; \
+ 		echo >&2 "    * new script parameters"; \
  		echo "$$FLAGS" >$@; \
              fi
  
@@@ -2283,7 -2233,7 +2283,7 @@@ $(patsubst %.perl,%,$(SCRIPT_PERL)) git
  endif # NO_PERL
  
  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
  	$(QUIET_GEN)$(RM) $@ $@+ && \
  	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
@@@ -2499,10 -2449,6 +2499,10 @@@ git-http-push$X: revision.o http.o http
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
 +git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)
 +	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) \
 +	$(VCSSVN_LIB)
 +
  $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
  	$(QUIET_LNCP)$(RM) $@ && \
  	ln $< $@ 2>/dev/null || \
@@@ -2602,7 -2548,7 +2602,7 @@@ TRACK_PREFIX = $(bindir_SQ):$(gitexecdi
  GIT-PREFIX: FORCE
  	@FLAGS='$(TRACK_PREFIX)'; \
  	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; \
  	fi
  
@@@ -2611,7 -2557,7 +2611,7 @@@ TRACK_CFLAGS = $(CC):$(subst ','\'',$(A
  GIT-CFLAGS: FORCE
  	@FLAGS='$(TRACK_CFLAGS)'; \
  	    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; \
              fi
  
@@@ -2620,7 -2566,7 +2620,7 @@@ TRACK_LDFLAGS = $(subst ','\'',$(ALL_LD
  GIT-LDFLAGS: FORCE
  	@FLAGS='$(TRACK_LDFLAGS)'; \
  	    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; \
              fi
  
@@@ -2662,14 -2608,14 +2662,14 @@@ ifdef GIT_PERF_MAKE_OPT
  	@echo GIT_PERF_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_MAKE_OPTS)))'\' >>$@
  endif
  
- ### Detect Tck/Tk interpreter path changes
- ifndef NO_TCLTK
- TRACK_VARS = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')
+ ### Detect Python interpreter path changes
+ ifndef NO_PYTHON
+ TRACK_PYTHON = $(subst ','\'',-DPYTHON_PATH='$(PYTHON_PATH_SQ)')
  
- GIT-GUI-VARS: FORCE
- 	@VARS='$(TRACK_VARS)'; \
+ GIT-PYTHON-VARS: FORCE
+ 	@VARS='$(TRACK_PYTHON)'; \
  	    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" >$@; \
              fi
  endif
@@@ -2868,7 -2814,7 +2868,7 @@@ git.spec: git.spec.in GIT-VERSION-FIL
  	sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
  	mv $@+ $@
  
 -GIT_TARNAME=git-$(GIT_VERSION)
 +GIT_TARNAME = git-$(GIT_VERSION)
  dist: git.spec git-archive$(X) configure
  	./git-archive --format=tar \
  		--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
@@@ -2948,8 -2894,8 +2948,8 @@@ ifndef NO_TCLT
  	$(MAKE) -C gitk-git clean
  	$(MAKE) -C git-gui clean
  endif
- 	$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-GUI-VARS GIT-BUILD-OPTIONS
- 	$(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES
+ 	$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS
+ 	$(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES GIT-PYTHON-VARS
  
  .PHONY: all install profile-clean clean strip
  .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell