#
# 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 COLLISION_CHECK below if you believe that SHA1's
# 1461501637330902918203684832716283019655932542976 hashes do not give you
# DEFINES += -DUSE_STDEV
-GIT_VERSION = 0.99.4
+GIT_VERSION = 0.99.5
CFLAGS = -g -O2 -Wall
ALL_CFLAGS = $(CFLAGS) $(DEFINES)
-SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
+SCRIPTS=git 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-verify-tag-script \
- git-ls-remote-script git-clone-dumb-http git-rename-script \
- git-request-pull-script git-bisect-script
+ git-branch-script git-parse-remote-script git-verify-tag-script \
+ git-ls-remote-script git-rename-script \
+ git-request-pull-script git-bisect-script \
+ git-applymbox git-applypatch
SCRIPTS += git-count-objects-script
-# SCRIPTS += git-send-email-script
SCRIPTS += git-revert-script
+SCRIPTS += git-octopus-script
+SCRIPTS += git-archimport-script
+
+# 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
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-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-apply \
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-update-server-info git-show-rev-cache git-build-rev-cache
+ git-show-index git-peek-remote git-show-branch \
+ git-update-server-info git-show-rev-cache git-build-rev-cache \
+ $(SIMPLE_PROGRAMS)
+
+ifdef WITH_SEND_EMAIL
+SCRIPTS += git-send-email-script
+endif
ifndef NO_CURL
-PROG+= git-http-pull
+ PROG+= git-http-pull
endif
LIB_FILE=libgit.a
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
+ sha1_name.o setup.o
LIB_H += rev-cache.h
LIB_OBJS += rev-cache.o
LIBS = $(LIB_FILE)
LIBS += -lz
+ifeq ($(shell uname -s),Darwin)
+ NEEDS_SSL_WITH_CRYPTO = YesPlease
+ NEEDS_LIBICONV = YesPlease
+endif
+
ifndef NO_OPENSSL
LIB_OBJS += epoch.o
OPENSSL_LIBSSL=-lssl
MOZILLA_SHA1=1
OPENSSL_LIBSSL=
endif
-ifdef MOZILLA_SHA1
- SHA1_HEADER="mozilla-sha1/sha1.h"
- LIB_OBJS += mozilla-sha1/sha1.o
+ifdef NEEDS_SSL_WITH_CRYPTO
+ LIB_4_CRYPTO = -lcrypto -lssl
else
-ifdef PPC_SHA1
- 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
+ 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"
+ LIB_OBJS += mozilla-sha1/sha1.o
+else
+ ifdef PPC_SHA1
+ SHA1_HEADER="ppc/sha1.h"
+ LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
+ else
+ SHA1_HEADER=<openssl/sha.h>
+ LIBS += $(LIB_4_CRYPTO)
+ endif
endif
DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
all:
$(MAKE) -C templates
- $(MAKE) -C tools
%.o: %.c
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
git-%: %.o $(LIB_FILE)
$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+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-pull: pull.o
git-local-pull: pull.o
git-ssh-pull: rsh.o pull.o
install: $(PROG) $(SCRIPTS)
$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
$(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
+ $(INSTALL) git-revert-script $(DESTDIR)$(bindir)/git-cherry-pick-script
$(MAKE) -C templates install
-install-tools:
- $(MAKE) -C tools install
-
install-doc:
$(MAKE) -C Documentation install
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