Skip to content

Commit dd6fc7c

Browse files
slattarinigitster
authored andcommitted
Makefile: whitespace style fixes in macro definitions
Consistently use a single space before and after the "=" (or ":=", "+=", etc.) in assignments to make macros. Granted, this was not a big deal, but I did find the needless inconsistency quite distracting. Signed-off-by: Stefano Lattarini <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 816f290 commit dd6fc7c

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

Makefile

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ htmldir = share/doc/git-doc
374374
ETC_GITCONFIG = $(sysconfdir)/gitconfig
375375
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
376376
lib = lib
377-
# DESTDIR=
377+
# DESTDIR =
378378
pathsep = :
379379

380380
export prefix bindir sharedir sysconfdir gitwebdir localedir
@@ -575,9 +575,9 @@ endif
575575
export PERL_PATH
576576
export PYTHON_PATH
577577

578-
LIB_FILE=libgit.a
579-
XDIFF_LIB=xdiff/lib.a
580-
VCSSVN_LIB=vcs-svn/lib.a
578+
LIB_FILE = libgit.a
579+
XDIFF_LIB = xdiff/lib.a
580+
VCSSVN_LIB = vcs-svn/lib.a
581581

582582
LIB_H += xdiff/xinclude.h
583583
LIB_H += xdiff/xmacros.h
@@ -1139,29 +1139,29 @@ ifeq ($(uname_S),NetBSD)
11391139
endif
11401140
ifeq ($(uname_S),AIX)
11411141
DEFAULT_PAGER = more
1142-
NO_STRCASESTR=YesPlease
1142+
NO_STRCASESTR = YesPlease
11431143
NO_MEMMEM = YesPlease
11441144
NO_MKDTEMP = YesPlease
11451145
NO_MKSTEMPS = YesPlease
11461146
NO_STRLCPY = YesPlease
11471147
NO_NSEC = YesPlease
11481148
FREAD_READS_DIRECTORIES = UnfortunatelyYes
11491149
INTERNAL_QSORT = UnfortunatelyYes
1150-
NEEDS_LIBICONV=YesPlease
1150+
NEEDS_LIBICONV = YesPlease
11511151
BASIC_CFLAGS += -D_LARGE_FILES
11521152
ifeq ($(shell expr "$(uname_V)" : '[1234]'),1)
11531153
NO_PTHREADS = YesPlease
11541154
else
11551155
PTHREAD_LIBS = -lpthread
11561156
endif
11571157
ifeq ($(shell expr "$(uname_V).$(uname_R)" : '5\.1'),3)
1158-
INLINE=''
1158+
INLINE = ''
11591159
endif
11601160
GIT_TEST_CMP = cmp
11611161
endif
11621162
ifeq ($(uname_S),GNU)
11631163
# GNU/Hurd
1164-
NO_STRLCPY=YesPlease
1164+
NO_STRLCPY = YesPlease
11651165
NO_MKSTEMPS = YesPlease
11661166
HAVE_PATHS_H = YesPlease
11671167
LIBC_CONTAINS_LIBINTL = YesPlease
@@ -1187,9 +1187,9 @@ ifeq ($(uname_S),IRIX)
11871187
NEEDS_LIBGEN = YesPlease
11881188
endif
11891189
ifeq ($(uname_S),IRIX64)
1190-
NO_SETENV=YesPlease
1190+
NO_SETENV = YesPlease
11911191
NO_UNSETENV = YesPlease
1192-
NO_STRCASESTR=YesPlease
1192+
NO_STRCASESTR = YesPlease
11931193
NO_MEMMEM = YesPlease
11941194
NO_MKSTEMPS = YesPlease
11951195
NO_MKDTEMP = YesPlease
@@ -1203,14 +1203,14 @@ ifeq ($(uname_S),IRIX64)
12031203
NO_REGEX = YesPlease
12041204
NO_FNMATCH_CASEFOLD = YesPlease
12051205
SNPRINTF_RETURNS_BOGUS = YesPlease
1206-
SHELL_PATH=/usr/gnu/bin/bash
1206+
SHELL_PATH = /usr/gnu/bin/bash
12071207
NEEDS_LIBGEN = YesPlease
12081208
endif
12091209
ifeq ($(uname_S),HP-UX)
12101210
INLINE = __inline
1211-
NO_IPV6=YesPlease
1212-
NO_SETENV=YesPlease
1213-
NO_STRCASESTR=YesPlease
1211+
NO_IPV6 = YesPlease
1212+
NO_SETENV = YesPlease
1213+
NO_STRCASESTR = YesPlease
12141214
NO_MEMMEM = YesPlease
12151215
NO_MKSTEMPS = YesPlease
12161216
NO_STRLCPY = YesPlease
@@ -1386,10 +1386,10 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
13861386
MKDIR_WO_TRAILING_SLASH = YesPlease
13871387
# RFE 10-120912-4693 submitted to HP NonStop development.
13881388
NO_SETITIMER = UnfortunatelyYes
1389-
SANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin
1390-
SHELL_PATH=/usr/local/bin/bash
1389+
SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
1390+
SHELL_PATH = /usr/local/bin/bash
13911391
# as of H06.25/J06.14, we might better use this
1392-
#SHELL_PATH=/usr/coreutils/bin/bash
1392+
#SHELL_PATH = /usr/coreutils/bin/bash
13931393
endif
13941394
ifneq (,$(findstring MINGW,$(uname_S)))
13951395
pathsep = ;
@@ -1437,7 +1437,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
14371437
X = .exe
14381438
SPARSE_FLAGS = -Wno-one-bit-signed-bitfield
14391439
ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
1440-
htmldir=doc/git/html/
1440+
htmldir = doc/git/html/
14411441
prefix =
14421442
INSTALL = /bin/install
14431443
EXTLIBS += /mingw/lib/libz.a
@@ -1559,7 +1559,7 @@ else
15591559
CURL_LIBCURL = -lcurl
15601560
endif
15611561
ifdef NEEDS_SSL_WITH_CURL
1562-
CURL_LIBCURL += -lssl
1562+
CURL_LIBCURL += -lssl
15631563
ifdef NEEDS_CRYPTO_WITH_SSL
15641564
CURL_LIBCURL += -lcrypto
15651565
endif
@@ -1768,7 +1768,7 @@ ifdef OBJECT_CREATION_USES_RENAMES
17681768
endif
17691769
ifdef NO_STRUCT_ITIMERVAL
17701770
COMPAT_CFLAGS += -DNO_STRUCT_ITIMERVAL
1771-
NO_SETITIMER=YesPlease
1771+
NO_SETITIMER = YesPlease
17721772
endif
17731773
ifdef NO_SETITIMER
17741774
COMPAT_CFLAGS += -DNO_SETITIMER
@@ -1920,15 +1920,15 @@ ifneq (,$(XDL_FAST_HASH))
19201920
endif
19211921

