#
# Define PPC_SHA1 environment variable when running make to make use of
# a bundled SHA1 routine optimized for PowerPC.
-
-
+#
+# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
+#
+# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
+#
+# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
+# Patrick Mauritz).
+#
+# Define NO_GETDOMAINNAME if your library lack it (SunOS, Patrick Mauritz).
+#
# 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 += -DUSE_STDEV
-GIT_VERSION = 0.99.4
+GIT_VERSION = 0.99.6
CFLAGS = -g -O2 -Wall
-ALL_CFLAGS = $(CFLAGS) $(DEFINES)
+ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
prefix = $(HOME)
bindir = $(prefix)/bin
template_dir = $(prefix)/share/git-core/templates/
+GIT_PYTHON_DIR = $(prefix)/share/git-core/python
# DESTDIR=
CC = gcc
### --- END CONFIGURATION SECTION ---
-
-
-SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
- git-pull-script git-tag-script git-resolve-script git-whatchanged \
- git-fetch-script git-status-script git-commit-script \
- git-log-script git-shortlog git-cvsimport-script git-diff-script \
- git-reset-script git-add-script git-checkout-script git-clone-script \
- gitk git-cherry git-rebase-script git-relink-script git-repack-script \
- git-format-patch-script git-sh-setup-script git-push-script \
- git-branch-script git-parse-remote git-parse-remote-script git-verify-tag-script \
- git-ls-remote-script git-clone-dumb-http git-rename-script \
- git-request-pull-script git-bisect-script
-
-SCRIPTS += git-count-objects-script
-# SCRIPTS += git-send-email-script
-SCRIPTS += git-revert-script
-
-PROG= git-update-cache git-diff-files git-init-db git-write-tree \
- git-read-tree git-commit-tree git-cat-file git-fsck-cache \
- git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
- git-ls-tree git-merge-base git-merge-cache \
- git-unpack-file git-export git-diff-cache git-convert-cache \
- git-ssh-push git-ssh-pull git-rev-list git-mktag \
- git-diff-helper git-tar-tree git-local-pull git-hash-object \
- git-get-tar-commit-id git-apply git-stripspace \
- git-diff-stages git-rev-parse git-patch-id git-pack-objects \
- git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
- git-prune-packed git-fetch-pack git-upload-pack git-clone-pack \
- git-show-index git-daemon git-var git-peek-remote git-show-branch \
- git-update-server-info git-show-rev-cache git-build-rev-cache
+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 \
+ git-applymbox.sh git-applypatch.sh \
+ git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
+ git-merge-resolve.sh git-grep.sh
+
+SCRIPT_PERL = \
+ git-archimport.perl git-cvsimport.perl git-relink.perl \
+ git-rename.perl git-shortlog.perl
+
+SCRIPT_PYTHON = \
+ git-merge-recursive.py
+
+# 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
+PROGRAMS = \
+ git-apply git-cat-file \
+ git-checkout-index git-clone-pack git-commit-tree \
+ git-convert-objects git-diff-files \
+ git-diff-helper git-diff-index git-diff-stages \
+ git-diff-tree git-export git-fetch-pack git-fsck-objects \
+ 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 \
+ git-rev-tree git-send-pack git-show-branch \
+ git-show-index git-ssh-fetch \
+ 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 \
+ $(SIMPLE_PROGRAMS)
+
+# Backward compatibility -- to be removed in 0.99.8
+PROGRAMS += git-ssh-pull git-ssh-push
+
+PYMODULES = \
+ gitMergeCommon.py
+
+ifdef WITH_SEND_EMAIL
+ SCRIPT_PERL += git-send-email.perl
+endif
ifndef NO_CURL
- PROG+= git-http-pull
+ PROGRAMS += git-http-fetch
endif
LIB_FILE=libgit.a
-LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h \
- pack.h pkt-line.h refs.h
-LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
- tag.o date.o index.o diff-delta.o patch-delta.o entry.o path.o \
- refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o \
- sha1_name.o setup.o
-
-LIB_H += rev-cache.h
-LIB_OBJS += rev-cache.o
-
-LIB_H += run-command.h
-LIB_OBJS += run-command.o
-LIB_H += strbuf.h
-LIB_OBJS += strbuf.o
+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 \
+ run-command.h strbuf.h tag.h tree.h
-LIB_H += quote.h
-LIB_OBJS += quote.o
+DIFF_OBJS = \
+ diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
+ diffcore-pickaxe.o diffcore-rename.o
-LIB_H += diff.h count-delta.h
-DIFF_OBJS = diff.o diffcore-rename.o diffcore-pickaxe.o diffcore-pathspec.o \
- diffcore-break.o diffcore-order.o
-LIB_OBJS += $(DIFF_OBJS) count-delta.o
-
-LIB_OBJS += gitenv.o
-LIB_OBJS += server-info.o
+LIB_OBJS = \
+ blob.o commit.o connect.o count-delta.o csum-file.o \
+ date.o diff-delta.o entry.o ident.o index.o \
+ object.o pack-check.o patch-delta.o path.o pkt-line.o \
+ quote.o read-cache.o refs.o run-command.o \
+ server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
+ tag.o tree.o usage.o $(DIFF_OBJS)
LIBS = $(LIB_FILE)
LIBS += -lz
+ifeq ($(shell uname -s),Darwin)
+ NEEDS_SSL_WITH_CRYPTO = YesPlease
+ NEEDS_LIBICONV = YesPlease
+endif
+ifeq ($(shell uname -s),SunOS)
+ NEEDS_SOCKET = YesPlease
+ NEEDS_NSL = YesPlease
+ PLATFORM_DEFINES += -D__EXTENSIONS__
+endif
+
+ifndef SHELL_PATH
+ SHELL_PATH = /bin/sh
+endif
+ifndef PERL_PATH
+ PERL_PATH = /usr/bin/perl
+endif
+ifndef PYTHON_PATH
+ PYTHON_PATH = /usr/bin/python
+endif
+
ifndef NO_OPENSSL
LIB_OBJS += epoch.o
- OPENSSL_LIBSSL=-lssl
+ OPENSSL_LIBSSL = -lssl
else
DEFINES += '-DNO_OPENSSL'
- MOZILLA_SHA1=1
- OPENSSL_LIBSSL=
+ MOZILLA_SHA1 = 1
+ OPENSSL_LIBSSL =
+endif
+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
ifdef MOZILLA_SHA1
- SHA1_HEADER="mozilla-sha1/sha1.h"
+ SHA1_HEADER = "mozilla-sha1/sha1.h"
LIB_OBJS += mozilla-sha1/sha1.o
else
ifdef PPC_SHA1
- SHA1_HEADER="ppc/sha1.h"
+ SHA1_HEADER = "ppc/sha1.h"
LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
else
- SHA1_HEADER=<openssl/sha.h>
- ifeq ($(shell uname -s),Darwin)
- LIBS += -lcrypto -lssl
- else
- LIBS += -lcrypto
- endif
+ SHA1_HEADER = <openssl/sha.h>
+ LIBS += $(LIB_4_CRYPTO)
endif
endif
+ifdef NEEDS_SOCKET
+ LIBS += -lsocket
+ SIMPLE_LIB += -lsocket
+endif
+ifdef NEEDS_NSL
+ LIBS += -lnsl
+ SIMPLE_LIB += -lnsl
+endif
DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
-
+SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
+ $(patsubst %.perl,%,$(SCRIPT_PERL)) \
+ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
+ gitk
### Build rules
-all: $(PROG)
+all: $(PROGRAMS) $(SCRIPTS)
all:
$(MAKE) -C templates
- $(MAKE) -C tools
+
+git: git.sh Makefile
+ rm -f $@+ $@
+ sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' <$@.sh >$@+
+ chmod +x $@+
+ mv $@+ $@
+
+$(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 $@
+
+$(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 $@
%.o: %.c
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
git-%: %.o $(LIB_FILE)
$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-git-http-pull: pull.o
-git-local-pull: pull.o
-git-ssh-pull: rsh.o pull.o
+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)
+
+git-http-fetch: fetch.o
+git-local-fetch: fetch.o
+git-ssh-fetch: rsh.o fetch.o
+git-ssh-upload: rsh.o
+git-ssh-pull: rsh.o fetch.o
git-ssh-push: rsh.o
-git-http-pull: LIBS += -lcurl
+git-http-fetch: LIBS += -lcurl
git-rev-list: LIBS += $(OPENSSL_LIBSSL)
init-db.o: init-db.c
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
$(LIB_OBJS): $(LIB_H)
-$(patsubst git-%,%.o,$(PROG)): $(LIB_H)
+$(patsubst git-%,%.o,$(PROGRAMS)): $(LIB_H)
$(DIFF_OBJS): diffcore.h
$(LIB_FILE): $(LIB_OBJS)
$(MAKE) -C Documentation all
-
### Testing rules
test: all
### Installation rules
-install: $(PROG) $(SCRIPTS)
- $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
- $(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
+install: $(PROGRAMS) $(SCRIPTS)
+ $(INSTALL) -d -m755 $(DESTDIR)$(bindir)
+ $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
+ $(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick
+ sh ./cmd-rename.sh $(DESTDIR)$(bindir)
$(MAKE) -C templates install
- $(MAKE) -C tools install
+ $(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR)
+ $(INSTALL) $(PYMODULES) $(DESTDIR)$(GIT_PYTHON_DIR)
install-doc:
$(MAKE) -C Documentation install
### Cleaning rules
clean:
- rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
+ rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROGRAMS) $(LIB_FILE)
+ rm -f $(filter-out gitk,$(SCRIPTS))
rm -f git-core.spec
rm -rf $(GIT_TARNAME)
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
- $(MAKE) -C tools/ clean
$(MAKE) -C Documentation/ clean
$(MAKE) -C templates/ clean
$(MAKE) -C t/ clean