summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a682ef9)
raw | patch | inline | side by side (parent: a682ef9)
author | Petr Baudis <pasky@ucw.cz> | |
Thu, 4 Aug 2005 22:52:46 +0000 (00:52 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Fri, 12 Aug 2005 17:38:23 +0000 (10:38 -0700) |
Use <tab> instead of two spaces uniformly in the Makefile, even in the
ifdefs. Gives it a nice consistent look.
[jc: At the same time I indented the nested ifdefs to make them
slightly easier to read.]
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
ifdefs. Gives it a nice consistent look.
[jc: At the same time I indented the nested ifdefs to make them
slightly easier to read.]
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Makefile | patch | blob | history |
diff --git a/Makefile b/Makefile
index 2e8ed5af17acb18821410f94c244f9881abf957b..aeba3e7eb7e8e0b1fe984f63ef1d537822ec1ea2 100644 (file)
--- a/Makefile
+++ b/Makefile
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
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)'