summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPetr Baudis <pasky@ucw.cz>2005-08-04 22:52:46 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-12 17:38:23 (GMT)
commit3e386508f87278610d1892aaaa08cd17907f71c5 (patch)
treed450218884d7f51d4d996fea6c8577ffb4b12429 /Makefile
parenta682ef9f06075b4bb83dcf479c91d578125084b9 (diff)
downloadgit-3e386508f87278610d1892aaaa08cd17907f71c5.zip
git-3e386508f87278610d1892aaaa08cd17907f71c5.tar.gz
git-3e386508f87278610d1892aaaa08cd17907f71c5.tar.bz2
[PATCH] Unify Makefile indentation
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile28
1 files changed, 14 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 2e8ed5a..aeba3e7 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,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
@@ -130,20 +130,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)'