X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile;h=c0a84298b5a0fde300d18b46bc77d4da8d2e11a4;hb=e65be0b7aaee03fe4b700a65a828127147cc624f;hp=2e8ed5af17acb18821410f94c244f9881abf957b;hpb=a682ef9f06075b4bb83dcf479c91d578125084b9;p=git.git

diff --git a/Makefile b/Makefile
index 2e8ed5af..c0a84298 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.4
+GIT_VERSION = 0.99.5
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(DEFINES)
@@ -71,6 +71,7 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
 SCRIPTS += git-count-objects-script
 # SCRIPTS += git-send-email-script
 SCRIPTS += git-revert-script
+SCRIPTS += git-show-branches-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 \
@@ -87,7 +88,7 @@ PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
 	git-update-server-info git-show-rev-cache git-build-rev-cache
 
 ifndef NO_CURL
-PROG+= git-http-pull
+	PROG+= git-http-pull
 endif
 
 LIB_FILE=libgit.a
@@ -96,7 +97,7 @@ LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.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
+	 sha1_name.o setup.o
 
 LIB_H += rev-cache.h
 LIB_OBJS += rev-cache.o
@@ -130,20 +131,20 @@ else
 	OPENSSL_LIBSSL=
 endif
 ifdef MOZILLA_SHA1
-  SHA1_HEADER="mozilla-sha1/sha1.h"
-  LIB_OBJS += mozilla-sha1/sha1.o
+	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>
-ifeq ($(shell uname -s),Darwin)
-  LIBS += -lcrypto -lssl
-else
-  LIBS += -lcrypto
-endif
-endif
+	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
+		endif
+	endif
 endif
 
 DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
@@ -212,8 +213,6 @@ install: $(PROG) $(SCRIPTS)
 	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
 	$(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
 	$(MAKE) -C templates install
-
-install-tools:
 	$(MAKE) -C tools install
 
 install-doc: