summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a682ef9)
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>
git-update-server-info git-show-rev-cache git-build-rev-cache
ifndef NO_CURL
git-update-server-info git-show-rev-cache git-build-rev-cache
ifndef NO_CURL
OPENSSL_LIBSSL=
endif
ifdef MOZILLA_SHA1
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
-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)'
endif
DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'