2005-07-29 15:48:26 +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-04-13 09:20:38 +00:00
|
|
|
#
|
2005-07-29 15:48:26 +00:00
|
|
|
# Define NO_OPENSSL environment variable if you do not have OpenSSL. You will
|
|
|
|
# miss out git-rev-list --merge-order. This also implies MOZILLA_SHA1.
|
2005-05-22 22:08:15 +00:00
|
|
|
#
|
2005-07-31 00:14:23 +00:00
|
|
|
# Define NO_CURL if you do not have curl installed. git-http-pull is not
|
|
|
|
# built, and you cannot use http:// and https:// transports.
|
|
|
|
#
|
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-09-19 01:30:50 +00:00
|
|
|
# Define NO_STRCASESTR if you don't have strcasestr.
|
|
|
|
#
|
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.
|
|
|
|
#
|
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).
|
|
|
|
#
|
|
|
|
# Define NO_GETDOMAINNAME if your library lack it (SunOS, Patrick Mauritz).
|
|
|
|
#
|
2005-09-20 02:47:54 +00:00
|
|
|
# Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3.
|
|
|
|
#
|
2005-07-29 15:48:26 +00:00
|
|
|
# Define COLLISION_CHECK below if you believe that SHA1's
|
|
|
|
# 1461501637330902918203684832716283019655932542976 hashes do not give you
|
|
|
|
# sufficient guarantee that no collisions between objects will ever happen.
|
|
|
|
|
|
|
|
# DEFINES += -DCOLLISION_CHECK
|
|
|
|
|
|
|
|
# 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).
|
|
|
|
|
|
|
|
# DEFINES += -DUSE_NSEC
|
|
|
|
|
|
|
|
# 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.
|
|
|
|
|
|
|
|
# DEFINES += -DUSE_STDEV
|
|
|
|
|
2005-09-11 01:37:24 +00:00
|
|
|
GIT_VERSION = 0.99.7
|
2005-07-07 20:09:50 +00:00
|
|
|
|
2005-08-06 05:36:15 +00:00
|
|
|
CFLAGS = -g -O2 -Wall
|
2005-09-05 23:24:03 +00:00
|
|
|
ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
|
2005-05-07 08:41:54 +00:00
|
|
|
|
2005-08-06 05:36:15 +00:00
|
|
|
prefix = $(HOME)
|
|
|
|
bindir = $(prefix)/bin
|
|
|
|
template_dir = $(prefix)/share/git-core/templates/
|
2005-09-11 00:46:27 +00:00
|
|
|
GIT_PYTHON_DIR = $(prefix)/share/git-core/python
|
2005-08-04 23:56:38 +00:00
|
|
|
# DESTDIR=
|
2005-04-13 09:14:06 +00:00
|
|
|
|
2005-08-06 05:36:15 +00:00
|
|
|
CC = gcc
|
|
|
|
AR = ar
|
|
|
|
INSTALL = install
|
|
|
|
RPMBUILD = rpmbuild
|
2005-04-07 22:13:13 +00:00
|
|
|
|
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 ---
|
|
|
|
|
2005-09-08 00:26:23 +00:00
|
|
|
SCRIPT_SH = \
|
|
|
|
git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
|
|
|
|
git-cherry.sh git-clone.sh git-commit.sh \
|
|
|
|
git-count-objects.sh git-diff.sh git-fetch.sh \
|
|
|
|
git-format-patch.sh git-log.sh git-ls-remote.sh \
|
|
|
|
git-merge-one-file.sh git-octopus.sh git-parse-remote.sh \
|
|
|
|
git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
|
|
|
|
git-repack.sh git-request-pull.sh git-reset.sh \
|
|
|
|
git-resolve.sh git-revert.sh git-sh-setup.sh git-status.sh \
|
|
|
|
git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
|
Multi-backend merge driver.
The new command 'git merge' takes the current head and one or more
remote heads, with the commit log message for the automated case.
If the heads being merged are simple fast-forwards, it acts the
same way as the current 'git resolve'. Otherwise, it tries
different merge strategies and takes the result from the one that
succeeded auto-merging, if there is any.
If no merge strategy succeeds auto-merging, their results are
evaluated for number of paths needed for hand resolving, and the
one with the least number of such paths is left in the working
tree. The user is asked to resolve them by hand and make a
commit manually.
The calling convention from the 'git merge' driver to merge
strategy programs is very simple:
- A strategy program is to be called 'git-merge-<strategy>'.
- They take input of this form:
<common1> <common2> ... '--' <head> <remote1> <remote2>...
That is, one or more the common ancestors, double dash, the
current head, and one or more remote heads being merged into
the current branch.
- Before a strategy program is called, the working tree is
matched to the current <head>.
- The strategy program exits with status code 0 when it
successfully auto-merges the given heads. It should do
update-cache for all the merged paths when it does so -- the
index file will be used to record the merge result as a
commit by the driver.
- The strategy program exits with status code 1 when it leaves
conflicts behind. It should do update-cache for all the
merged paths that it successfully auto-merged, and leave the
cache entry in the index file as the same as <head> for paths
it could not auto-merge, and leave its best-effort result
with conflict markers in the working tree when it does so.
- The strategy program exists with status code other than 0 or
1 if it does not handle the given merge at all.
As examples, this commit comes with merge strategies based on
'git resolve' and 'git octopus'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-08 20:47:12 +00:00
|
|
|
git-applymbox.sh git-applypatch.sh \
|
2005-09-11 00:56:19 +00:00
|
|
|
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
|
2005-09-12 19:06:10 +00:00
|
|
|
git-merge-resolve.sh git-grep.sh
|
2005-09-08 00:26:23 +00:00
|
|
|
|
|
|
|
SCRIPT_PERL = \
|
|
|
|
git-archimport.perl git-cvsimport.perl git-relink.perl \
|
2005-09-22 07:55:22 +00:00
|
|
|
git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl
|
2005-07-31 00:31:47 +00:00
|
|
|
|
2005-09-11 00:46:27 +00:00
|
|
|
SCRIPT_PYTHON = \
|
2005-09-13 06:22:26 +00:00
|
|
|
git-merge-recursive.py
|
2005-09-11 00:46:27 +00:00
|
|
|
|
2005-09-07 19:22:56 +00:00
|
|
|
# The ones that do not have to link with lcrypto nor lz.
|
|
|
|
SIMPLE_PROGRAMS = \
|
|
|
|
git-get-tar-commit-id git-mailinfo git-mailsplit git-stripspace \
|
|
|
|
git-daemon git-var
|
|
|
|
|
|
|
|
# ... and all the rest
|
2005-09-08 00:26:23 +00:00
|
|
|
PROGRAMS = \
|
2005-09-14 20:08:55 +00:00
|
|
|
git-apply git-cat-file \
|
2005-09-08 00:26:23 +00:00
|
|
|
git-checkout-index git-clone-pack git-commit-tree \
|
|
|
|
git-convert-objects git-diff-files \
|
2005-09-21 06:24:39 +00:00
|
|
|
git-diff-index git-diff-stages \
|
2005-09-17 05:21:36 +00:00
|
|
|
git-diff-tree git-fetch-pack git-fsck-objects \
|
2005-09-08 00:26:23 +00:00
|
|
|
git-hash-object git-init-db \
|
|
|
|
git-local-fetch git-ls-files git-ls-tree git-merge-base \
|
|
|
|
git-merge-index git-mktag git-pack-objects git-patch-id \
|
|
|
|
git-peek-remote git-prune-packed git-read-tree \
|
|
|
|
git-receive-pack git-rev-list git-rev-parse \
|
2005-09-17 05:30:55 +00:00
|
|
|
git-send-pack git-show-branch \
|
2005-09-14 20:08:55 +00:00
|
|
|
git-show-index git-ssh-fetch \
|
2005-09-08 00:26:23 +00:00
|
|
|
git-ssh-upload git-tar-tree git-unpack-file \
|
|
|
|
git-unpack-objects git-update-index git-update-server-info \
|
|
|
|
git-upload-pack git-verify-pack git-write-tree \
|
2005-09-07 19:22:56 +00:00
|
|
|
$(SIMPLE_PROGRAMS)
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-09-15 21:56:37 +00:00
|
|
|
# Backward compatibility -- to be removed in 0.99.8
|
|
|
|
PROGRAMS += git-ssh-pull git-ssh-push
|
|
|
|
|
2005-09-11 00:46:27 +00:00
|
|
|
PYMODULES = \
|
|
|
|
gitMergeCommon.py
|
|
|
|
|
2005-09-20 02:47:54 +00:00
|
|
|
ifdef WITH_OWN_SUBPROCESS_PY
|
|
|
|
PYMODULES += compat/subprocess.py
|
|
|
|
endif
|
|
|
|
|
2005-08-25 23:31:43 +00:00
|
|
|
ifdef WITH_SEND_EMAIL
|
2005-09-08 00:26:23 +00:00
|
|
|
SCRIPT_PERL += git-send-email.perl
|
2005-08-25 23:31:43 +00:00
|
|
|
endif
|
|
|
|
|
2005-07-31 00:14:23 +00:00
|
|
|
ifndef NO_CURL
|
2005-09-19 14:11:19 +00:00
|
|
|
ifdef CURLDIR
|
|
|
|
# This is still problematic -- gcc does not want -R.
|
|
|
|
CFLAGS += -I$(CURLDIR)/include
|
|
|
|
CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl
|
|
|
|
else
|
|
|
|
CURL_LIBCURL = -lcurl
|
|
|
|
endif
|
2005-09-08 00:26:23 +00:00
|
|
|
PROGRAMS += git-http-fetch
|
2005-07-31 00:14:23 +00:00
|
|
|
endif
|
|
|
|
|
2005-04-18 19:49:39 +00:00
|
|
|
LIB_FILE=libgit.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 = \
|
|
|
|
blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
|
|
|
|
diff.h epoch.h object.h pack.h pkt-line.h quote.h refs.h \
|
2005-09-14 20:08:55 +00:00
|
|
|
run-command.h strbuf.h tag.h tree.h
|
2005-07-31 19:17:43 +00:00
|
|
|
|
2005-09-08 00:26:23 +00:00
|
|
|
DIFF_OBJS = \
|
|
|
|
diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
|
|
|
|
diffcore-pickaxe.o diffcore-rename.o
|
2005-04-26 01:26:45 +00:00
|
|
|
|
2005-09-08 00:26:23 +00:00
|
|
|
LIB_OBJS = \
|
|
|
|
blob.o commit.o connect.o count-delta.o csum-file.o \
|
2005-09-09 21:48:54 +00:00
|
|
|
date.o diff-delta.o entry.o ident.o index.o \
|
2005-09-08 00:26:23 +00:00
|
|
|
object.o pack-check.o patch-delta.o path.o pkt-line.o \
|
2005-09-14 20:08:55 +00:00
|
|
|
quote.o read-cache.o refs.o run-command.o \
|
2005-09-08 00:26:23 +00:00
|
|
|
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
|
|
|
|
tag.o tree.o usage.o $(DIFF_OBJS)
|
2005-05-10 00:57:56 +00:00
|
|
|
|
2005-04-21 19:14:46 +00:00
|
|
|
LIBS = $(LIB_FILE)
|
|
|
|
LIBS += -lz
|
2005-04-21 19:33:22 +00:00
|
|
|
|
2005-09-07 19:22:56 +00:00
|
|
|
ifeq ($(shell uname -s),Darwin)
|
|
|
|
NEEDS_SSL_WITH_CRYPTO = YesPlease
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
endif
|
2005-09-05 23:24:03 +00:00
|
|
|
ifeq ($(shell uname -s),SunOS)
|
|
|
|
NEEDS_SOCKET = YesPlease
|
2005-09-12 05:25:49 +00:00
|
|
|
NEEDS_NSL = YesPlease
|
|
|
|
PLATFORM_DEFINES += -D__EXTENSIONS__
|
2005-09-05 23:24:03 +00:00
|
|
|
endif
|
2005-09-20 16:27:13 +00:00
|
|
|
ifneq (,$(findstring arm,$(shell uname -m)))
|
|
|
|
ARM_SHA1 = YesPlease
|
|
|
|
endif
|
2005-09-07 19:22:56 +00:00
|
|
|
|
2005-09-09 01:50:33 +00:00
|
|
|
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
|
|
|
ifndef PYTHON_PATH
|
|
|
|
PYTHON_PATH = /usr/bin/python
|
|
|
|
endif
|
2005-09-09 01:50:33 +00:00
|
|
|
|
2005-07-29 15:50:51 +00:00
|
|
|
ifndef NO_OPENSSL
|
|
|
|
LIB_OBJS += epoch.o
|
2005-09-08 00:26:23 +00:00
|
|
|
OPENSSL_LIBSSL = -lssl
|
2005-07-29 15:50:51 +00:00
|
|
|
else
|
2005-08-06 05:36:15 +00:00
|
|
|
DEFINES += '-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
|
|
|
|
LIB_4_CRYPTO = -lcrypto -lssl
|
|
|
|
else
|
|
|
|
LIB_4_CRYPTO = -lcrypto
|
|
|
|
endif
|
|
|
|
ifdef NEEDS_LIBICONV
|
|
|
|
LIB_4_ICONV = -liconv
|
|
|
|
else
|
|
|
|
LIB_4_ICONV =
|
|
|
|
endif
|
2005-09-05 23:24:03 +00:00
|
|
|
ifdef NEEDS_SOCKET
|
|
|
|
LIBS += -lsocket
|
|
|
|
SIMPLE_LIB += -lsocket
|
|
|
|
endif
|
2005-09-12 05:25:49 +00:00
|
|
|
ifdef NEEDS_NSL
|
|
|
|
LIBS += -lnsl
|
|
|
|
SIMPLE_LIB += -lnsl
|
|
|
|
endif
|
2005-09-19 01:30:50 +00:00
|
|
|
ifdef NO_STRCASESTR
|
|
|
|
DEFINES += -Dstrcasestr=gitstrcasestr
|
|
|
|
LIB_OBJS += compat/strcasestr.o
|
|
|
|
endif
|
2005-04-21 19:33:22 +00:00
|
|
|
|
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>
|
|
|
|
LIBS += $(LIB_4_CRYPTO)
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2005-08-06 05:36:15 +00:00
|
|
|
DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
|
2005-04-21 19:14:46 +00:00
|
|
|
|
2005-09-09 01:50:33 +00:00
|
|
|
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
|
2005-09-11 00:46:27 +00:00
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
|
|
|
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
|
|
|
|
gitk
|
2005-07-03 17:02:35 +00:00
|
|
|
|
2005-07-29 15:50:24 +00:00
|
|
|
### Build rules
|
|
|
|
|
2005-09-09 01:50:33 +00:00
|
|
|
all: $(PROGRAMS) $(SCRIPTS)
|
2005-04-30 20:19:56 +00:00
|
|
|
|
2005-08-06 19:50:14 +00:00
|
|
|
all:
|
|
|
|
$(MAKE) -C templates
|
2005-08-06 05:36:15 +00:00
|
|
|
|
2005-09-09 01:50:33 +00:00
|
|
|
git: git.sh Makefile
|
2005-09-08 04:26:52 +00:00
|
|
|
rm -f $@+ $@
|
2005-09-09 01:50:33 +00:00
|
|
|
sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' <$@.sh >$@+
|
2005-09-08 04:26:52 +00:00
|
|
|
chmod +x $@+
|
|
|
|
mv $@+ $@
|
|
|
|
|
2005-09-09 01:50:33 +00:00
|
|
|
$(filter-out git,$(patsubst %.sh,%,$(SCRIPT_SH))) : % : %.sh
|
|
|
|
rm -f $@
|
|
|
|
sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' $@.sh >$@
|
|
|
|
chmod +x $@
|
|
|
|
|
|
|
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl
|
|
|
|
rm -f $@
|
|
|
|
sed -e '1s|#!.*perl|#!$(PERL_PATH)|' $@.perl >$@
|
|
|
|
chmod +x $@
|
|
|
|
|
2005-09-11 00:46:27 +00:00
|
|
|
$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
|
|
|
|
rm -f $@
|
|
|
|
sed -e '1s|#!.*python|#!$(PYTHON_PATH)|' \
|
|
|
|
-e 's|@@GIT_PYTHON_PATH@@|$(GIT_PYTHON_DIR)|g' \
|
|
|
|
$@.py >$@
|
|
|
|
chmod +x $@
|
|
|
|
|
2005-08-06 05:36:15 +00:00
|
|
|
%.o: %.c
|
|
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
|
|
|
%.o: %.S
|
|
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
2005-05-19 14:27:14 +00:00
|
|
|
|
2005-07-29 17:21:53 +00:00
|
|
|
git-%: %.o $(LIB_FILE)
|
2005-08-06 05:36:15 +00:00
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
|
2005-07-29 17:21:53 +00:00
|
|
|
|
2005-09-07 19:22:56 +00:00
|
|
|
git-mailinfo : SIMPLE_LIB += $(LIB_4_ICONV)
|
|
|
|
$(SIMPLE_PROGRAMS) : $(LIB_FILE)
|
|
|
|
$(SIMPLE_PROGRAMS) : git-% : %.o
|
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIB_FILE) $(SIMPLE_LIB)
|
|
|
|
|
2005-09-08 00:26:23 +00:00
|
|
|
git-http-fetch: fetch.o
|
|
|
|
git-local-fetch: fetch.o
|
|
|
|
git-ssh-fetch: rsh.o fetch.o
|
|
|
|
git-ssh-upload: rsh.o
|
2005-09-15 21:56:37 +00:00
|
|
|
git-ssh-pull: rsh.o fetch.o
|
|
|
|
git-ssh-push: rsh.o
|
2005-04-29 21:09:11 +00:00
|
|
|
|
2005-09-19 14:11:19 +00:00
|
|
|
git-http-fetch: LIBS += $(CURL_LIBCURL)
|
2005-07-30 05:43:06 +00:00
|
|
|
git-rev-list: LIBS += $(OPENSSL_LIBSSL)
|
2005-04-29 21:09:11 +00:00
|
|
|
|
2005-08-06 19:50:14 +00:00
|
|
|
init-db.o: init-db.c
|
2005-08-06 05:36:15 +00:00
|
|
|
$(CC) -c $(ALL_CFLAGS) \
|
|
|
|
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
|
2005-08-06 19:50:14 +00:00
|
|
|
|
2005-07-29 15:48:50 +00:00
|
|
|
$(LIB_OBJS): $(LIB_H)
|
2005-09-08 00:26:23 +00:00
|
|
|
$(patsubst git-%,%.o,$(PROGRAMS)): $(LIB_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)
|
|
|
|
$(AR) rcs $@ $(LIB_OBJS)
|
|
|
|
|
|
|
|
doc:
|
|
|
|
$(MAKE) -C Documentation all
|
|
|
|
|
|
|
|
|
|
|
|
### Testing rules
|
|
|
|
|
|
|
|
test: all
|
|
|
|
$(MAKE) -C t/ all
|
|
|
|
|
|
|
|
test-date: test-date.c date.o
|
2005-08-06 05:36:15 +00:00
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ test-date.c date.o
|
2005-07-29 15:50:24 +00:00
|
|
|
|
|
|
|
test-delta: test-delta.c diff-delta.o patch-delta.o
|
2005-08-06 05:36:15 +00:00
|
|
|
$(CC) $(ALL_CFLAGS) -o $@ $^
|
2005-07-29 15:50:24 +00:00
|
|
|
|
|
|
|
check:
|
2005-08-06 05:36:15 +00:00
|
|
|
for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i; done
|
2005-07-29 15:50:24 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### Installation rules
|
|
|
|
|
2005-09-08 00:26:23 +00:00
|
|
|
install: $(PROGRAMS) $(SCRIPTS)
|
2005-09-14 10:41:52 +00:00
|
|
|
$(INSTALL) -d -m755 $(DESTDIR)$(bindir)
|
2005-09-09 01:50:33 +00:00
|
|
|
$(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
|
|
|
|
$(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick
|
2005-09-08 00:26:23 +00:00
|
|
|
sh ./cmd-rename.sh $(DESTDIR)$(bindir)
|
2005-08-02 23:45:21 +00:00
|
|
|
$(MAKE) -C templates install
|
2005-09-14 10:41:52 +00:00
|
|
|
$(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR)
|
2005-09-11 00:46:27 +00:00
|
|
|
$(INSTALL) $(PYMODULES) $(DESTDIR)$(GIT_PYTHON_DIR)
|
2005-07-29 15:50:24 +00:00
|
|
|
|
|
|
|
install-doc:
|
|
|
|
$(MAKE) -C Documentation install
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### Maintainer's dist rules
|
|
|
|
|
2005-07-15 23:08:01 +00:00
|
|
|
git-core.spec: git-core.spec.in Makefile
|
2005-07-07 20:09:50 +00:00
|
|
|
sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@
|
|
|
|
|
2005-07-12 17:07:18 +00:00
|
|
|
GIT_TARNAME=git-core-$(GIT_VERSION)
|
|
|
|
dist: git-core.spec git-tar-tree
|
2005-07-11 21:03:09 +00:00
|
|
|
./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar
|
2005-07-07 20:09:50 +00:00
|
|
|
@mkdir -p $(GIT_TARNAME)
|
2005-07-12 17:07:18 +00:00
|
|
|
@cp git-core.spec $(GIT_TARNAME)
|
|
|
|
tar rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git-core.spec
|
2005-07-07 20:09:50 +00:00
|
|
|
@rm -rf $(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-07-15 01:20:25 +00:00
|
|
|
$(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
|
2005-07-07 20:09:50 +00:00
|
|
|
|
2005-08-06 20:10:43 +00:00
|
|
|
deb: dist
|
2005-08-07 05:29:21 +00:00
|
|
|
rm -rf $(GIT_TARNAME)
|
|
|
|
tar zxf $(GIT_TARNAME).tar.gz
|
2005-08-12 08:03:07 +00:00
|
|
|
dpkg-source -b $(GIT_TARNAME)
|
2005-08-07 05:29:21 +00:00
|
|
|
cd $(GIT_TARNAME) && fakeroot debian/rules binary
|
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:
|
2005-09-08 00:26:23 +00:00
|
|
|
rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROGRAMS) $(LIB_FILE)
|
2005-09-09 01:50:33 +00:00
|
|
|
rm -f $(filter-out gitk,$(SCRIPTS))
|
|
|
|
rm -f git-core.spec
|
2005-08-07 05:29:21 +00:00
|
|
|
rm -rf $(GIT_TARNAME)
|
2005-08-12 08:03:07 +00:00
|
|
|
rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
|
|
|
|
rm -f git-core_$(GIT_VERSION)-*.deb git-core_$(GIT_VERSION)-*.dsc
|
|
|
|
rm -f git-tk_$(GIT_VERSION)-*.deb
|
2005-05-22 18:27:28 +00:00
|
|
|
$(MAKE) -C Documentation/ clean
|
2005-08-02 23:45:21 +00:00
|
|
|
$(MAKE) -C templates/ clean
|
2005-08-03 00:24:11 +00:00
|
|
|
$(MAKE) -C t/ clean
|