git/Makefile, branch v1.8.2.2

Merge branch 'maint'

2013-03-17T07:11:11Z

* maint: rev-parse: clarify documentation of $name@{upstream} syntax sha1_name: pass object name length to diagnose_invalid_sha1_path() Makefile: keep LIB_H entries together and sorted

Makefile: keep LIB_H entries together and sorted

2013-03-17T05:23:04Z

As a follow-up to 60d24dd25 (Makefile: fold XDIFF_H and VCSSVN_H into LIB_H), let the unconditional additions to LIB_H form a single sorted list. Also drop the duplicate entry for xdiff/xdiff.h, which was easy to spot after sorting. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'jn/less-reconfigure' into maint

2013-02-27T17:59:19Z

* jn/less-reconfigure: Makefile: avoid infinite loop on configure.ac change

Revert "compat: add strtok_r()"

2013-02-26T17:16:58Z

This reverts commit 78457bc0ccc1af8b9eb776a0b17986ebd50442bc. commit 28c5d9e ("vcs-svn: drop string_pool") previously removed the only call-site for strtok_r. So let's get rid of the compat implementation as well. Signed-off-by: Erik Faye-Lund Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'jn/less-reconfigure'

2013-02-25T16:27:13Z

A change made on v1.8.1.x maintenance track had a nasty regression to break the build when autoconf is used. * jn/less-reconfigure: Makefile: avoid infinite loop on configure.ac change

Makefile: avoid infinite loop on configure.ac change

2013-02-21T07:56:05Z

If you are using autoconf and change the configure.ac, the Makefile will notice that config.status is older than configure.ac, and will attempt to rebuild and re-run the configure script to pick up your changes. The first step in doing so is to run "make configure". Unfortunately, this tries to include config.mak.autogen, which depends on config.status, which depends on configure.ac; so we must rebuild config.status. Which leads to us running "make configure", and so on. It's easy to demonstrate with: make configure ./configure touch configure.ac make We can break this cycle by not re-invoking make to build "configure", and instead just putting its rules inline into our config.status rebuild procedure. We can avoid a copy by factoring the rules into a make variable. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'mk/make-rm-depdirs-could-be-empty'

2013-02-15T00:06:24Z

"make COMPUTE_HEADER_DEPENDENCIES=no clean" would try to run "rm -rf $(dep_dirs)" with an empty dep_dir, but some implementations of "rm -rf" barf on an empty argument list. * mk/make-rm-depdirs-could-be-empty: Makefile: don't run "rm" without any files

Merge branch 'mk/old-expat'

2013-02-15T00:06:08Z

* mk/old-expat: Allow building with xmlparse.h

Makefile: don't run "rm" without any files

2013-02-13T20:30:43Z

When COMPUTE_HEADER_DEPENDENCIES is set to "auto" and the compiler does not support it, $(dep_dirs) becomes empty. "make clean" runs "rm -rf $(dep_dirs)", which can fail in such a case. Signed-off-by: Matt Kraai Signed-off-by: Junio C Hamano

Allow building with xmlparse.h

2013-02-11T22:33:04Z

expat 1.1 and 1.2 provide xmlparse.h instead of expat.h. Include the former on systems that define the EXPAT_NEEDS_XMLPARSE_H variable and define that variable on QNX systems, which ship with expat 1.1. Signed-off-by: Matt Kraai Signed-off-by: Junio C Hamano