2005-12-01 20:26:41 +00:00
|
|
|
# The default target of this Makefile is...
|
2007-01-10 20:24:54 +00:00
|
|
|
all::
|
2005-12-01 20:26:41 +00:00
|
|
|
|
2007-03-06 07:09:14 +00:00
|
|
|
# Define V=1 to have a more verbose compile.
|
2007-03-06 06:35:01 +00:00
|
|
|
#
|
2006-02-28 23:07:20 +00:00
|
|
|
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
|
|
|
|
# This also implies MOZILLA_SHA1.
|
2005-05-22 22:08:15 +00:00
|
|
|
#
|
2005-11-02 19:19:24 +00:00
|
|
|
# Define NO_CURL if you do not have curl installed. git-http-pull and
|
|
|
|
# git-http-push are not built, and you cannot use http:// and https://
|
|
|
|
# transports.
|
2005-07-31 00:14:23 +00:00
|
|
|
#
|
2005-09-19 14:11:19 +00:00
|
|
|
# Define CURLDIR=/foo/bar if your curl header and library files are in
|
|
|
|
# /foo/bar/include and /foo/bar/lib directories.
|
|
|
|
#
|
2005-11-02 19:19:24 +00:00
|
|
|
# Define NO_EXPAT if you do not have expat installed. git-http-push is
|
|
|
|
# not built, and you cannot push using http:// and https:// transports.
|
|
|
|
#
|
2006-01-20 01:13:51 +00:00
|
|
|
# Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent.
|
|
|
|
#
|
2006-01-20 01:13:57 +00:00
|
|
|
# Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks
|
|
|
|
# d_type in struct dirent (latest Cygwin -- will be fixed soonish).
|
|
|
|
#
|
2006-07-30 15:38:28 +00:00
|
|
|
# Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
|
|
|
|
# do not support the 'size specifiers' introduced by C99, namely ll, hh,
|
|
|
|
# j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
|
2006-08-04 15:55:58 +00:00
|
|
|
# some C compilers supported these specifiers prior to C99 as an extension.
|
2006-07-30 15:38:28 +00:00
|
|
|
#
|
2005-09-19 01:30:50 +00:00
|
|
|
# Define NO_STRCASESTR if you don't have strcasestr.
|
|
|
|
#
|
2006-06-24 14:01:25 +00:00
|
|
|
# Define NO_STRLCPY if you don't have strlcpy.
|
|
|
|
#
|
2007-02-20 00:22:56 +00:00
|
|
|
# Define NO_STRTOUMAX if you don't have strtoumax in the C library.
|
|
|
|
# If your compiler also does not support long long or does not have
|
|
|
|
# strtoull, define NO_STRTOULL.
|
|
|
|
#
|
2005-12-02 23:08:28 +00:00
|
|
|
# Define NO_SETENV if you don't have setenv in the C library.
|
|
|
|
#
|
2006-05-02 07:40:24 +00:00
|
|
|
# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
|
|
|
|
# Enable it on Windows. By default, symrefs are still used.
|
2005-11-15 05:59:50 +00:00
|
|
|
#
|
2006-07-09 09:44:58 +00:00
|
|
|
# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability
|
2006-07-06 07:14:16 +00:00
|
|
|
# tests. These tests take up a significant amount of the total test time
|
|
|
|
# but are not needed unless you plan to talk to SVN repos.
|
|
|
|
#
|
2006-07-24 04:28:28 +00:00
|
|
|
# Define NO_FINK if you are building on Darwin/Mac OS X, have Fink
|
|
|
|
# installed in /sw, but don't want GIT to link against any libraries
|
|
|
|
# installed there. If defined you may specify your own (or Fink's)
|
|
|
|
# include directories and library directories by defining CFLAGS
|
|
|
|
# and LDFLAGS appropriately.
|
|
|
|
#
|
|
|
|
# Define NO_DARWIN_PORTS if you are building on Darwin/Mac OS X,
|
|
|
|
# have DarwinPorts installed in /opt/local, but don't want GIT to
|
|
|
|
# link against any libraries installed there. If defined you may
|
|
|
|
# specify your own (or DarwinPort's) include directories and
|
|
|
|
# library directories by defining CFLAGS and LDFLAGS appropriately.
|
|
|
|
#
|
2005-07-29 15:48:26 +00:00
|
|
|
# Define PPC_SHA1 environment variable when running make to make use of
|
|
|
|
# a bundled SHA1 routine optimized for PowerPC.
|
2005-09-07 19:22:56 +00:00
|
|
|
#
|
2005-09-20 16:27:13 +00:00
|
|
|
# Define ARM_SHA1 environment variable when running make to make use of
|
|
|
|
# a bundled SHA1 routine optimized for ARM.
|
|
|
|
#
|
2006-06-24 00:57:48 +00:00
|
|
|
# Define MOZILLA_SHA1 environment variable when running make to make use of
|
|
|
|
# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast
|
|
|
|
# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
|
|
|
|
# choice) has very fast version optimized for i586.
|
|
|
|
#
|
2005-09-07 19:22:56 +00:00
|
|
|
# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
|
2005-09-05 23:24:03 +00:00
|
|
|
#
|
2005-09-07 19:22:56 +00:00
|
|
|
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
|
2005-09-05 23:24:03 +00:00
|
|
|
#
|
|
|
|
# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
|
|
|
|
# Patrick Mauritz).
|
|
|
|
#
|
2005-10-08 22:54:36 +00:00
|
|
|
# Define NO_MMAP if you want to avoid mmap.
|
|
|
|
#
|
2007-01-09 21:04:12 +00:00
|
|
|
# Define NO_PREAD if you have a problem with pread() system call (e.g.
|
|
|
|
# cygwin.dll before v1.5.22).
|
|
|
|
#
|
2006-12-14 11:15:57 +00:00
|
|
|
# Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is
|
|
|
|
# generally faster on your platform than accessing the working directory.
|
|
|
|
#
|
2006-12-31 04:53:55 +00:00
|
|
|
# Define NO_TRUSTABLE_FILEMODE if your filesystem may claim to support
|
|
|
|
# the executable mode bit, but doesn't really do so.
|
|
|
|
#
|
2005-09-28 23:52:21 +00:00
|
|
|
# Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
|
|
|
|
#
|
2006-01-20 01:13:32 +00:00
|
|
|
# Define NO_SOCKADDR_STORAGE if your platform does not have struct
|
|
|
|
# sockaddr_storage.
|
|
|
|
#
|
2006-02-16 08:38:01 +00:00
|
|
|
# Define NO_ICONV if your libc does not properly support iconv.
|
|
|
|
#
|
2007-03-03 18:29:03 +00:00
|
|
|
# Define OLD_ICONV if your library has an old iconv(), where the second
|
|
|
|
# (input buffer pointer) parameter is declared with type (const char **).
|
|
|
|
#
|
2007-06-30 17:05:03 +00:00
|
|
|
# Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
|
|
|
|
# that tells runtime paths to dynamic libraries;
|
|
|
|
# "-Wl,-rpath=/path/lib" is used instead.
|
2006-12-27 22:17:35 +00:00
|
|
|
#
|
2005-07-29 15:48:26 +00:00
|
|
|
# Define USE_NSEC below if you want git to care about sub-second file mtimes
|
|
|
|
# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
|
|
|
|
# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
|
|
|
|
# randomly break unless your underlying filesystem supports those sub-second
|
|
|
|
# times (my ext3 doesn't).
|
2006-06-24 00:57:48 +00:00
|
|
|
#
|
2005-07-29 15:48:26 +00:00
|
|
|
# Define USE_STDEV below if you want git to care about the underlying device
|
|
|
|
# change being considered an inode change from the update-cache perspective.
|
2006-12-04 09:50:04 +00:00
|
|
|
#
|
2007-06-15 05:20:16 +00:00
|
|
|
# Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
|
|
|
|
#
|
2006-12-04 09:50:04 +00:00
|
|
|
# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
|
|
|
|
# MakeMaker (e.g. using ActiveState under Cygwin).
|
|
|
|
#
|
2007-03-28 11:00:23 +00:00
|
|
|
# Define NO_TCLTK if you do not want Tcl/Tk GUI.
|
|
|
|
#
|
2007-05-08 03:36:31 +00:00
|
|
|
# The TCL_PATH variable governs the location of the Tcl interpreter
|
|
|
|
# used to optimize git-gui for your system. Only used if NO_TCLTK
|
|
|
|
# is not set. Defaults to the bare 'tclsh'.
|
|
|
|
#
|
|
|
|
# The TCLTK_PATH variable governs the location of the Tcl/Tk interpreter.
|
2007-03-28 11:12:07 +00:00
|
|
|
# If not set it defaults to the bare 'wish'. If it is set to the empty
|
|
|
|
# string then NO_TCLTK will be forced (this is used by configure script).
|
|
|
|
#
|
2005-07-29 15:48:26 +00:00
|
|
|
|
2005-12-27 22:40:17 +00:00
|
|
|
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
|
2006-02-13 23:15:14 +00:00
|
|
|
@$(SHELL_PATH) ./GIT-VERSION-GEN
|
2005-12-27 22:40:17 +00:00
|
|
|
-include GIT-VERSION-FILE
|
2005-07-07 20:09:50 +00:00
|
|
|
|
2006-02-20 23:36:28 +00:00
|
|
|
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
|
|
|
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
|
|
|
|
uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
|
|
|
|
uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
|
|
|
|
uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
|
|
|
|
|
2005-11-13 09:46:13 +00:00
|
|
|
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
2005-11-05 07:50:09 +00:00
|
|
|
|
2005-08-06 05:36:15 +00:00
|
|
|
CFLAGS = -g -O2 -Wall
|
2005-11-13 09:46:13 +00:00
|
|
|
LDFLAGS =
|
2005-11-05 07:50:09 +00:00
|
|
|
ALL_CFLAGS = $(CFLAGS)
|
2005-11-13 09:46:13 +00:00
|
|
|
ALL_LDFLAGS = $(LDFLAGS)
|
2006-01-13 05:42:25 +00:00
|
|
|
STRIP ?= strip
|
2005-05-07 08:41:54 +00:00
|
|
|
|
2005-08-06 05:36:15 +00:00
|
|
|
prefix = $(HOME)
|
|
|
|
bindir = $(prefix)/bin
|
2006-02-20 23:36:28 +00:00
|
|
|
gitexecdir = $(bindir)
|
2007-06-11 08:02:17 +00:00
|
|
|
sharedir = $(prefix)/share
|
2007-06-11 09:10:47 +00:00
|
|
|
template_dir = $(sharedir)/git-core/templates
|
2007-04-24 07:51:35 +00:00
|
|
|
ifeq ($(prefix),/usr)
|
|
|
|
sysconfdir = /etc
|
|
|
|
else
|
|
|
|
sysconfdir = $(prefix)/etc
|
|
|
|
endif
|
2007-08-01 04:30:35 +00:00
|
|
|
lib = lib
|
2007-04-24 07:51:35 +00:00
|
|
|
ETC_GITCONFIG = $(sysconfdir)/gitconfig
|
2005-08-04 23:56:38 +00:00
|
|
|
# DESTDIR=
|
2005-04-13 09:14:06 +00:00
|
|
|
|
2006-08-01 19:34:08 +00:00
|
|
|
# default configuration for gitweb
|
2006-08-02 19:23:34 +00:00
|
|
|
GITWEB_CONFIG = gitweb_config.perl
|
2006-08-14 22:50:49 +00:00
|
|
|
GITWEB_HOME_LINK_STR = projects
|
2006-08-01 19:34:08 +00:00
|
|
|
GITWEB_SITENAME =
|
|
|
|
GITWEB_PROJECTROOT = /pub/git
|
2006-09-16 22:31:01 +00:00
|
|
|
GITWEB_EXPORT_OK =
|
|
|
|
GITWEB_STRICT_EXPORT =
|
2006-08-15 21:03:17 +00:00
|
|
|
GITWEB_BASE_URL =
|
2006-08-01 19:34:08 +00:00
|
|
|
GITWEB_LIST =
|
|
|
|
GITWEB_HOMETEXT = indextext.html
|
|
|
|
GITWEB_CSS = gitweb.css
|
2006-07-30 22:38:39 +00:00
|
|
|
GITWEB_LOGO = git-logo.png
|
2006-09-04 18:32:13 +00:00
|
|
|
GITWEB_FAVICON = git-favicon.png
|
2006-10-03 12:49:03 +00:00
|
|
|
GITWEB_SITE_HEADER =
|
|
|
|
GITWEB_SITE_FOOTER =
|
2006-08-01 19:34:08 +00:00
|
|
|
|
2007-05-08 03:36:31 +00:00
|
|
|
export prefix bindir gitexecdir sharedir template_dir sysconfdir
|
2006-06-29 20:11:25 +00:00
|
|
|
|
2005-08-06 05:36:15 +00:00
|
|
|
CC = gcc
|
|
|
|
AR = ar
|
2007-07-14 17:51:44 +00:00
|
|
|
RM = rm -f
|
2005-09-23 17:41:40 +00:00
|
|
|
TAR = tar
|
2007-07-29 22:23:28 +00:00
|
|
|
FIND = find
|
2005-08-06 05:36:15 +00:00
|
|
|
INSTALL = install
|
|
|
|
RPMBUILD = rpmbuild
|
2007-05-08 03:36:31 +00:00
|
|
|
TCL_PATH = tclsh
|
2007-03-28 11:12:07 +00:00
|
|
|
TCLTK_PATH = wish
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2007-05-08 03:36:31 +00:00
|
|
|
export TCL_PATH TCLTK_PATH
|
|
|
|
|
2005-07-03 17:02:35 +00:00
|
|
|
# sparse is architecture-neutral, which means that we need to tell it
|
|
|
|
# explicitly what architecture to check for. Fix this up for yours..
|
2005-08-06 05:36:15 +00:00
|
|
|
SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
|
2005-07-03 17:02:35 +00:00
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
|
|
|
|
|
|
|
|
### --- END CONFIGURATION SECTION ---
|
|
|
|
|
2006-06-25 01:47:03 +00:00
|
|
|
# Those must not be GNU-specific; they are shared with perl/ which may
|
2006-09-23 18:20:47 +00:00
|
|
|
# be built by a different compiler. (Note that this is an artifact now
|
|
|
|
# but it still might be nice to keep that distinction.)
|
|
|
|
BASIC_CFLAGS =
|
|
|
|
BASIC_LDFLAGS =
|
2006-06-25 01:47:03 +00:00
|
|
|
|
2005-09-08 00:26:23 +00:00
|
|
|
SCRIPT_SH = \
|
2006-10-23 21:27:45 +00:00
|
|
|
git-bisect.sh git-checkout.sh \
|
2006-10-23 23:01:57 +00:00
|
|
|
git-clean.sh git-clone.sh git-commit.sh \
|
2007-03-14 01:58:22 +00:00
|
|
|
git-fetch.sh \
|
2006-05-21 09:48:21 +00:00
|
|
|
git-ls-remote.sh \
|
2007-03-06 05:05:16 +00:00
|
|
|
git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \
|
2007-06-25 00:11:14 +00:00
|
|
|
git-pull.sh git-rebase.sh git-rebase--interactive.sh \
|
2005-09-08 00:26:23 +00:00
|
|
|
git-repack.sh git-request-pull.sh git-reset.sh \
|
2007-03-01 04:26:30 +00:00
|
|
|
git-sh-setup.sh \
|
2006-05-02 06:14:58 +00:00
|
|
|
git-tag.sh git-verify-tag.sh \
|
2007-05-25 02:25:25 +00:00
|
|
|
git-am.sh \
|
2005-09-11 00:56:19 +00:00
|
|
|
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
|
2006-05-16 23:46:31 +00:00
|
|
|
git-merge-resolve.sh git-merge-ours.sh \
|
2007-06-03 00:31:28 +00:00
|
|
|
git-lost-found.sh git-quiltimport.sh git-submodule.sh \
|
2007-06-30 05:37:09 +00:00
|
|
|
git-filter-branch.sh \
|
|
|
|
git-stash.sh
|
2005-09-08 00:26:23 +00:00
|
|
|
|
|
|
|
SCRIPT_PERL = \
|
git-add --interactive
A script to be driven when the user says "git add --interactive"
is introduced.
When it is run, first it runs its internal 'status' command to
show the current status, and then goes into its internactive
command loop.
The command loop shows the list of subcommands available, and
gives a prompt "What now> ". In general, when the prompt ends
with a single '>', you can pick only one of the choices given
and type return, like this:
*** Commands ***
1: status 2: update 3: revert 4: add untracked
5: patch 6: diff 7: quit 8: help
What now> 1
You also could say "s" or "sta" or "status" above as long as the
choice is unique.
The main command loop has 6 subcommands (plus help and quit).
* 'status' shows the change between HEAD and index (i.e. what
will be committed if you say "git commit"), and between index
and working tree files (i.e. what you could stage further
before "git commit" using "git-add") for each path. A sample
output looks like this:
staged unstaged path
1: binary nothing foo.png
2: +403/-35 +1/-1 git-add--interactive.perl
It shows that foo.png has differences from HEAD (but that is
binary so line count cannot be shown) and there is no
difference between indexed copy and the working tree
version (if the working tree version were also different,
'binary' would have been shown in place of 'nothing'). The
other file, git-add--interactive.perl, has 403 lines added
and 35 lines deleted if you commit what is in the index, but
working tree file has further modifications (one addition and
one deletion).
* 'update' shows the status information and gives prompt
"Update>>". When the prompt ends with double '>>', you can
make more than one selection, concatenated with whitespace or
comma. Also you can say ranges. E.g. "2-5 7,9" to choose
2,3,4,5,7,9 from the list. You can say '*' to choose
everything.
What you chose are then highlighted with '*', like this:
staged unstaged path
1: binary nothing foo.png
* 2: +403/-35 +1/-1 git-add--interactive.perl
To remove selection, prefix the input with - like this:
Update>> -2
After making the selection, answer with an empty line to
stage the contents of working tree files for selected paths
in the index.
* 'revert' has a very similar UI to 'update', and the staged
information for selected paths are reverted to that of the
HEAD version. Reverting new paths makes them untracked.
* 'add untracked' has a very similar UI to 'update' and
'revert', and lets you add untracked paths to the index.
* 'patch' lets you choose one path out of 'status' like
selection. After choosing the path, it presents diff between
the index and the working tree file and asks you if you want
to stage the change of each hunk. You can say:
y - add the change from that hunk to index
n - do not add the change from that hunk to index
a - add the change from that hunk and all the rest to index
d - do not the change from that hunk nor any of the rest to index
j - do not decide on this hunk now, and view the next
undecided hunk
J - do not decide on this hunk now, and view the next hunk
k - do not decide on this hunk now, and view the previous
undecided hunk
K - do not decide on this hunk now, and view the previous hunk
After deciding the fate for all hunks, if there is any hunk
that was chosen, the index is updated with the selected hunks.
* 'diff' lets you review what will be committed (i.e. between
HEAD and index).
This is still rough, but does everything except a few things I
think are needed.
* 'patch' should be able to allow splitting a hunk into
multiple hunks.
* 'patch' does not adjust the line offsets @@ -k,l +m,n @@
in the hunk header. This does not have major problem in
practice, but it _should_ do the adjustment.
* It does not have any explicit support for a merge in
progress; it may not work at all.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-12-11 04:55:50 +00:00
|
|
|
git-add--interactive.perl \
|
2005-09-08 00:26:23 +00:00
|
|
|
git-archimport.perl git-cvsimport.perl git-relink.perl \
|
2007-01-03 20:13:04 +00:00
|
|
|
git-cvsserver.perl git-remote.perl \
|
2006-07-26 01:52:35 +00:00
|
|
|
git-svnimport.perl git-cvsexportcommit.perl \
|
2006-07-06 07:14:16 +00:00
|
|
|
git-send-email.perl git-svn.perl
|
2005-07-31 00:31:47 +00:00
|
|
|
|
2005-11-21 23:44:15 +00:00
|
|
|
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
2007-03-01 04:26:30 +00:00
|
|
|
git-status git-instaweb
|
2005-11-21 23:44:15 +00:00
|
|
|
|
2006-01-13 05:37:17 +00:00
|
|
|
# ... and all the rest that could be moved out of bindir to gitexecdir
|
2005-09-08 00:26:23 +00:00
|
|
|
PROGRAMS = \
|
2007-05-29 02:05:43 +00:00
|
|
|
git-convert-objects$X git-fetch-pack$X \
|
2006-05-19 10:03:57 +00:00
|
|
|
git-hash-object$X git-index-pack$X git-local-fetch$X \
|
2006-08-05 06:04:21 +00:00
|
|
|
git-fast-import$X \
|
2006-11-05 07:28:25 +00:00
|
|
|
git-daemon$X \
|
2006-08-03 15:24:36 +00:00
|
|
|
git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
|
2006-08-02 16:32:32 +00:00
|
|
|
git-peek-remote$X git-receive-pack$X \
|
2006-05-23 12:15:35 +00:00
|
|
|
git-send-pack$X git-shell$X \
|
2005-10-03 19:04:44 +00:00
|
|
|
git-show-index$X git-ssh-fetch$X \
|
2006-05-23 12:15:31 +00:00
|
|
|
git-ssh-upload$X git-unpack-file$X \
|
2006-08-03 15:24:37 +00:00
|
|
|
git-update-server-info$X \
|
2007-05-29 02:05:43 +00:00
|
|
|
git-upload-pack$X \
|
2006-08-03 15:24:35 +00:00
|
|
|
git-pack-redundant$X git-var$X \
|
2007-01-10 11:36:36 +00:00
|
|
|
git-merge-tree$X git-imap-send$X \
|
2006-09-25 02:49:47 +00:00
|
|
|
git-merge-recursive$X \
|
2006-08-16 04:38:07 +00:00
|
|
|
$(EXTRA_PROGRAMS)
|
|
|
|
|
|
|
|
# Empty...
|
|
|
|
EXTRA_PROGRAMS =
|
2005-11-21 23:44:15 +00:00
|
|
|
|
2006-08-04 08:23:19 +00:00
|
|
|
BUILT_INS = \
|
2006-10-23 23:01:57 +00:00
|
|
|
git-format-patch$X git-show$X git-whatchanged$X git-cherry$X \
|
2007-01-29 00:16:53 +00:00
|
|
|
git-get-tar-commit-id$X git-init$X git-repo-config$X \
|
2007-03-01 04:26:30 +00:00
|
|
|
git-fsck-objects$X git-cherry-pick$X \
|
2006-08-04 08:51:04 +00:00
|
|
|
$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
|
2006-04-11 00:37:58 +00:00
|
|
|
|
2006-01-13 05:37:17 +00:00
|
|
|
# what 'all' will build and 'install' will install, in gitexecdir
|
2007-02-07 05:27:09 +00:00
|
|
|
ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2007-02-16 00:32:45 +00:00
|
|
|
ALL_PROGRAMS += git-merge-subtree$X
|
|
|
|
|
2007-03-28 11:00:23 +00:00
|
|
|
# what 'all' will build but not install in gitexecdir
|
|
|
|
OTHER_PROGRAMS = git$X gitweb/gitweb.cgi
|
|
|
|
ifndef NO_TCLTK
|
2007-03-28 11:22:02 +00:00
|
|
|
OTHER_PROGRAMS += gitk-wish
|
2007-03-28 11:00:23 +00:00
|
|
|
endif
|
|
|
|
|
2005-09-30 07:27:11 +00:00
|
|
|
# Backward compatibility -- to be removed after 1.0
|
2005-09-30 17:46:25 +00:00
|
|
|
PROGRAMS += git-ssh-pull$X git-ssh-push$X
|
2005-09-15 21:56:37 +00:00
|
|
|
|
2005-11-21 05:11:22 +00:00
|
|
|
# Set paths to tools early so that they can be used for version tests.
|
|
|
|
ifndef SHELL_PATH
|
|
|
|
SHELL_PATH = /bin/sh
|
|
|
|
endif
|
|
|
|
ifndef PERL_PATH
|
|
|
|
PERL_PATH = /usr/bin/perl
|
|
|
|
endif
|
2005-09-11 00:46:27 +00:00
|
|
|
|
2006-12-15 07:03:03 +00:00
|
|
|
export PERL_PATH
|
|
|
|
|
2005-04-18 19:49:39 +00:00
|
|
|
LIB_FILE=libgit.a
|
Use a *real* built-in diff generator
This uses a simplified libxdiff setup to generate unified diffs _without_
doing fork/execve of GNU "diff".
This has several huge advantages, for example:
Before:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m24.818s
user 0m13.332s
sys 0m8.664s
After:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m4.563s
user 0m2.944s
sys 0m1.580s
and the fact that this should be a lot more portable (ie we can ignore all
the issues with doing fork/execve under Windows).
Perhaps even more importantly, this allows us to do diffs without actually
ever writing out the git file contents to a temporary file (and without
any of the shell quoting issues on filenames etc etc).
NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
current "diff-core" code actually will always write the temp-files,
because it used to be something that you simply had to do. So this current
one actually writes a temp-file like before, and then reads it into memory
again just to do the diff. Stupid.
But if this basic infrastructure is accepted, we can start switching over
diff-core to not write temp-files, which should speed things up even
further, especially when doing big tree-to-tree diffs.
Now, in the interest of full disclosure, I should also point out a few
downsides:
- the libxdiff algorithm is different, and I bet GNU diff has gotten a
lot more testing. And the thing is, generating a diff is not an exact
science - you can get two different diffs (and you will), and they can
both be perfectly valid. So it's not possible to "validate" the
libxdiff output by just comparing it against GNU diff.
- GNU diff does some nice eye-candy, like trying to figure out what the
last function was, and adding that information to the "@@ .." line.
libxdiff doesn't do that.
- The libxdiff thing has some known deficiencies. In particular, it gets
the "\No newline at end of file" case wrong. So this is currently for
the experimental branch only. I hope Davide will help fix it.
That said, I think the huge performance advantage, and the fact that it
integrates better is definitely worth it. But it should go into a
development branch at least due to the missing newline issue.
Technical note: this is based on libxdiff-0.17, but I did some surgery to
get rid of the extraneous fat - stuff that git doesn't need, and seriously
cutting down on mmfile_t, which had much more capabilities than the diff
algorithm either needed or used. In this version, "mmfile_t" is just a
trivial <pointer,length> tuple.
That said, I tried to keep the differences to simple removals, so that you
can do a diff between this and the libxdiff origin, and you'll basically
see just things getting deleted. Even the mmfile_t simplifications are
left in a state where the diffs should be readable.
Apologies to Davide, whom I'd love to get feedback on this all from (I
wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
complex format had a helper function for that, but I did my surgery with
the goal in mind that eventually we _should_ just do
mmfile_t mf;
buf = read_sha1_file(sha1, type, &size);
mf->ptr = buf;
mf->size = size;
.. use "mf" directly ..
which was really a nightmare with the old "helpful" mmfile_t, and really
is that easy with the new cut-down interfaces).
[ Btw, as any hawk-eye can see from the diff, this was actually generated
with itself, so it is "self-hosting". That's about all the testing it
has gotten, along with the above kernel diff, which eye-balls correctly,
but shows the newline issue when you double-check it with "git-apply" ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-25 04:13:22 +00:00
|
|
|
XDIFF_LIB=xdiff/lib.a
|
[PATCH] Add update-server-info.
The git-update-server-info command prepares informational files
to help clients discover the contents of a repository, and pull
from it via a dumb transport protocols. Currently, the
following files are produced.
- The $repo/info/refs file lists the name of heads and tags
available in the $repo/refs/ directory, along with their
SHA1. This can be used by git-ls-remote command running on
the client side.
- The $repo/info/rev-cache file describes the commit ancestry
reachable from references in the $repo/refs/ directory. This
file is in an append-only binary format to make the server
side friendly to rsync mirroring scheme, and can be read by
git-show-rev-cache command.
- The $repo/objects/info/pack file lists the name of the packs
available, the interdependencies among them, and the head
commits and tags contained in them. Along with the other two
files, this is designed to help clients to make smart pull
decisions.
The git-receive-pack command is changed to invoke it at the end,
so just after a push to a public repository finishes via "git
push", the server info is automatically updated.
In addition, building of the rev-cache file can be done by a
standalone git-build-rev-cache command separately.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-24 00:54:41 +00:00
|
|
|
|
2005-09-08 00:26:23 +00:00
|
|
|
LIB_H = \
|
2006-09-17 23:02:52 +00:00
|
|
|
archive.h blob.h cache.h commit.h csum-file.h delta.h grep.h \
|
2006-09-18 01:32:03 +00:00
|
|
|
diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \
|
2006-03-30 06:55:43 +00:00
|
|
|
run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
|
2006-12-22 21:06:08 +00:00
|
|
|
tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \
|
2007-05-12 15:45:53 +00:00
|
|
|
utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h \
|
|
|
|
mailmap.h remote.h
|
2005-07-31 19:17:43 +00:00
|
|
|
|
2005-09-08 00:26:23 +00:00
|
|
|
DIFF_OBJS = \
|
2006-04-22 06:57:45 +00:00
|
|
|
diff.o diff-lib.o diffcore-break.o diffcore-order.o \
|
2006-03-01 00:01:36 +00:00
|
|
|
diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
|
2006-04-09 08:11:11 +00:00
|
|
|
diffcore-delta.o log-tree.o
|
2005-04-26 01:26:45 +00:00
|
|
|
|
2005-09-08 00:26:23 +00:00
|
|
|
LIB_OBJS = \
|
2006-05-20 07:56:11 +00:00
|
|
|
blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
|
2006-09-20 01:31:51 +00:00
|
|
|
date.o diff-delta.o entry.o exec_cmd.o ident.o \
|
|
|
|
interpolate.o \
|
|
|
|
lockfile.o \
|
2007-04-10 00:01:27 +00:00
|
|
|
patch-ids.o \
|
2007-05-02 16:13:14 +00:00
|
|
|
object.o pack-check.o pack-write.o patch-delta.o path.o pkt-line.o \
|
|
|
|
sideband.o reachable.o reflog-walk.o \
|
2006-06-18 18:45:02 +00:00
|
|
|
quote.o read-cache.o refs.o run-command.o dir.o object-refs.o \
|
2005-09-08 00:26:23 +00:00
|
|
|
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
|
2005-10-22 08:28:13 +00:00
|
|
|
tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
|
2006-11-01 22:06:23 +00:00
|
|
|
revision.o pager.o tree-walk.o xdiff-interface.o \
|
2007-02-16 00:32:45 +00:00
|
|
|
write_or_die.o trace.o list-objects.o grep.o match-trees.o \
|
2006-09-08 08:03:18 +00:00
|
|
|
alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
|
Lazy man's auto-CRLF
It currently does NOT know about file attributes, so it does its
conversion purely based on content. Maybe that is more in the "git
philosophy" anyway, since content is king, but I think we should try to do
the file attributes to turn it off on demand.
Anyway, BY DEFAULT it is off regardless, because it requires a
[core]
AutoCRLF = true
in your config file to be enabled. We could make that the default for
Windows, of course, the same way we do some other things (filemode etc).
But you can actually enable it on UNIX, and it will cause:
- "git update-index" will write blobs without CRLF
- "git diff" will diff working tree files without CRLF
- "git checkout" will write files to the working tree _with_ CRLF
and things work fine.
Funnily, it actually shows an odd file in git itself:
git clone -n git test-crlf
cd test-crlf
git config core.autocrlf true
git checkout
git diff
shows a diff for "Documentation/docbook-xsl.css". Why? Because we have
actually checked in that file *with* CRLF! So when "core.autocrlf" is
true, we'll always generate a *different* hash for it in the index,
because the index hash will be for the content _without_ CRLF.
Is this complete? I dunno. It seems to work for me. It doesn't use the
filename at all right now, and that's probably a deficiency (we could
certainly make the "is_binary()" heuristics also take standard filename
heuristics into account).
I don't pass in the filename at all for the "index_fd()" case
(git-update-index), so that would need to be passed around, but this
actually works fine.
NOTE NOTE NOTE! The "is_binary()" heuristics are totally made-up by yours
truly. I will not guarantee that they work at all reasonable. Caveat
emptor. But it _is_ simple, and it _is_ safe, since it's all off by
default.
The patch is pretty simple - the biggest part is the new "convert.c" file,
but even that is really just basic stuff that anybody can write in
"Teaching C 101" as a final project for their first class in programming.
Not to say that it's bug-free, of course - but at least we're not talking
about rocket surgery here.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-13 19:07:23 +00:00
|
|
|
color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \
|
2007-05-12 15:45:53 +00:00
|
|
|
convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o
|
2005-05-10 00:57:56 +00:00
|
|
|
|
2006-04-21 17:27:34 +00:00
|
|
|
BUILTIN_OBJS = \
|
2006-08-04 08:51:04 +00:00
|
|
|
builtin-add.o \
|
2006-10-09 10:32:05 +00:00
|
|
|
builtin-annotate.o \
|
2006-08-04 08:51:04 +00:00
|
|
|
builtin-apply.o \
|
Add git-archive
git-archive is a command to make TAR and ZIP archives of a git tree.
It helps prevent a proliferation of git-{format}-tree commands.
Instead of directly calling git-{tar,zip}-tree command, it defines
a very simple API, that archiver should implement and register in
"git-archive.c". This API is made up by 2 functions whose prototype
is defined in "archive.h" file.
- The first one is used to parse 'extra' parameters which have
signification only for the specific archiver. That would allow
different archive backends to have different kind of options.
- The second one is used to ask to an archive backend to build
the archive given some already resolved parameters.
The main reason for making this API is to avoid using
git-{tar,zip}-tree commands, hence making them useless. Maybe it's
time for them to die ?
It also implements remote operations by defining a very simple
protocol: it first sends the name of the specific uploader followed
the repository name (git-upload-tar git://example.org/repo.git).
Then it sends options. It's done by sending a sequence of one
argument per packet, with prefix "argument ", followed by a flush.
The remote protocol is implemented in "git-archive.c" for client
side and is triggered by "--remote=<repo>" option. For example,
to fetch a TAR archive in a remote repo, you can issue:
$ git archive --format=tar --remote=git://xxx/yyy/zzz.git HEAD
We choose to not make a new command "git-fetch-archive" for example,
avoind one more GIT command which should be nice for users (less
commands to remember, keeps existing --remote option).
Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Acked-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-07 13:12:02 +00:00
|
|
|
builtin-archive.o \
|
2006-11-09 02:47:54 +00:00
|
|
|
builtin-blame.o \
|
2006-10-23 21:27:45 +00:00
|
|
|
builtin-branch.o \
|
Add git-bundle: move objects and references by archive
Some workflows require use of repositories on machines that cannot be
connected, preventing use of git-fetch / git-push to transport objects and
references between the repositories.
git-bundle provides an alternate transport mechanism, effectively allowing
git-fetch and git-pull to operate using sneakernet transport. `git-bundle
create` allows the user to create a bundle containing one or more branches
or tags, but with specified basis assumed to exist on the target
repository. At the receiving end, git-bundle acts like git-fetch-pack,
allowing the user to invoke git-fetch or git-pull using the bundle file as
the URL. git-fetch and git-ls-remote determine they have a bundle URL by
checking that the URL points to a file, but are otherwise unchanged in
operation with bundles.
The original patch was done by Mark Levedahl <mdl123@verizon.net>.
It was updated to make git-bundle a builtin, and get rid of the tar
format: now, the first line is supposed to say "# v2 git bundle", the next
lines either contain a prerequisite ("-" followed by the hash of the
needed commit), or a ref (the hash of a commit, followed by the name of
the ref), and finally the pack. As a result, the bundle argument can be
"-" now.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-22 00:59:14 +00:00
|
|
|
builtin-bundle.o \
|
2006-08-04 08:51:04 +00:00
|
|
|
builtin-cat-file.o \
|
Add basic infrastructure to assign attributes to paths
This adds the basic infrastructure to assign attributes to
paths, in a way similar to what the exclusion mechanism does
based on $GIT_DIR/info/exclude and .gitignore files.
An attribute is just a simple string that does not contain any
whitespace. They can be specified in $GIT_DIR/info/attributes
file, and .gitattributes file in each directory.
Each line in these files defines a pattern matching rule.
Similar to the exclusion mechanism, a later match overrides an
earlier match in the same file, and entries from .gitattributes
file in the same directory takes precedence over the ones from
parent directories. Lines in $GIT_DIR/info/attributes file are
used as the lowest precedence default rules.
A line is either a comment (an empty line, or a line that begins
with a '#'), or a rule, which is a whitespace separated list of
tokens. The first token on the line is a shell glob pattern.
The rest are names of attributes, each of which can optionally
be prefixed with '!'. Such a line means "if a path matches this
glob, this attribute is set (or unset -- if the attribute name
is prefixed with '!'). For glob matching, the same "if the
pattern does not have a slash in it, the basename of the path is
matched with fnmatch(3) against the pattern, otherwise, the path
is matched with the pattern with FNM_PATHNAME" rule as the
exclusion mechanism is used.
This does not define what an attribute means. Tying an
attribute to various effects it has on git operation for paths
that have it will be specified separately.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-12 08:07:32 +00:00
|
|
|
builtin-check-attr.o \
|
2006-08-04 08:23:19 +00:00
|
|
|
builtin-checkout-index.o \
|
2006-08-04 08:51:04 +00:00
|
|
|
builtin-check-ref-format.o \
|
|
|
|
builtin-commit-tree.o \
|
|
|
|
builtin-count-objects.o \
|
2007-01-10 11:36:36 +00:00
|
|
|
builtin-describe.o \
|
2006-08-04 08:51:04 +00:00
|
|
|
builtin-diff.o \
|
|
|
|
builtin-diff-files.o \
|
|
|
|
builtin-diff-index.o \
|
|
|
|
builtin-diff-tree.o \
|
2007-01-16 08:23:24 +00:00
|
|
|
builtin-fetch--tool.o \
|
2006-08-04 08:51:04 +00:00
|
|
|
builtin-fmt-merge-msg.o \
|
2006-09-15 20:30:02 +00:00
|
|
|
builtin-for-each-ref.o \
|
2007-01-29 15:48:06 +00:00
|
|
|
builtin-fsck.o \
|
2007-03-14 01:58:22 +00:00
|
|
|
builtin-gc.o \
|
2006-08-04 08:51:04 +00:00
|
|
|
builtin-grep.o \
|
|
|
|
builtin-init-db.o \
|
|
|
|
builtin-log.o \
|
|
|
|
builtin-ls-files.o \
|
|
|
|
builtin-ls-tree.o \
|
|
|
|
builtin-mailinfo.o \
|
|
|
|
builtin-mailsplit.o \
|
2007-01-09 08:50:02 +00:00
|
|
|
builtin-merge-base.o \
|
2006-12-06 15:26:06 +00:00
|
|
|
builtin-merge-file.o \
|
2006-08-04 08:51:04 +00:00
|
|
|
builtin-mv.o \
|
|
|
|
builtin-name-rev.o \
|
|
|
|
builtin-pack-objects.o \
|
|
|
|
builtin-prune.o \
|
|
|
|
builtin-prune-packed.o \
|
|
|
|
builtin-push.o \
|
|
|
|
builtin-read-tree.o \
|
2006-12-19 08:23:12 +00:00
|
|
|
builtin-reflog.o \
|
2007-01-29 00:16:53 +00:00
|
|
|
builtin-config.o \
|
2006-12-20 16:39:41 +00:00
|
|
|
builtin-rerere.o \
|
2006-08-04 08:51:04 +00:00
|
|
|
builtin-rev-list.o \
|
|
|
|
builtin-rev-parse.o \
|
2007-03-01 04:26:30 +00:00
|
|
|
builtin-revert.o \
|
2006-08-04 08:51:04 +00:00
|
|
|
builtin-rm.o \
|
2006-09-08 08:05:34 +00:00
|
|
|
builtin-runstatus.o \
|
2006-10-22 11:23:31 +00:00
|
|
|
builtin-shortlog.o \
|
2006-08-04 08:51:04 +00:00
|
|
|
builtin-show-branch.o \
|
|
|
|
builtin-stripspace.o \
|
|
|
|
builtin-symbolic-ref.o \
|
|
|
|
builtin-tar-tree.o \
|
|
|
|
builtin-unpack-objects.o \
|
|
|
|
builtin-update-index.o \
|
|
|
|
builtin-update-ref.o \
|
2006-09-07 13:12:05 +00:00
|
|
|
builtin-upload-archive.o \
|
2006-08-10 15:02:38 +00:00
|
|
|
builtin-verify-pack.o \
|
2006-08-26 21:19:21 +00:00
|
|
|
builtin-write-tree.o \
|
2006-09-21 07:40:28 +00:00
|
|
|
builtin-show-ref.o \
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-11 23:37:32 +00:00
|
|
|
builtin-pack-refs.o
|
2006-04-21 17:27:34 +00:00
|
|
|
|
2006-03-26 23:14:52 +00:00
|
|
|
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
|
2007-07-29 18:35:45 +00:00
|
|
|
EXTLIBS =
|
2005-04-21 19:33:22 +00:00
|
|
|
|
2005-09-23 17:41:40 +00:00
|
|
|
#
|
|
|
|
# Platform specific tweaks
|
|
|
|
#
|
2005-10-09 19:52:35 +00:00
|
|
|
|
|
|
|
# We choose to avoid "if .. else if .. else .. endif endif"
|
|
|
|
# because maintaining the nesting to match is a pain. If
|
|
|
|
# we had "elif" things would have been much nicer...
|
|
|
|
|
2006-06-24 14:01:25 +00:00
|
|
|
ifeq ($(uname_S),Linux)
|
|
|
|
NO_STRLCPY = YesPlease
|
|
|
|
endif
|
2006-07-29 16:26:18 +00:00
|
|
|
ifeq ($(uname_S),GNU/kFreeBSD)
|
|
|
|
NO_STRLCPY = YesPlease
|
|
|
|
endif
|
2005-10-09 19:52:35 +00:00
|
|
|
ifeq ($(uname_S),Darwin)
|
2005-09-07 19:22:56 +00:00
|
|
|
NEEDS_SSL_WITH_CRYPTO = YesPlease
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
2007-04-06 23:49:17 +00:00
|
|
|
OLD_ICONV = UnfortunatelyYes
|
2006-06-24 14:01:25 +00:00
|
|
|
NO_STRLCPY = YesPlease
|
2005-09-07 19:22:56 +00:00
|
|
|
endif
|
2005-10-09 19:52:35 +00:00
|
|
|
ifeq ($(uname_S),SunOS)
|
2005-09-05 23:24:03 +00:00
|
|
|
NEEDS_SOCKET = YesPlease
|
2005-09-12 05:25:49 +00:00
|
|
|
NEEDS_NSL = YesPlease
|
2005-09-23 17:41:40 +00:00
|
|
|
SHELL_PATH = /bin/bash
|
|
|
|
NO_STRCASESTR = YesPlease
|
2007-06-13 18:54:32 +00:00
|
|
|
NO_HSTRERROR = YesPlease
|
2005-12-02 23:08:28 +00:00
|
|
|
ifeq ($(uname_R),5.8)
|
2006-02-20 23:36:28 +00:00
|
|
|
NEEDS_LIBICONV = YesPlease
|
2006-01-25 20:38:36 +00:00
|
|
|
NO_UNSETENV = YesPlease
|
2005-12-02 23:08:28 +00:00
|
|
|
NO_SETENV = YesPlease
|
2006-08-15 09:01:22 +00:00
|
|
|
NO_C99_FORMAT = YesPlease
|
2007-02-20 00:22:56 +00:00
|
|
|
NO_STRTOUMAX = YesPlease
|
2005-12-02 23:08:28 +00:00
|
|
|
endif
|
2006-04-11 18:42:26 +00:00
|
|
|
ifeq ($(uname_R),5.9)
|
|
|
|
NO_UNSETENV = YesPlease
|
|
|
|
NO_SETENV = YesPlease
|
2006-08-15 09:01:22 +00:00
|
|
|
NO_C99_FORMAT = YesPlease
|
2007-02-20 00:22:56 +00:00
|
|
|
NO_STRTOUMAX = YesPlease
|
2006-04-11 18:42:26 +00:00
|
|
|
endif
|
2005-09-23 17:41:40 +00:00
|
|
|
INSTALL = ginstall
|
|
|
|
TAR = gtar
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -D__EXTENSIONS__
|
2005-09-05 23:24:03 +00:00
|
|
|
endif
|
2005-10-09 19:52:35 +00:00
|
|
|
ifeq ($(uname_O),Cygwin)
|
2006-01-20 01:13:57 +00:00
|
|
|
NO_D_TYPE_IN_DIRENT = YesPlease
|
2006-01-20 01:13:51 +00:00
|
|
|
NO_D_INO_IN_DIRENT = YesPlease
|
2005-09-28 23:37:37 +00:00
|
|
|
NO_STRCASESTR = YesPlease
|
2006-05-02 07:40:24 +00:00
|
|
|
NO_SYMLINK_HEAD = YesPlease
|
2005-09-28 23:37:37 +00:00
|
|
|
NEEDS_LIBICONV = YesPlease
|
2006-12-14 11:15:57 +00:00
|
|
|
NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
|
2006-12-31 04:53:55 +00:00
|
|
|
NO_TRUSTABLE_FILEMODE = UnfortunatelyYes
|
2005-11-17 19:29:47 +00:00
|
|
|
# There are conflicting reports about this.
|
|
|
|
# On some boxes NO_MMAP is needed, and not so elsewhere.
|
2006-12-27 23:12:31 +00:00
|
|
|
# Try commenting this out if you suspect MMAP is more efficient
|
|
|
|
NO_MMAP = YesPlease
|
2005-09-28 23:52:21 +00:00
|
|
|
NO_IPV6 = YesPlease
|
2005-09-29 02:08:37 +00:00
|
|
|
X = .exe
|
2005-09-20 16:27:13 +00:00
|
|
|
endif
|
2006-01-26 18:04:30 +00:00
|
|
|
ifeq ($(uname_S),FreeBSD)
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -I/usr/local/include
|
|
|
|
BASIC_LDFLAGS += -L/usr/local/lib
|
2006-01-26 18:04:30 +00:00
|
|
|
endif
|
2005-10-09 19:52:35 +00:00
|
|
|
ifeq ($(uname_S),OpenBSD)
|
2005-10-10 18:51:11 +00:00
|
|
|
NO_STRCASESTR = YesPlease
|
2005-10-01 06:23:26 +00:00
|
|
|
NEEDS_LIBICONV = YesPlease
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -I/usr/local/include
|
|
|
|
BASIC_LDFLAGS += -L/usr/local/lib
|
2005-11-13 09:46:13 +00:00
|
|
|
endif
|
|
|
|
ifeq ($(uname_S),NetBSD)
|
2006-05-11 17:35:31 +00:00
|
|
|
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
endif
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -I/usr/pkg/include
|
|
|
|
BASIC_LDFLAGS += -L/usr/pkg/lib
|
|
|
|
ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
|
2005-10-01 06:23:26 +00:00
|
|
|
endif
|
2005-12-06 22:20:16 +00:00
|
|
|
ifeq ($(uname_S),AIX)
|
|
|
|
NO_STRCASESTR=YesPlease
|
2006-06-24 14:01:25 +00:00
|
|
|
NO_STRLCPY = YesPlease
|
2005-12-06 22:20:16 +00:00
|
|
|
NEEDS_LIBICONV=YesPlease
|
|
|
|
endif
|
2007-08-02 08:56:42 +00:00
|
|
|
ifeq ($(uname_S),GNU)
|
|
|
|
# GNU/Hurd
|
|
|
|
NO_STRLCPY=YesPlease
|
|
|
|
endif
|
2006-02-17 14:23:41 +00:00
|
|
|
ifeq ($(uname_S),IRIX64)
|
|
|
|
NO_IPV6=YesPlease
|
|
|
|
NO_SETENV=YesPlease
|
|
|
|
NO_STRCASESTR=YesPlease
|
2006-06-24 14:01:25 +00:00
|
|
|
NO_STRLCPY = YesPlease
|
2006-02-17 14:23:41 +00:00
|
|
|
NO_SOCKADDR_STORAGE=YesPlease
|
|
|
|
SHELL_PATH=/usr/gnu/bin/bash
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DPATH_MAX=1024
|
2006-02-17 14:23:41 +00:00
|
|
|
# for now, build 32-bit version
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_LDFLAGS += -L/usr/lib32
|
2006-02-17 14:23:41 +00:00
|
|
|
endif
|
2005-10-09 19:52:35 +00:00
|
|
|
ifneq (,$(findstring arm,$(uname_M)))
|
|
|
|
ARM_SHA1 = YesPlease
|
|
|
|
endif
|
2005-09-07 19:22:56 +00:00
|
|
|
|
2006-07-02 23:56:48 +00:00
|
|
|
-include config.mak.autogen
|
2005-10-11 22:22:47 +00:00
|
|
|
-include config.mak
|
2005-09-07 19:22:56 +00:00
|
|
|
|
2006-12-12 17:01:47 +00:00
|
|
|
ifeq ($(uname_S),Darwin)
|
|
|
|
ifndef NO_FINK
|
|
|
|
ifeq ($(shell test -d /sw/lib && echo y),y)
|
|
|
|
BASIC_CFLAGS += -I/sw/include
|
|
|
|
BASIC_LDFLAGS += -L/sw/lib
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
ifndef NO_DARWIN_PORTS
|
|
|
|
ifeq ($(shell test -d /opt/local/lib && echo y),y)
|
|
|
|
BASIC_CFLAGS += -I/opt/local/include
|
|
|
|
BASIC_LDFLAGS += -L/opt/local/lib
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2006-12-27 22:17:35 +00:00
|
|
|
ifdef NO_R_TO_GCC_LINKER
|
|
|
|
# Some gcc does not accept and pass -R to the linker to specify
|
|
|
|
# the runtime dynamic library path.
|
|
|
|
CC_LD_DYNPATH = -Wl,-rpath=
|
|
|
|
else
|
|
|
|
CC_LD_DYNPATH = -R
|
|
|
|
endif
|
|
|
|
|
2005-09-23 17:41:40 +00:00
|
|
|
ifndef NO_CURL
|
|
|
|
ifdef CURLDIR
|
2007-08-01 04:30:35 +00:00
|
|
|
# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -I$(CURLDIR)/include
|
2007-08-01 04:30:35 +00:00
|
|
|
CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
|
2005-09-23 17:41:40 +00:00
|
|
|
else
|
|
|
|
CURL_LIBCURL = -lcurl
|
|
|
|
endif
|
2005-09-30 17:46:25 +00:00
|
|
|
PROGRAMS += git-http-fetch$X
|
2005-11-19 01:08:36 +00:00
|
|
|
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
|
|
|
|
ifeq "$(curl_check)" "070908"
|
|
|
|
ifndef NO_EXPAT
|
|
|
|
PROGRAMS += git-http-push$X
|
|
|
|
endif
|
2005-11-02 19:19:24 +00:00
|
|
|
endif
|
2006-04-05 14:22:40 +00:00
|
|
|
ifndef NO_EXPAT
|
|
|
|
EXPAT_LIBEXPAT = -lexpat
|
|
|
|
endif
|
2005-09-23 17:41:40 +00:00
|
|
|
endif
|
|
|
|
|
2007-07-29 18:35:45 +00:00
|
|
|
ifdef ZLIB_PATH
|
|
|
|
BASIC_CFLAGS += -I$(ZLIB_PATH)/include
|
2007-08-01 04:30:35 +00:00
|
|
|
EXTLIBS += -L$(ZLIB_PATH)/$(lib) $(CC_LD_DYNPATH)$(ZLIB_PATH)/$(lib)
|
2007-07-29 18:35:45 +00:00
|
|
|
endif
|
|
|
|
EXTLIBS += -lz
|
|
|
|
|
2005-07-29 15:50:51 +00:00
|
|
|
ifndef NO_OPENSSL
|
2005-09-08 00:26:23 +00:00
|
|
|
OPENSSL_LIBSSL = -lssl
|
2005-09-30 20:31:16 +00:00
|
|
|
ifdef OPENSSLDIR
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
|
2007-08-01 04:30:35 +00:00
|
|
|
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
|
2005-09-30 20:31:16 +00:00
|
|
|
else
|
|
|
|
OPENSSL_LINK =
|
|
|
|
endif
|
2005-07-29 15:50:51 +00:00
|
|
|
else
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DNO_OPENSSL
|
2005-09-08 00:26:23 +00:00
|
|
|
MOZILLA_SHA1 = 1
|
|
|
|
OPENSSL_LIBSSL =
|
2005-07-29 15:50:51 +00:00
|
|
|
endif
|
2005-09-07 19:22:56 +00:00
|
|
|
ifdef NEEDS_SSL_WITH_CRYPTO
|
2005-09-30 20:31:16 +00:00
|
|
|
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl
|
2005-09-07 19:22:56 +00:00
|
|
|
else
|
2005-09-30 20:31:16 +00:00
|
|
|
LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
|
2005-09-07 19:22:56 +00:00
|
|
|
endif
|
|
|
|
ifdef NEEDS_LIBICONV
|
2005-09-30 20:31:16 +00:00
|
|
|
ifdef ICONVDIR
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -I$(ICONVDIR)/include
|
2007-08-01 04:30:35 +00:00
|
|
|
ICONV_LINK = -L$(ICONVDIR)/$(lib) $(CC_LD_DYNPATH)$(ICONVDIR)/$(lib)
|
2005-09-30 20:31:16 +00:00
|
|
|
else
|
|
|
|
ICONV_LINK =
|
|
|
|
endif
|
2006-06-25 01:35:12 +00:00
|
|
|
EXTLIBS += $(ICONV_LINK) -liconv
|
2005-09-07 19:22:56 +00:00
|
|
|
endif
|
2005-09-05 23:24:03 +00:00
|
|
|
ifdef NEEDS_SOCKET
|
2006-06-25 01:35:12 +00:00
|
|
|
EXTLIBS += -lsocket
|
2005-09-05 23:24:03 +00:00
|
|
|
endif
|
2005-09-12 05:25:49 +00:00
|
|
|
ifdef NEEDS_NSL
|
2006-06-25 01:35:12 +00:00
|
|
|
EXTLIBS += -lnsl
|
2005-09-12 05:25:49 +00:00
|
|
|
endif
|
2006-01-20 01:13:57 +00:00
|
|
|
ifdef NO_D_TYPE_IN_DIRENT
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT
|
2006-01-20 01:13:57 +00:00
|
|
|
endif
|
2006-01-20 01:13:51 +00:00
|
|
|
ifdef NO_D_INO_IN_DIRENT
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
|
2006-01-20 01:13:51 +00:00
|
|
|
endif
|
2006-07-30 15:38:28 +00:00
|
|
|
ifdef NO_C99_FORMAT
|
2007-02-06 00:53:12 +00:00
|
|
|
BASIC_CFLAGS += -DNO_C99_FORMAT
|
2006-07-30 15:38:28 +00:00
|
|
|
endif
|
2006-05-02 07:40:24 +00:00
|
|
|
ifdef NO_SYMLINK_HEAD
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DNO_SYMLINK_HEAD
|
2006-05-02 07:40:24 +00:00
|
|
|
endif
|
2005-09-19 01:30:50 +00:00
|
|
|
ifdef NO_STRCASESTR
|
2005-12-05 19:54:29 +00:00
|
|
|
COMPAT_CFLAGS += -DNO_STRCASESTR
|
2005-12-02 23:08:28 +00:00
|
|
|
COMPAT_OBJS += compat/strcasestr.o
|
|
|
|
endif
|
2006-06-24 14:01:25 +00:00
|
|
|
ifdef NO_STRLCPY
|
|
|
|
COMPAT_CFLAGS += -DNO_STRLCPY
|
|
|
|
COMPAT_OBJS += compat/strlcpy.o
|
|
|
|
endif
|
2007-02-20 00:22:56 +00:00
|
|
|
ifdef NO_STRTOUMAX
|
|
|
|
COMPAT_CFLAGS += -DNO_STRTOUMAX
|
|
|
|
COMPAT_OBJS += compat/strtoumax.o
|
|
|
|
endif
|
|
|
|
ifdef NO_STRTOULL
|
|
|
|
COMPAT_CFLAGS += -DNO_STRTOULL
|
|
|
|
endif
|
2005-12-02 23:08:28 +00:00
|
|
|
ifdef NO_SETENV
|
2005-12-05 19:54:29 +00:00
|
|
|
COMPAT_CFLAGS += -DNO_SETENV
|
2005-12-02 23:08:28 +00:00
|
|
|
COMPAT_OBJS += compat/setenv.o
|
2005-09-19 01:30:50 +00:00
|
|
|
endif
|
2006-08-29 10:51:14 +00:00
|
|
|
ifdef NO_UNSETENV
|
2006-01-25 20:38:36 +00:00
|
|
|
COMPAT_CFLAGS += -DNO_UNSETENV
|
|
|
|
COMPAT_OBJS += compat/unsetenv.o
|
|
|
|
endif
|
2005-10-08 22:54:36 +00:00
|
|
|
ifdef NO_MMAP
|
2005-12-05 19:54:29 +00:00
|
|
|
COMPAT_CFLAGS += -DNO_MMAP
|
2005-12-02 23:08:28 +00:00
|
|
|
COMPAT_OBJS += compat/mmap.o
|
2005-10-08 22:54:36 +00:00
|
|
|
endif
|
2007-01-09 21:04:12 +00:00
|
|
|
ifdef NO_PREAD
|
|
|
|
COMPAT_CFLAGS += -DNO_PREAD
|
|
|
|
COMPAT_OBJS += compat/pread.o
|
|
|
|
endif
|
2006-12-14 11:15:57 +00:00
|
|
|
ifdef NO_FAST_WORKING_DIRECTORY
|
|
|
|
BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY
|
|
|
|
endif
|
2006-12-31 04:53:55 +00:00
|
|
|
ifdef NO_TRUSTABLE_FILEMODE
|
|
|
|
BASIC_CFLAGS += -DNO_TRUSTABLE_FILEMODE
|
|
|
|
endif
|
2005-09-28 23:52:21 +00:00
|
|
|
ifdef NO_IPV6
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DNO_IPV6
|
2006-01-20 01:13:32 +00:00
|
|
|
endif
|
|
|
|
ifdef NO_SOCKADDR_STORAGE
|
|
|
|
ifdef NO_IPV6
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -Dsockaddr_storage=sockaddr_in
|
2006-01-20 01:13:32 +00:00
|
|
|
else
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -Dsockaddr_storage=sockaddr_in6
|
2006-01-20 01:13:32 +00:00
|
|
|
endif
|
2005-09-28 23:52:21 +00:00
|
|
|
endif
|
2006-05-21 21:37:00 +00:00
|
|
|
ifdef NO_INET_NTOP
|
|
|
|
LIB_OBJS += compat/inet_ntop.o
|
|
|
|
endif
|
2006-09-26 14:47:43 +00:00
|
|
|
ifdef NO_INET_PTON
|
|
|
|
LIB_OBJS += compat/inet_pton.o
|
|
|
|
endif
|
2005-04-21 19:33:22 +00:00
|
|
|
|
2006-02-16 08:38:01 +00:00
|
|
|
ifdef NO_ICONV
|
2006-06-25 01:47:03 +00:00
|
|
|
BASIC_CFLAGS += -DNO_ICONV
|
2006-02-16 08:38:01 +00:00
|
|
|
endif
|
|
|
|
|
2007-03-03 18:29:03 +00:00
|
|
|
ifdef OLD_ICONV
|
|
|
|
BASIC_CFLAGS += -DOLD_ICONV
|
|
|
|
endif
|
|
|
|
|
2005-09-20 16:27:13 +00:00
|
|
|
ifdef PPC_SHA1
|
|
|
|
SHA1_HEADER = "ppc/sha1.h"
|
|
|
|
LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
|
|
|
|
else
|
|
|
|
ifdef ARM_SHA1
|
|
|
|
SHA1_HEADER = "arm/sha1.h"
|
|
|
|
LIB_OBJS += arm/sha1.o arm/sha1_arm.o
|
|
|
|
else
|
|
|
|
ifdef MOZILLA_SHA1
|
|
|
|
SHA1_HEADER = "mozilla-sha1/sha1.h"
|
|
|
|
LIB_OBJS += mozilla-sha1/sha1.o
|
|
|
|
else
|
|
|
|
SHA1_HEADER = <openssl/sha.h>
|
2006-06-25 01:35:12 +00:00
|
|
|
EXTLIBS += $(LIB_4_CRYPTO)
|
2005-09-20 16:27:13 +00:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
2006-12-04 09:50:04 +00:00
|
|
|
ifdef NO_PERL_MAKEMAKER
|
|
|
|
export NO_PERL_MAKEMAKER
|
|
|
|
endif
|
2007-06-13 18:54:32 +00:00
|
|
|
ifdef NO_HSTRERROR
|
|
|
|
COMPAT_CFLAGS += -DNO_HSTRERROR
|
|
|
|
COMPAT_OBJS += compat/hstrerror.o
|
|
|
|
endif
|
2007-03-06 23:44:49 +00:00
|
|
|
|
2007-03-28 11:12:07 +00:00
|
|
|
ifeq ($(TCLTK_PATH),)
|
|
|
|
NO_TCLTK=NoThanks
|
|
|
|
endif
|
|
|
|
|
2007-04-04 20:42:33 +00:00
|
|
|
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
|
2007-03-06 23:44:49 +00:00
|
|
|
QUIET_SUBDIR1 =
|
|
|
|
|
2007-03-06 23:05:34 +00:00
|
|
|
ifneq ($(findstring $(MAKEFLAGS),w),w)
|
|
|
|
PRINT_DIR = --no-print-directory
|
|
|
|
else # "make -w"
|
|
|
|
NO_SUBDIR = :
|
|
|
|
endif
|
|
|
|
|
2007-03-06 23:44:49 +00:00
|
|
|
ifneq ($(findstring $(MAKEFLAGS),s),s)
|
2007-03-06 07:09:14 +00:00
|
|
|
ifndef V
|
2007-03-06 22:37:18 +00:00
|
|
|
QUIET_CC = @echo ' ' CC $@;
|
2007-03-06 06:35:01 +00:00
|
|
|
QUIET_AR = @echo ' ' AR $@;
|
|
|
|
QUIET_LINK = @echo ' ' LINK $@;
|
|
|
|
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
|
|
|
|
QUIET_GEN = @echo ' ' GEN $@;
|
2007-04-04 20:42:33 +00:00
|
|
|
QUIET_SUBDIR0 = +@subdir=
|
2007-03-06 23:05:34 +00:00
|
|
|
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
|
|
|
|
$(MAKE) $(PRINT_DIR) -C $$subdir
|
2007-03-06 07:09:14 +00:00
|
|
|
export V
|
2007-03-06 22:37:18 +00:00
|
|
|
export QUIET_GEN
|
2007-03-06 23:44:49 +00:00
|
|
|
export QUIET_BUILT_IN
|
|
|
|
endif
|
2007-03-06 06:35:01 +00:00
|
|
|
endif
|
2005-09-20 16:27:13 +00:00
|
|
|
|
2007-06-15 05:20:16 +00:00
|
|
|
ifdef ASCIIDOC8
|
|
|
|
export ASCIIDOC8
|
|
|
|
endif
|
|
|
|
|
2006-07-09 07:44:30 +00:00
|
|
|
# Shell quote (do not use $(call) to accommodate ancient setups);
|
2006-02-18 11:40:22 +00:00
|
|
|
|
|
|
|
SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
|
2007-02-14 11:48:14 +00:00
|
|
|
ETC_GITCONFIG_SQ = $(subst ','\'',$(ETC_GITCONFIG))
|
2006-02-18 11:40:22 +00:00
|
|
|
|
|
|
|
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
|
|
|
|
bindir_SQ = $(subst ','\'',$(bindir))
|
|
|
|
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
|
|
|
|
template_dir_SQ = $(subst ','\'',$(template_dir))
|
2006-06-14 22:36:00 +00:00
|
|
|
prefix_SQ = $(subst ','\'',$(prefix))
|
2006-02-18 11:40:22 +00:00
|
|
|
|
|
|
|
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
|
|
|
|
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
|
2007-03-28 11:12:07 +00:00
|
|
|
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
|
2006-02-18 11:40:22 +00:00
|
|
|
|
2006-06-25 01:35:12 +00:00
|
|
|
LIBS = $(GITLIBS) $(EXTLIBS)
|
|
|
|
|
2007-02-14 11:48:14 +00:00
|
|
|
BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
|
|
|
|
-DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS)
|
2005-12-02 23:08:28 +00:00
|
|
|
LIB_OBJS += $(COMPAT_OBJS)
|
2006-06-25 01:47:03 +00:00
|
|
|
|
|
|
|
ALL_CFLAGS += $(BASIC_CFLAGS)
|
|
|
|
ALL_LDFLAGS += $(BASIC_LDFLAGS)
|
|
|
|
|
2007-05-08 03:53:06 +00:00
|
|
|
export TAR INSTALL DESTDIR SHELL_PATH
|
2006-06-25 01:35:12 +00:00
|
|
|
|
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
### Build rules
|
|
|
|
|
2007-03-28 11:00:23 +00:00
|
|
|
all:: $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS)
|
2007-01-10 20:24:54 +00:00
|
|
|
ifneq (,$X)
|
2007-07-14 17:51:44 +00:00
|
|
|
$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$p';)
|
2007-01-10 20:24:54 +00:00
|
|
|
endif
|
2005-04-30 20:19:56 +00:00
|
|
|
|
2007-01-10 20:24:54 +00:00
|
|
|
all::
|
2007-03-28 11:00:23 +00:00
|
|
|
ifndef NO_TCLTK
|
2007-05-08 03:36:31 +00:00
|
|
|
$(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all
|
2007-03-28 11:00:23 +00:00
|
|
|
endif
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
|
|
|
|
$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1)
|
2005-08-06 05:36:15 +00:00
|
|
|
|
2006-01-13 05:42:25 +00:00
|
|
|
strip: $(PROGRAMS) git$X
|
|
|
|
$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
|
|
|
|
|
2007-03-28 11:22:02 +00:00
|
|
|
gitk-wish: gitk GIT-GUI-VARS
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_GEN)$(RM) $@ $@+ && \
|
2007-03-28 11:22:02 +00:00
|
|
|
sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
|
|
|
|
chmod +x $@+ && \
|
|
|
|
mv -f $@+ $@
|
|
|
|
|
2007-06-13 08:28:21 +00:00
|
|
|
git.o: git.c common-cmds.h GIT-CFLAGS
|
|
|
|
$(QUIET_CC)$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
|
|
|
|
$(ALL_CFLAGS) -c $(filter %.c,$^)
|
|
|
|
|
|
|
|
git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
|
2007-07-10 01:30:39 +00:00
|
|
|
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
|
2006-04-21 17:27:34 +00:00
|
|
|
$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
|
2005-09-08 04:26:52 +00:00
|
|
|
|
2006-08-04 08:51:04 +00:00
|
|
|
help.o: common-cmds.h
|
2006-04-22 04:56:13 +00:00
|
|
|
|
2007-02-16 00:32:45 +00:00
|
|
|
git-merge-subtree$X: git-merge-recursive$X
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_BUILT_IN)$(RM) $@ && ln git-merge-recursive$X $@
|
2007-02-16 00:32:45 +00:00
|
|
|
|
2006-04-11 00:37:58 +00:00
|
|
|
$(BUILT_INS): git$X
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@
|
2006-04-11 00:37:58 +00:00
|
|
|
|
2007-06-13 09:00:01 +00:00
|
|
|
common-cmds.h: ./generate-cmdlist.sh
|
|
|
|
|
2007-04-05 22:03:48 +00:00
|
|
|
common-cmds.h: $(wildcard Documentation/git-*.txt)
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@
|
2006-03-09 16:24:19 +00:00
|
|
|
|
2005-11-21 23:44:15 +00:00
|
|
|
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_GEN)$(RM) $@ $@+ && \
|
2006-02-18 11:40:22 +00:00
|
|
|
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
2006-07-08 15:32:04 +00:00
|
|
|
-e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
|
2005-10-04 19:41:35 +00:00
|
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
2006-02-15 11:37:30 +00:00
|
|
|
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
|
2007-03-06 06:35:01 +00:00
|
|
|
$@.sh >$@+ && \
|
|
|
|
chmod +x $@+ && \
|
Don't write directly to a make target ($@).
Otherwise, if make is suspended, or killed with prejudice, or if the
system crashes, you could be left with an up-to-date, yet corrupt,
generated file.
I left off the `clean' addition, because I believe "make clean" should
not remove wildcard patterns like "*+", on the off-chance that someone
uses names like that for files they care about. Besides, in practice,
those temporary files are left behind so rarely that they're not a bother,
and they're removed again as part of the next build.
[jc: sign-off?]
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-25 16:52:01 +00:00
|
|
|
mv $@+ $@
|
2005-09-09 01:50:33 +00:00
|
|
|
|
2006-12-04 09:50:04 +00:00
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
|
|
|
|
|
|
|
|
perl/perl.mak: GIT-CFLAGS
|
2007-03-06 22:37:18 +00:00
|
|
|
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
|
2006-12-04 09:50:04 +00:00
|
|
|
|
2006-06-25 02:41:03 +00:00
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_GEN)$(RM) $@ $@+ && \
|
2006-06-30 00:02:21 +00:00
|
|
|
INSTLIBDIR=`$(MAKE) -C perl -s --no-print-directory instlibdir` && \
|
2006-07-07 20:04:35 +00:00
|
|
|
sed -e '1{' \
|
|
|
|
-e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \
|
|
|
|
-e ' h' \
|
|
|
|
-e ' s=.*=use lib (split(/:/, $$ENV{GITPERLLIB} || "@@INSTLIBDIR@@"));=' \
|
|
|
|
-e ' H' \
|
|
|
|
-e ' x' \
|
|
|
|
-e '}' \
|
2006-06-25 02:41:03 +00:00
|
|
|
-e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
|
2005-10-04 19:41:35 +00:00
|
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
2007-03-06 06:35:01 +00:00
|
|
|
$@.perl >$@+ && \
|
|
|
|
chmod +x $@+ && \
|
Don't write directly to a make target ($@).
Otherwise, if make is suspended, or killed with prejudice, or if the
system crashes, you could be left with an up-to-date, yet corrupt,
generated file.
I left off the `clean' addition, because I believe "make clean" should
not remove wildcard patterns like "*+", on the off-chance that someone
uses names like that for files they care about. Besides, in practice,
those temporary files are left behind so rarely that they're not a bother,
and they're removed again as part of the next build.
[jc: sign-off?]
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-25 16:52:01 +00:00
|
|
|
mv $@+ $@
|
2005-09-09 01:50:33 +00:00
|
|
|
|
2006-02-10 08:45:59 +00:00
|
|
|
git-status: git-commit
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_GEN)cp $< $@+ && mv $@+ $@
|
2006-02-10 08:45:59 +00:00
|
|
|
|
2006-08-01 19:34:08 +00:00
|
|
|
gitweb/gitweb.cgi: gitweb/gitweb.perl
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_GEN)$(RM) $@ $@+ && \
|
2006-08-01 19:34:08 +00:00
|
|
|
sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
|
2006-08-02 20:50:20 +00:00
|
|
|
-e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
|
|
|
|
-e 's|++GIT_BINDIR++|$(bindir)|g' \
|
|
|
|
-e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \
|
2006-08-14 22:50:49 +00:00
|
|
|
-e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \
|
2006-08-02 20:50:20 +00:00
|
|
|
-e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \
|
|
|
|
-e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \
|
2006-09-16 22:31:01 +00:00
|
|
|
-e 's|++GITWEB_EXPORT_OK++|$(GITWEB_EXPORT_OK)|g' \
|
|
|
|
-e 's|++GITWEB_STRICT_EXPORT++|$(GITWEB_STRICT_EXPORT)|g' \
|
2006-08-15 21:03:17 +00:00
|
|
|
-e 's|++GITWEB_BASE_URL++|$(GITWEB_BASE_URL)|g' \
|
2006-08-02 20:50:20 +00:00
|
|
|
-e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \
|
|
|
|
-e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \
|
|
|
|
-e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \
|
|
|
|
-e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
|
2006-09-04 18:32:13 +00:00
|
|
|
-e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
|
2006-10-03 12:49:03 +00:00
|
|
|
-e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \
|
|
|
|
-e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \
|
2007-03-06 06:35:01 +00:00
|
|
|
$< >$@+ && \
|
|
|
|
chmod +x $@+ && \
|
2006-08-01 19:34:08 +00:00
|
|
|
mv $@+ $@
|
|
|
|
|
2006-07-01 22:14:14 +00:00
|
|
|
git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_GEN)$(RM) $@ $@+ && \
|
2006-07-01 22:14:14 +00:00
|
|
|
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
|
|
|
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
|
|
|
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
|
2006-07-08 15:27:10 +00:00
|
|
|
-e '/@@GITWEB_CGI@@/r gitweb/gitweb.cgi' \
|
2006-07-02 09:31:30 +00:00
|
|
|
-e '/@@GITWEB_CGI@@/d' \
|
2006-07-08 15:27:10 +00:00
|
|
|
-e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \
|
2006-07-02 09:31:30 +00:00
|
|
|
-e '/@@GITWEB_CSS@@/d' \
|
2007-03-06 06:35:01 +00:00
|
|
|
$@.sh > $@+ && \
|
|
|
|
chmod +x $@+ && \
|
2006-07-01 22:14:14 +00:00
|
|
|
mv $@+ $@
|
|
|
|
|
2006-08-08 16:35:23 +00:00
|
|
|
configure: configure.ac
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_GEN)$(RM) $@ $<+ && \
|
2006-08-08 16:35:23 +00:00
|
|
|
sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
|
2007-03-06 06:35:01 +00:00
|
|
|
$< > $<+ && \
|
|
|
|
autoconf -o $@ $<+ && \
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) $<+
|
2006-08-08 16:35:23 +00:00
|
|
|
|
2005-12-27 22:40:17 +00:00
|
|
|
# These can record GIT_VERSION
|
2007-07-10 01:30:39 +00:00
|
|
|
git.o git.spec \
|
2005-12-27 22:40:17 +00:00
|
|
|
$(patsubst %.sh,%,$(SCRIPT_SH)) \
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
|
|
|
: GIT-VERSION-FILE
|
2005-12-22 19:38:23 +00:00
|
|
|
|
2006-06-14 22:36:00 +00:00
|
|
|
%.o: %.c GIT-CFLAGS
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
2007-05-30 17:42:41 +00:00
|
|
|
%.s: %.c GIT-CFLAGS
|
|
|
|
$(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $<
|
2005-08-06 05:36:15 +00:00
|
|
|
%.o: %.S
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
2005-05-19 14:27:14 +00:00
|
|
|
|
2006-06-14 22:36:00 +00:00
|
|
|
exec_cmd.o: exec_cmd.c GIT-CFLAGS
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' $<
|
2006-06-22 01:47:00 +00:00
|
|
|
builtin-init-db.o: builtin-init-db.c GIT-CFLAGS
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $<
|
2006-01-11 02:12:17 +00:00
|
|
|
|
2006-06-14 22:36:00 +00:00
|
|
|
http.o: http.c GIT-CFLAGS
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DGIT_USER_AGENT='"git/$(GIT_VERSION)"' $<
|
2006-04-04 17:11:29 +00:00
|
|
|
|
2006-04-04 12:33:18 +00:00
|
|
|
ifdef NO_EXPAT
|
2006-06-14 22:36:00 +00:00
|
|
|
http-fetch.o: http-fetch.c http.h GIT-CFLAGS
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DNO_EXPAT $<
|
2006-04-04 12:33:18 +00:00
|
|
|
endif
|
|
|
|
|
2006-04-01 00:23:46 +00:00
|
|
|
git-%$X: %.o $(GITLIBS)
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
|
2005-07-29 17:21:53 +00:00
|
|
|
|
2006-07-28 09:17:46 +00:00
|
|
|
ssh-pull.o: ssh-fetch.c
|
|
|
|
ssh-push.o: ssh-upload.c
|
2005-09-30 17:46:25 +00:00
|
|
|
git-local-fetch$X: fetch.o
|
|
|
|
git-ssh-fetch$X: rsh.o fetch.o
|
|
|
|
git-ssh-upload$X: rsh.o
|
|
|
|
git-ssh-pull$X: rsh.o fetch.o
|
|
|
|
git-ssh-push$X: rsh.o
|
2005-04-29 21:09:11 +00:00
|
|
|
|
2006-03-10 05:32:50 +00:00
|
|
|
git-imap-send$X: imap-send.o $(LIB_FILE)
|
|
|
|
|
2006-06-06 21:26:57 +00:00
|
|
|
http.o http-fetch.o http-push.o: http.h
|
2006-07-03 07:53:13 +00:00
|
|
|
git-http-fetch$X: fetch.o http.o http-fetch.o $(GITLIBS)
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
2006-04-04 12:33:18 +00:00
|
|
|
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
|
2006-02-18 11:40:22 +00:00
|
|
|
|
2006-07-03 07:53:13 +00:00
|
|
|
git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
|
2007-03-06 06:35:01 +00:00
|
|
|
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
2006-02-18 11:40:22 +00:00
|
|
|
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
|
|
|
|
|
2007-02-27 23:55:48 +00:00
|
|
|
$(LIB_OBJS) $(BUILTIN_OBJS) fetch.o: $(LIB_H)
|
2006-06-22 22:43:47 +00:00
|
|
|
$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
|
2005-07-29 15:48:50 +00:00
|
|
|
$(DIFF_OBJS): diffcore.h
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
$(LIB_FILE): $(LIB_OBJS)
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
|
2005-07-29 15:50:24 +00:00
|
|
|
|
xdiff: add xdl_merge()
This new function implements the functionality of RCS merge, but
in-memory. It returns < 0 on error, otherwise the number of conflicts.
Finding the conflicting lines can be a very expensive task. You can
control the eagerness of this algorithm:
- a level value of 0 means that all overlapping changes are treated
as conflicts,
- a value of 1 means that if the overlapping changes are identical,
it is not treated as a conflict.
- If you set level to 2, overlapping changes will be analyzed, so that
almost identical changes will not result in huge conflicts. Rather,
only the conflicting lines will be shown inside conflict markers.
With each increasing level, the algorithm gets slower, but more accurate.
Note that the code for level 2 depends on the simple definition of
mmfile_t specific to git, and therefore it will be harder to port that
to LibXDiff.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-11-21 22:24:34 +00:00
|
|
|
XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
|
|
|
|
xdiff/xmerge.o
|
2006-10-17 18:08:08 +00:00
|
|
|
$(XDIFF_OBJS): xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \
|
|
|
|
xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
|
Use a *real* built-in diff generator
This uses a simplified libxdiff setup to generate unified diffs _without_
doing fork/execve of GNU "diff".
This has several huge advantages, for example:
Before:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m24.818s
user 0m13.332s
sys 0m8.664s
After:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m4.563s
user 0m2.944s
sys 0m1.580s
and the fact that this should be a lot more portable (ie we can ignore all
the issues with doing fork/execve under Windows).
Perhaps even more importantly, this allows us to do diffs without actually
ever writing out the git file contents to a temporary file (and without
any of the shell quoting issues on filenames etc etc).
NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
current "diff-core" code actually will always write the temp-files,
because it used to be something that you simply had to do. So this current
one actually writes a temp-file like before, and then reads it into memory
again just to do the diff. Stupid.
But if this basic infrastructure is accepted, we can start switching over
diff-core to not write temp-files, which should speed things up even
further, especially when doing big tree-to-tree diffs.
Now, in the interest of full disclosure, I should also point out a few
downsides:
- the libxdiff algorithm is different, and I bet GNU diff has gotten a
lot more testing. And the thing is, generating a diff is not an exact
science - you can get two different diffs (and you will), and they can
both be perfectly valid. So it's not possible to "validate" the
libxdiff output by just comparing it against GNU diff.
- GNU diff does some nice eye-candy, like trying to figure out what the
last function was, and adding that information to the "@@ .." line.
libxdiff doesn't do that.
- The libxdiff thing has some known deficiencies. In particular, it gets
the "\No newline at end of file" case wrong. So this is currently for
the experimental branch only. I hope Davide will help fix it.
That said, I think the huge performance advantage, and the fact that it
integrates better is definitely worth it. But it should go into a
development branch at least due to the missing newline issue.
Technical note: this is based on libxdiff-0.17, but I did some surgery to
get rid of the extraneous fat - stuff that git doesn't need, and seriously
cutting down on mmfile_t, which had much more capabilities than the diff
algorithm either needed or used. In this version, "mmfile_t" is just a
trivial <pointer,length> tuple.
That said, I tried to keep the differences to simple removals, so that you
can do a diff between this and the libxdiff origin, and you'll basically
see just things getting deleted. Even the mmfile_t simplifications are
left in a state where the diffs should be readable.
Apologies to Davide, whom I'd love to get feedback on this all from (I
wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
complex format had a helper function for that, but I did my surgery with
the goal in mind that eventually we _should_ just do
mmfile_t mf;
buf = read_sha1_file(sha1, type, &size);
mf->ptr = buf;
mf->size = size;
.. use "mf" directly ..
which was really a nightmare with the old "helpful" mmfile_t, and really
is that easy with the new cut-down interfaces).
[ Btw, as any hawk-eye can see from the diff, this was actually generated
with itself, so it is "self-hosting". That's about all the testing it
has gotten, along with the above kernel diff, which eye-balls correctly,
but shows the newline issue when you double-check it with "git-apply" ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-25 04:13:22 +00:00
|
|
|
|
|
|
|
$(XDIFF_LIB): $(XDIFF_OBJS)
|
2007-07-14 17:51:44 +00:00
|
|
|
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
|
Use a *real* built-in diff generator
This uses a simplified libxdiff setup to generate unified diffs _without_
doing fork/execve of GNU "diff".
This has several huge advantages, for example:
Before:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m24.818s
user 0m13.332s
sys 0m8.664s
After:
[torvalds@g5 linux]$ time git diff v2.6.16.. > /dev/null
real 0m4.563s
user 0m2.944s
sys 0m1.580s
and the fact that this should be a lot more portable (ie we can ignore all
the issues with doing fork/execve under Windows).
Perhaps even more importantly, this allows us to do diffs without actually
ever writing out the git file contents to a temporary file (and without
any of the shell quoting issues on filenames etc etc).
NOTE! THIS PATCH DOES NOT DO THAT OPTIMIZATION YET! I was lazy, and the
current "diff-core" code actually will always write the temp-files,
because it used to be something that you simply had to do. So this current
one actually writes a temp-file like before, and then reads it into memory
again just to do the diff. Stupid.
But if this basic infrastructure is accepted, we can start switching over
diff-core to not write temp-files, which should speed things up even
further, especially when doing big tree-to-tree diffs.
Now, in the interest of full disclosure, I should also point out a few
downsides:
- the libxdiff algorithm is different, and I bet GNU diff has gotten a
lot more testing. And the thing is, generating a diff is not an exact
science - you can get two different diffs (and you will), and they can
both be perfectly valid. So it's not possible to "validate" the
libxdiff output by just comparing it against GNU diff.
- GNU diff does some nice eye-candy, like trying to figure out what the
last function was, and adding that information to the "@@ .." line.
libxdiff doesn't do that.
- The libxdiff thing has some known deficiencies. In particular, it gets
the "\No newline at end of file" case wrong. So this is currently for
the experimental branch only. I hope Davide will help fix it.
That said, I think the huge performance advantage, and the fact that it
integrates better is definitely worth it. But it should go into a
development branch at least due to the missing newline issue.
Technical note: this is based on libxdiff-0.17, but I did some surgery to
get rid of the extraneous fat - stuff that git doesn't need, and seriously
cutting down on mmfile_t, which had much more capabilities than the diff
algorithm either needed or used. In this version, "mmfile_t" is just a
trivial <pointer,length> tuple.
That said, I tried to keep the differences to simple removals, so that you
can do a diff between this and the libxdiff origin, and you'll basically
see just things getting deleted. Even the mmfile_t simplifications are
left in a state where the diffs should be readable.
Apologies to Davide, whom I'd love to get feedback on this all from (I
wrote my own "fill_mmfile()" for the new simpler mmfile_t format: the old
complex format had a helper function for that, but I did my surgery with
the goal in mind that eventually we _should_ just do
mmfile_t mf;
buf = read_sha1_file(sha1, type, &size);
mf->ptr = buf;
mf->size = size;
.. use "mf" directly ..
which was really a nightmare with the old "helpful" mmfile_t, and really
is that easy with the new cut-down interfaces).
[ Btw, as any hawk-eye can see from the diff, this was actually generated
with itself, so it is "self-hosting". That's about all the testing it
has gotten, along with the above kernel diff, which eye-balls correctly,
but shows the newline issue when you double-check it with "git-apply" ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-25 04:13:22 +00:00
|
|
|
|
|
|
|
|
2006-06-25 01:35:12 +00:00
|
|
|
perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
|
2006-06-24 02:34:36 +00:00
|
|
|
(cd perl && $(PERL_PATH) Makefile.PL \
|
2006-09-23 18:20:47 +00:00
|
|
|
PREFIX='$(prefix_SQ)')
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 02:34:29 +00:00
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
doc:
|
|
|
|
$(MAKE) -C Documentation all
|
|
|
|
|
2006-03-18 10:07:12 +00:00
|
|
|
TAGS:
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) TAGS
|
2007-07-29 22:23:28 +00:00
|
|
|
$(FIND) . -name '*.[hcS]' -print | xargs etags -a
|
2006-03-18 10:07:12 +00:00
|
|
|
|
|
|
|
tags:
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) tags
|
2007-07-29 22:23:28 +00:00
|
|
|
$(FIND) . -name '*.[hcS]' -print | xargs ctags -a
|
2005-07-29 15:50:24 +00:00
|
|
|
|
2006-06-14 22:36:00 +00:00
|
|
|
### Detect prefix changes
|
2006-11-20 08:49:31 +00:00
|
|
|
TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):\
|
2006-06-14 22:36:00 +00:00
|
|
|
$(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
|
|
|
|
|
|
|
|
GIT-CFLAGS: .FORCE-GIT-CFLAGS
|
|
|
|
@FLAGS='$(TRACK_CFLAGS)'; \
|
|
|
|
if test x"$$FLAGS" != x"`cat GIT-CFLAGS 2>/dev/null`" ; then \
|
|
|
|
echo 1>&2 " * new build flags or prefix"; \
|
|
|
|
echo "$$FLAGS" >GIT-CFLAGS; \
|
|
|
|
fi
|
|
|
|
|
2007-03-28 11:22:02 +00:00
|
|
|
### Detect Tck/Tk interpreter path changes
|
|
|
|
ifndef NO_TCLTK
|
|
|
|
TRACK_VARS = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')
|
|
|
|
|
|
|
|
GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
|
|
|
|
@VARS='$(TRACK_VARS)'; \
|
|
|
|
if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
|
|
|
|
echo 1>&2 " * new Tcl/Tk interpreter location"; \
|
|
|
|
echo "$$VARS" >$@; \
|
|
|
|
fi
|
|
|
|
|
|
|
|
.PHONY: .FORCE-GIT-GUI-VARS
|
|
|
|
endif
|
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
### Testing rules
|
|
|
|
|
2007-08-01 00:28:59 +00:00
|
|
|
TEST_PROGRAMS = test-chmtime$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X test-absolute-path$X
|
2007-04-28 22:32:49 +00:00
|
|
|
|
|
|
|
all:: $(TEST_PROGRAMS)
|
|
|
|
|
2006-02-18 12:01:18 +00:00
|
|
|
# GNU make supports exporting all variables by "export" without parameters.
|
|
|
|
# However, the environment gets quite big, and some programs have problems
|
|
|
|
# with that.
|
|
|
|
|
2006-07-07 11:26:31 +00:00
|
|
|
export NO_SVN_TESTS
|
2006-02-18 12:01:18 +00:00
|
|
|
|
2007-04-28 22:32:49 +00:00
|
|
|
test: all
|
2005-07-29 15:50:24 +00:00
|
|
|
$(MAKE) -C t/ all
|
|
|
|
|
2007-05-30 23:18:24 +00:00
|
|
|
test-date$X: date.o ctype.o
|
2005-07-29 15:50:24 +00:00
|
|
|
|
2007-05-30 23:18:24 +00:00
|
|
|
test-delta$X: diff-delta.o patch-delta.o
|
2005-07-29 15:50:24 +00:00
|
|
|
|
2007-05-30 23:18:24 +00:00
|
|
|
test-%$X: test-%.o $(GITLIBS)
|
|
|
|
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
|
2007-04-11 17:59:51 +00:00
|
|
|
|
2006-06-24 07:59:49 +00:00
|
|
|
check-sha1:: test-sha1$X
|
|
|
|
./test-sha1.sh
|
|
|
|
|
2007-01-04 18:33:48 +00:00
|
|
|
check: common-cmds.h
|
2005-12-14 21:32:52 +00:00
|
|
|
for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
|
2005-07-29 15:50:24 +00:00
|
|
|
|
Start deprecating "git-command" in favor of "git command"
I realize that a lot of people use the "git-xyzzy" format, and we have
various historical reasons for it, but I also think that most people have
long since started thinking of the git command as a single command with
various subcommands, and we've long had the documentation talk about it
that way.
Slowly migrating away from the git-xyzzy format would allow us to
eventually no longer install hundreds of binaries (even if most of them
are symlinks or hardlinks) in users $PATH, and the _original_ reasons for
it (implementation issues and bash completion) are really long long gone.
Using "git xyzzy" also has some fundamental advantages, like the ability
to specify things like paging ("git -p xyzzy") and making the whole notion
of aliases act like other git commands (which they already do, but they do
*not* have a "git-xyzzy" form!)
Anyway, while actually removing the "git-xyzzy" things is not practical
right now, we can certainly start slowly to deprecate it internally inside
git itself - in the shell scripts we use, and the test vectors.
This patch adds a "remove-dashes" makefile target, which does that. It
isn't particularly efficient or smart, but it *does* successfully rewrite
a lot of our shell scripts to use the "git xyzzy" form for all built-in
commands.
(For non-builtins, the "git xyzzy" format implies an extra execve(), so
this script leaves those alone).
So apply this patch, and then run
make remove-dashes
make test
git commit -a
to generate a much larger patch that actually starts this transformation.
(The only half-way subtle thing about this is that it also fixes up
git-filter-branch.sh for the new world order by adding quoting around
the use of "git-commit-tree" as an argument. It doesn't need it in that
format, but when changed into "git commit-tree" it is no longer a single
word, and the quoting maintains the old behaviour).
NOTE! This does not yet mean that you can actually stop installing the
"git-xyzzy" binaries for the builtins. There are some remaining places
that want to use the old form, this just removes the most obvious ones
that can easily be done automatically.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-06-30 18:49:17 +00:00
|
|
|
remove-dashes:
|
|
|
|
./fixup-builtins $(BUILT_INS)
|
2005-07-29 15:50:24 +00:00
|
|
|
|
|
|
|
### Installation rules
|
|
|
|
|
2005-11-21 23:44:15 +00:00
|
|
|
install: all
|
2006-02-18 11:40:22 +00:00
|
|
|
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(bindir_SQ)'
|
|
|
|
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
|
|
|
|
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
|
2007-03-28 11:00:23 +00:00
|
|
|
$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
|
2006-07-29 16:25:03 +00:00
|
|
|
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
|
2006-12-04 09:50:04 +00:00
|
|
|
$(MAKE) -C perl prefix='$(prefix_SQ)' install
|
2007-03-28 11:00:23 +00:00
|
|
|
ifndef NO_TCLTK
|
2007-03-28 11:22:02 +00:00
|
|
|
$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
|
2007-02-12 23:20:34 +00:00
|
|
|
$(MAKE) -C git-gui install
|
2007-03-28 11:00:23 +00:00
|
|
|
endif
|
2006-05-22 04:42:59 +00:00
|
|
|
if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
|
|
|
|
then \
|
|
|
|
ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
|
|
|
|
'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' || \
|
|
|
|
cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
|
|
|
|
'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
|
|
|
|
fi
|
2007-07-14 17:51:44 +00:00
|
|
|
$(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
|
2007-01-10 20:24:54 +00:00
|
|
|
ifneq (,$X)
|
2007-07-14 17:51:44 +00:00
|
|
|
$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
|
2007-01-10 20:24:54 +00:00
|
|
|
endif
|
2005-07-29 15:50:24 +00:00
|
|
|
|
|
|
|
install-doc:
|
|
|
|
$(MAKE) -C Documentation install
|
|
|
|
|
2006-12-23 16:26:09 +00:00
|
|
|
quick-install-doc:
|
|
|
|
$(MAKE) -C Documentation quick-install
|
2005-07-29 15:50:24 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### Maintainer's dist rules
|
|
|
|
|
2005-12-27 22:40:17 +00:00
|
|
|
git.spec: git.spec.in
|
Don't write directly to a make target ($@).
Otherwise, if make is suspended, or killed with prejudice, or if the
system crashes, you could be left with an up-to-date, yet corrupt,
generated file.
I left off the `clean' addition, because I believe "make clean" should
not remove wildcard patterns like "*+", on the off-chance that someone
uses names like that for files they care about. Besides, in practice,
those temporary files are left behind so rarely that they're not a bother,
and they're removed again as part of the next build.
[jc: sign-off?]
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-25 16:52:01 +00:00
|
|
|
sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
|
|
|
|
mv $@+ $@
|
2005-07-07 20:09:50 +00:00
|
|
|
|
2005-11-17 05:32:44 +00:00
|
|
|
GIT_TARNAME=git-$(GIT_VERSION)
|
2007-06-18 21:30:36 +00:00
|
|
|
dist: git.spec git-archive configure
|
2006-10-05 09:26:12 +00:00
|
|
|
./git-archive --format=tar \
|
|
|
|
--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
|
2005-07-07 20:09:50 +00:00
|
|
|
@mkdir -p $(GIT_TARNAME)
|
2007-06-18 21:30:36 +00:00
|
|
|
@cp git.spec configure $(GIT_TARNAME)
|
2006-01-10 02:07:01 +00:00
|
|
|
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
|
2007-02-12 23:20:34 +00:00
|
|
|
@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
|
2006-01-10 02:07:01 +00:00
|
|
|
$(TAR) rf $(GIT_TARNAME).tar \
|
2007-02-12 23:20:34 +00:00
|
|
|
$(GIT_TARNAME)/git.spec \
|
2007-06-18 21:30:36 +00:00
|
|
|
$(GIT_TARNAME)/configure \
|
2007-02-12 23:20:34 +00:00
|
|
|
$(GIT_TARNAME)/version \
|
2007-03-12 17:40:31 +00:00
|
|
|
$(GIT_TARNAME)/git-gui/version
|
2007-07-14 17:51:44 +00:00
|
|
|
@$(RM) -r $(GIT_TARNAME)
|
2005-07-15 01:20:50 +00:00
|
|
|
gzip -f -9 $(GIT_TARNAME).tar
|
2005-07-07 20:09:50 +00:00
|
|
|
|
|
|
|
rpm: dist
|
2005-11-17 05:32:44 +00:00
|
|
|
$(RPMBUILD) -ta $(GIT_TARNAME).tar.gz
|
2005-07-07 20:09:50 +00:00
|
|
|
|
2006-05-18 10:57:04 +00:00
|
|
|
htmldocs = git-htmldocs-$(GIT_VERSION)
|
|
|
|
manpages = git-manpages-$(GIT_VERSION)
|
|
|
|
dist-doc:
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) -r .doc-tmp-dir
|
2006-05-18 10:57:04 +00:00
|
|
|
mkdir .doc-tmp-dir
|
|
|
|
$(MAKE) -C Documentation WEBDOC_DEST=../.doc-tmp-dir install-webdoc
|
|
|
|
cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar .
|
|
|
|
gzip -n -9 -f $(htmldocs).tar
|
|
|
|
:
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) -r .doc-tmp-dir
|
2007-04-20 03:47:04 +00:00
|
|
|
mkdir -p .doc-tmp-dir/man1 .doc-tmp-dir/man5 .doc-tmp-dir/man7
|
2006-05-25 12:37:46 +00:00
|
|
|
$(MAKE) -C Documentation DESTDIR=./ \
|
2006-06-29 21:26:54 +00:00
|
|
|
man1dir=../.doc-tmp-dir/man1 \
|
2007-04-20 03:47:04 +00:00
|
|
|
man5dir=../.doc-tmp-dir/man5 \
|
2006-06-29 21:26:54 +00:00
|
|
|
man7dir=../.doc-tmp-dir/man7 \
|
2006-05-18 10:57:04 +00:00
|
|
|
install
|
|
|
|
cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
|
|
|
|
gzip -n -9 -f $(manpages).tar
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) -r .doc-tmp-dir
|
2006-05-18 10:57:04 +00:00
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
### Cleaning rules
|
2005-07-15 01:21:57 +00:00
|
|
|
|
2005-04-07 22:13:13 +00:00
|
|
|
clean:
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
|
2007-06-05 13:43:17 +00:00
|
|
|
$(LIB_FILE) $(XDIFF_LIB)
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
|
|
|
|
$(RM) $(TEST_PROGRAMS)
|
|
|
|
$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
|
|
|
|
$(RM) -r autom4te.cache
|
|
|
|
$(RM) configure config.log config.mak.autogen config.mak.append config.status config.cache
|
|
|
|
$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
|
|
|
|
$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
|
|
|
|
$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
|
|
|
|
$(RM) gitweb/gitweb.cgi
|
2005-05-22 18:27:28 +00:00
|
|
|
$(MAKE) -C Documentation/ clean
|
2006-12-04 09:50:04 +00:00
|
|
|
$(MAKE) -C perl clean
|
Introduce Git.pm (v4)
This patch introduces a very basic and barebone Git.pm module
with a sketch of how the generic interface would look like;
most functions are missing, but this should give some good base.
I will continue expanding it.
Most desirable now is more careful error reporting, generic_in() for feeding
input to Git commands and the repository() constructor doing some poking
with git-rev-parse to get the git directory and subdirectory prefix.
Those three are basically the prerequisities for converting git-mv.
I will send them as follow-ups to this patch.
Currently Git.pm just wraps up exec()s of Git commands, but even that
is not trivial to get right and various Git perl scripts do it in
various inconsistent ways. In addition to Git.pm, there is now also
Git.xs which provides barebone Git.xs for directly interfacing with
libgit.a, and as an example providing the hash_object() function using
libgit.
This adds the Git module, integrates it to the build system and as
an example converts the git-fmt-merge-msg.perl script to it (the result
is not very impressive since its advantage is not quite apparent in this
one, but I just picked up the simplest Git user around).
Compared to v3, only very minor things were fixed in this patch (some
whitespaces, a missing export, tiny bug in git-fmt-merge-msg.perl);
at first I wanted to post them as a separate patch but since this
is still only in pu, I decided that it will be cleaner to just resend
the patch.
My current working state is available all the time at
http://pasky.or.cz/~xpasky/git-perl/Git.pm
and an irregularily updated API documentation is at
http://pasky.or.cz/~xpasky/git-perl/Git.html
Many thanks to Jakub Narebski, Junio and others for their feedback.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24 02:34:29 +00:00
|
|
|
$(MAKE) -C templates/ clean
|
2005-08-03 00:24:11 +00:00
|
|
|
$(MAKE) -C t/ clean
|
2007-03-28 11:00:23 +00:00
|
|
|
ifndef NO_TCLTK
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) gitk-wish
|
2007-03-28 11:00:23 +00:00
|
|
|
$(MAKE) -C git-gui clean
|
|
|
|
endif
|
2007-07-14 17:51:44 +00:00
|
|
|
$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS
|
2005-12-27 22:40:17 +00:00
|
|
|
|
2006-01-13 05:42:25 +00:00
|
|
|
.PHONY: all install clean strip
|
2006-06-14 22:36:00 +00:00
|
|
|
.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags .FORCE-GIT-CFLAGS
|
2005-12-20 01:59:58 +00:00
|
|
|
|
2006-04-13 07:17:19 +00:00
|
|
|
### Check documentation
|
|
|
|
#
|
|
|
|
check-docs::
|
|
|
|
@for v in $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk; \
|
|
|
|
do \
|
|
|
|
case "$$v" in \
|
|
|
|
git-merge-octopus | git-merge-ours | git-merge-recursive | \
|
2007-02-07 05:27:09 +00:00
|
|
|
git-merge-resolve | git-merge-stupid | \
|
2007-02-14 06:45:22 +00:00
|
|
|
git-add--interactive | git-fsck-objects | git-init-db | \
|
2007-03-30 08:03:09 +00:00
|
|
|
git-repo-config | git-fetch--tool | \
|
2006-04-13 07:17:19 +00:00
|
|
|
git-ssh-pull | git-ssh-push ) continue ;; \
|
|
|
|
esac ; \
|
|
|
|
test -f "Documentation/$$v.txt" || \
|
|
|
|
echo "no doc: $$v"; \
|
2007-02-14 06:45:22 +00:00
|
|
|
sed -e '1,/^__DATA__/d' Documentation/cmd-list.perl | \
|
|
|
|
grep -q "^$$v[ ]" || \
|
2006-04-13 07:17:19 +00:00
|
|
|
case "$$v" in \
|
|
|
|
git) ;; \
|
|
|
|
*) echo "no link: $$v";; \
|
|
|
|
esac ; \
|
|
|
|
done | sort
|
2006-11-05 19:26:21 +00:00
|
|
|
|
|
|
|
### Make sure built-ins do not have dups and listed in git.c
|
|
|
|
#
|
|
|
|
check-builtins::
|
|
|
|
./check-builtins.sh
|