19221922
ifeq ($(TCLTK_PATH),)
1923-
NO_TCLTK=NoThanks
1923+
NO_TCLTK = NoThanks
19241924
endif
19251925

19261926
ifeq ($(PERL_PATH),)
1927-
NO_PERL=NoThanks
1927+
NO_PERL = NoThanks
19281928
endif
19291929

19301930
ifeq ($(PYTHON_PATH),)
1931-
NO_PYTHON=NoThanks
1931+
NO_PYTHON = NoThanks
19321932
endif
19331933

19341934
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
@@ -1975,13 +1975,13 @@ PROFILE_DIR := $(CURDIR)
19751975
ifeq ("$(PROFILE)","GEN")
19761976
CFLAGS += -fprofile-generate=$(PROFILE_DIR) -DNO_NORETURN=1
19771977
EXTLIBS += -lgcov
1978-
export CCACHE_DISABLE=t
1979-
V=1
1978+
export CCACHE_DISABLE = t
1979+
V = 1
19801980
else
19811981
ifneq ("$(PROFILE)","")
19821982
CFLAGS += -fprofile-use=$(PROFILE_DIR) -fprofile-correction -DNO_NORETURN=1
1983-
export CCACHE_DISABLE=t
1984-
V=1
1983+
export CCACHE_DISABLE = t
1984+
V = 1
19851985
endif
19861986
endif
19871987

@@ -2830,7 +2830,7 @@ git.spec: git.spec.in GIT-VERSION-FILE
28302830
sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
28312831
mv $@+ $@
28322832

2833-
GIT_TARNAME=git-$(GIT_VERSION)
2833+
GIT_TARNAME = git-$(GIT_VERSION)
28342834
dist: git.spec git-archive$(X) configure
28352835
./git-archive --format=tar \
28362836
--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar

config.mak.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ datarootdir = @datarootdir@
1818
template_dir = @datadir@/git-core/templates
1919
sysconfdir = @sysconfdir@
2020

21-
mandir=@mandir@
21+
mandir = @mandir@
2222

2323
srcdir = @srcdir@
2424
VPATH = @srcdir@

t/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-include ../config.mak.autogen
77
-include ../config.mak
88

9-
#GIT_TEST_OPTS=--verbose --debug
9+
#GIT_TEST_OPTS = --verbose --debug
1010
SHELL_PATH ?= $(SHELL)
1111
PERL_PATH ?= /usr/bin/perl
1212
TAR ?= $(TAR)

0 commit comments

Comments
 (0)