# 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.
#
+# Define NO_CURL if you do not have curl installed. git-http-pull is not
+# built, and you cannot use http:// and https:// transports.
+#
# Define PPC_SHA1 environment variable when running make to make use of
# a bundled SHA1 routine optimized for PowerPC.
# DEFINES += -DUSE_STDEV
-GIT_VERSION=0.99.2
+GIT_VERSION=0.99.3
COPTS?=-g -O2
CFLAGS+=$(COPTS) -Wall $(DEFINES)
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-request-pull-script git-bisect-script
+
+SCRIPTS += git-count-objects-script
+SCRIPTS += git-send-email-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-check-files git-ls-tree git-merge-base git-merge-cache \
git-unpack-file git-export git-diff-cache git-convert-cache \
- git-http-pull git-ssh-push git-ssh-pull git-rev-list git-mktag \
+ 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-show-index git-daemon git-var git-peek-remote \
git-update-server-info git-show-rev-cache git-build-rev-cache
+ifndef NO_CURL
+PROG+= git-http-pull
+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_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
ifndef NO_OPENSSL
LIB_OBJS += epoch.o
+ OPENSSL_LIBSSL=-lssl
else
CFLAGS += '-DNO_OPENSSL'
MOZILLA_SHA1=1
+ OPENSSL_LIBSSL=
endif
ifdef MOZILLA_SHA1
SHA1_HEADER="mozilla-sha1/sha1.h"
git-ssh-push: rsh.o
git-http-pull: LIBS += -lcurl
-git-rev-list: LIBS += -lssl
+git-rev-list: LIBS += $(OPENSSL_LIBSSL)
$(LIB_OBJS): $(LIB_H)
$(DIFF_OBJS): diffcore.h
rm -f git-core-*.tar.gz git-core.spec
$(MAKE) -C tools/ clean
$(MAKE) -C Documentation/ clean
+ $(MAKE) -C t/ clean