From: Petr Baudis Date: Thu, 4 Aug 2005 22:52:46 +0000 (+0200) Subject: [PATCH] Unify Makefile indentation X-Git-Tag: v0.99.5~23^2~4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3e386508f87278610d1892aaaa08cd17907f71c5;p=git.git [PATCH] Unify Makefile indentation Use 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 Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 2e8ed5af1..aeba3e7eb 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= -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= + ifeq ($(shell uname -s),Darwin) + LIBS += -lcrypto -lssl + else + LIBS += -lcrypto + endif + endif endif DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'