{"thread":{"id":"32303","subject":"[PATCH] Makefile: whitespace style fixes in macro definitions","startedAt":"2012-12-09T10:36:17Z","lastAt":"2012-12-10T16:37:35Z","messageCount":2,"participants":["Stefano Lattarini","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"204625","messageId":"0544836357d56c05188941ef5a471605fa6d4881.1355049367.git.stefano.lattarini@gmail.com","threadId":"32303","inReplyTo":null,"subject":"[PATCH] Makefile: whitespace style fixes in macro definitions","fromName":"Stefano Lattarini","fromEmail":"stefano.lattarini@gmail.com","sentAt":"2012-12-09T10:36:17Z","receivedAt":"2012-12-09T10:36:17Z","isPatch":true,"sender":{"key":"stefano.lattarini@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1429199?v=4"},"body":"Consistently use a single space before and after the \"=\" (or \":=\", \"+=\",\netc.) in assignments to make macros.  Granted, this was not a big deal,\nbut I did find the needless inconsistency quite distracting.\n\nSigned-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>\n---\n Makefile      | 56 ++++++++++++++++++++++++++++----------------------------\n config.mak.in |  2 +-\n t/Makefile    |  2 +-\n 3 files changed, 30 insertions(+), 30 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 4ad6fbd..736ecd4 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -374,7 +374,7 @@ htmldir = share/doc/git-doc\n ETC_GITCONFIG = $(sysconfdir)/gitconfig\n ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes\n lib = lib\n-# DESTDIR=\n+# DESTDIR =\n pathsep = :\n \n export prefix bindir sharedir sysconfdir gitwebdir localedir\n@@ -575,9 +575,9 @@ endif\n export PERL_PATH\n export PYTHON_PATH\n \n-LIB_FILE=libgit.a\n-XDIFF_LIB=xdiff/lib.a\n-VCSSVN_LIB=vcs-svn/lib.a\n+LIB_FILE = libgit.a\n+XDIFF_LIB = xdiff/lib.a\n+VCSSVN_LIB = vcs-svn/lib.a\n \n LIB_H += xdiff/xinclude.h\n LIB_H += xdiff/xmacros.h\n@@ -1139,7 +1139,7 @@ ifeq ($(uname_S),NetBSD)\n endif\n ifeq ($(uname_S),AIX)\n \tDEFAULT_PAGER = more\n-\tNO_STRCASESTR=YesPlease\n+\tNO_STRCASESTR = YesPlease\n \tNO_MEMMEM = YesPlease\n \tNO_MKDTEMP = YesPlease\n \tNO_MKSTEMPS = YesPlease\n@@ -1147,7 +1147,7 @@ ifeq ($(uname_S),AIX)\n \tNO_NSEC = YesPlease\n \tFREAD_READS_DIRECTORIES = UnfortunatelyYes\n \tINTERNAL_QSORT = UnfortunatelyYes\n-\tNEEDS_LIBICONV=YesPlease\n+\tNEEDS_LIBICONV = YesPlease\n \tBASIC_CFLAGS += -D_LARGE_FILES\n \tifeq ($(shell expr \"$(uname_V)\" : '[1234]'),1)\n \t\tNO_PTHREADS = YesPlease\n@@ -1155,13 +1155,13 @@ ifeq ($(uname_S),AIX)\n \t\tPTHREAD_LIBS = -lpthread\n \tendif\n \tifeq ($(shell expr \"$(uname_V).$(uname_R)\" : '5\\.1'),3)\n-\t\tINLINE=''\n+\t\tINLINE = ''\n \tendif\n \tGIT_TEST_CMP = cmp\n endif\n ifeq ($(uname_S),GNU)\n \t# GNU/Hurd\n-\tNO_STRLCPY=YesPlease\n+\tNO_STRLCPY = YesPlease\n \tNO_MKSTEMPS = YesPlease\n \tHAVE_PATHS_H = YesPlease\n \tLIBC_CONTAINS_LIBINTL = YesPlease\n@@ -1187,9 +1187,9 @@ ifeq ($(uname_S),IRIX)\n \tNEEDS_LIBGEN = YesPlease\n endif\n ifeq ($(uname_S),IRIX64)\n-\tNO_SETENV=YesPlease\n+\tNO_SETENV = YesPlease\n \tNO_UNSETENV = YesPlease\n-\tNO_STRCASESTR=YesPlease\n+\tNO_STRCASESTR = YesPlease\n \tNO_MEMMEM = YesPlease\n \tNO_MKSTEMPS = YesPlease\n \tNO_MKDTEMP = YesPlease\n@@ -1203,14 +1203,14 @@ ifeq ($(uname_S),IRIX64)\n \tNO_REGEX = YesPlease\n \tNO_FNMATCH_CASEFOLD = YesPlease\n \tSNPRINTF_RETURNS_BOGUS = YesPlease\n-\tSHELL_PATH=/usr/gnu/bin/bash\n+\tSHELL_PATH = /usr/gnu/bin/bash\n \tNEEDS_LIBGEN = YesPlease\n endif\n ifeq ($(uname_S),HP-UX)\n \tINLINE = __inline\n-\tNO_IPV6=YesPlease\n-\tNO_SETENV=YesPlease\n-\tNO_STRCASESTR=YesPlease\n+\tNO_IPV6 = YesPlease\n+\tNO_SETENV = YesPlease\n+\tNO_STRCASESTR = YesPlease\n \tNO_MEMMEM = YesPlease\n \tNO_MKSTEMPS = YesPlease\n \tNO_STRLCPY = YesPlease\n@@ -1386,10 +1386,10 @@ ifeq ($(uname_S),NONSTOP_KERNEL)\n \tMKDIR_WO_TRAILING_SLASH = YesPlease\n \t# RFE 10-120912-4693 submitted to HP NonStop development.\n \tNO_SETITIMER = UnfortunatelyYes\n-\tSANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin\n-\tSHELL_PATH=/usr/local/bin/bash\n+\tSANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin\n+\tSHELL_PATH = /usr/local/bin/bash\n \t# as of H06.25/J06.14, we might better use this\n-\t#SHELL_PATH=/usr/coreutils/bin/bash\n+\t#SHELL_PATH = /usr/coreutils/bin/bash\n endif\n ifneq (,$(findstring MINGW,$(uname_S)))\n \tpathsep = ;\n@@ -1437,7 +1437,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n \tX = .exe\n \tSPARSE_FLAGS = -Wno-one-bit-signed-bitfield\n ifneq (,$(wildcard ../THIS_IS_MSYSGIT))\n-\thtmldir=doc/git/html/\n+\thtmldir = doc/git/html/\n \tprefix =\n \tINSTALL = /bin/install\n \tEXTLIBS += /mingw/lib/libz.a\n@@ -1559,7 +1559,7 @@ else\n \t\tCURL_LIBCURL = -lcurl\n \tendif\n \tifdef NEEDS_SSL_WITH_CURL\n-\t\tCURL_LIBCURL +=\t-lssl\n+\t\tCURL_LIBCURL += -lssl\n \t\tifdef NEEDS_CRYPTO_WITH_SSL\n \t\t\tCURL_LIBCURL += -lcrypto\n \t\tendif\n@@ -1768,7 +1768,7 @@ ifdef OBJECT_CREATION_USES_RENAMES\n endif\n ifdef NO_STRUCT_ITIMERVAL\n \tCOMPAT_CFLAGS += -DNO_STRUCT_ITIMERVAL\n-\tNO_SETITIMER=YesPlease\n+\tNO_SETITIMER = YesPlease\n endif\n ifdef NO_SETITIMER\n \tCOMPAT_CFLAGS += -DNO_SETITIMER\n@@ -1920,15 +1920,15 @@ ifneq (,$(XDL_FAST_HASH))\n endif\n \n ifeq ($(TCLTK_PATH),)\n-NO_TCLTK=NoThanks\n+NO_TCLTK = NoThanks\n endif\n \n ifeq ($(PERL_PATH),)\n-NO_PERL=NoThanks\n+NO_PERL = NoThanks\n endif\n \n ifeq ($(PYTHON_PATH),)\n-NO_PYTHON=NoThanks\n+NO_PYTHON = NoThanks\n endif\n \n QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir\n@@ -1975,13 +1975,13 @@ PROFILE_DIR := $(CURDIR)\n ifeq (\"$(PROFILE)\",\"GEN\")\n \tCFLAGS += -fprofile-generate=$(PROFILE_DIR) -DNO_NORETURN=1\n \tEXTLIBS += -lgcov\n-\texport CCACHE_DISABLE=t\n-\tV=1\n+\texport CCACHE_DISABLE = t\n+\tV = 1\n else\n ifneq (\"$(PROFILE)\",\"\")\n \tCFLAGS += -fprofile-use=$(PROFILE_DIR) -fprofile-correction -DNO_NORETURN=1\n-\texport CCACHE_DISABLE=t\n-\tV=1\n+\texport CCACHE_DISABLE = t\n+\tV = 1\n endif\n endif\n \n@@ -2830,7 +2830,7 @@ git.spec: git.spec.in GIT-VERSION-FILE\n \tsed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+\n \tmv $@+ $@\n \n-GIT_TARNAME=git-$(GIT_VERSION)\n+GIT_TARNAME = git-$(GIT_VERSION)\n dist: git.spec git-archive$(X) configure\n \t./git-archive --format=tar \\\n \t\t--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar\ndiff --git a/config.mak.in b/config.mak.in\nindex 69d4838..e8a9bb4 100644\n--- a/config.mak.in\n+++ b/config.mak.in\n@@ -18,7 +18,7 @@ datarootdir = @datarootdir@\n template_dir = @datadir@/git-core/templates\n sysconfdir = @sysconfdir@\n \n-mandir=@mandir@\n+mandir = @mandir@\n \n srcdir = @srcdir@\n VPATH = @srcdir@\ndiff --git a/t/Makefile b/t/Makefile\nindex 88e289f..3025418 100644\n--- a/t/Makefile\n+++ b/t/Makefile\n@@ -6,7 +6,7 @@\n -include ../config.mak.autogen\n -include ../config.mak\n \n-#GIT_TEST_OPTS=--verbose --debug\n+#GIT_TEST_OPTS = --verbose --debug\n SHELL_PATH ?= $(SHELL)\n PERL_PATH ?= /usr/bin/perl\n TAR ?= $(TAR)\n-- \n1.8.0.1.347.gf94c325\n"},{"id":"204649","messageId":"7vmwxlc180.fsf@alter.siamese.dyndns.org","threadId":"32303","inReplyTo":"0544836357d56c05188941ef5a471605fa6d4881.1355049367.git.stefano.lattarini@gmail.com","subject":"Re: [PATCH] Makefile: whitespace style fixes in macro definitions","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-12-10T16:37:35Z","receivedAt":"2012-12-10T16:37:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefano Lattarini <stefano.lattarini@gmail.com> writes:\n\n> Consistently use a single space before and after the \"=\" (or \":=\", \"+=\",\n> etc.) in assignments to make macros.  Granted, this was not a big deal,\n> but I did find the needless inconsistency quite distracting.\n>\n> Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>\n> ---\n\nMakes sense to do this kind of clean-up when these files are\nquiescent (and they are).\n\nThanks.\n\n>  Makefile      | 56 ++++++++++++++++++++++++++++----------------------------\n>  config.mak.in |  2 +-\n>  t/Makefile    |  2 +-\n>  3 files changed, 30 insertions(+), 30 deletions(-)\n>\n> diff --git a/Makefile b/Makefile\n> index 4ad6fbd..736ecd4 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -374,7 +374,7 @@ htmldir = share/doc/git-doc\n>  ETC_GITCONFIG = $(sysconfdir)/gitconfig\n>  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes\n>  lib = lib\n> -# DESTDIR=\n> +# DESTDIR =\n>  pathsep = :\n>  \n>  export prefix bindir sharedir sysconfdir gitwebdir localedir\n> @@ -575,9 +575,9 @@ endif\n>  export PERL_PATH\n>  export PYTHON_PATH\n>  \n> -LIB_FILE=libgit.a\n> -XDIFF_LIB=xdiff/lib.a\n> -VCSSVN_LIB=vcs-svn/lib.a\n> +LIB_FILE = libgit.a\n> +XDIFF_LIB = xdiff/lib.a\n> +VCSSVN_LIB = vcs-svn/lib.a\n>  \n>  LIB_H += xdiff/xinclude.h\n>  LIB_H += xdiff/xmacros.h\n> @@ -1139,7 +1139,7 @@ ifeq ($(uname_S),NetBSD)\n>  endif\n>  ifeq ($(uname_S),AIX)\n>  \tDEFAULT_PAGER = more\n> -\tNO_STRCASESTR=YesPlease\n> +\tNO_STRCASESTR = YesPlease\n>  \tNO_MEMMEM = YesPlease\n>  \tNO_MKDTEMP = YesPlease\n>  \tNO_MKSTEMPS = YesPlease\n> @@ -1147,7 +1147,7 @@ ifeq ($(uname_S),AIX)\n>  \tNO_NSEC = YesPlease\n>  \tFREAD_READS_DIRECTORIES = UnfortunatelyYes\n>  \tINTERNAL_QSORT = UnfortunatelyYes\n> -\tNEEDS_LIBICONV=YesPlease\n> +\tNEEDS_LIBICONV = YesPlease\n>  \tBASIC_CFLAGS += -D_LARGE_FILES\n>  \tifeq ($(shell expr \"$(uname_V)\" : '[1234]'),1)\n>  \t\tNO_PTHREADS = YesPlease\n> @@ -1155,13 +1155,13 @@ ifeq ($(uname_S),AIX)\n>  \t\tPTHREAD_LIBS = -lpthread\n>  \tendif\n>  \tifeq ($(shell expr \"$(uname_V).$(uname_R)\" : '5\\.1'),3)\n> -\t\tINLINE=''\n> +\t\tINLINE = ''\n>  \tendif\n>  \tGIT_TEST_CMP = cmp\n>  endif\n>  ifeq ($(uname_S),GNU)\n>  \t# GNU/Hurd\n> -\tNO_STRLCPY=YesPlease\n> +\tNO_STRLCPY = YesPlease\n>  \tNO_MKSTEMPS = YesPlease\n>  \tHAVE_PATHS_H = YesPlease\n>  \tLIBC_CONTAINS_LIBINTL = YesPlease\n> @@ -1187,9 +1187,9 @@ ifeq ($(uname_S),IRIX)\n>  \tNEEDS_LIBGEN = YesPlease\n>  endif\n>  ifeq ($(uname_S),IRIX64)\n> -\tNO_SETENV=YesPlease\n> +\tNO_SETENV = YesPlease\n>  \tNO_UNSETENV = YesPlease\n> -\tNO_STRCASESTR=YesPlease\n> +\tNO_STRCASESTR = YesPlease\n>  \tNO_MEMMEM = YesPlease\n>  \tNO_MKSTEMPS = YesPlease\n>  \tNO_MKDTEMP = YesPlease\n> @@ -1203,14 +1203,14 @@ ifeq ($(uname_S),IRIX64)\n>  \tNO_REGEX = YesPlease\n>  \tNO_FNMATCH_CASEFOLD = YesPlease\n>  \tSNPRINTF_RETURNS_BOGUS = YesPlease\n> -\tSHELL_PATH=/usr/gnu/bin/bash\n> +\tSHELL_PATH = /usr/gnu/bin/bash\n>  \tNEEDS_LIBGEN = YesPlease\n>  endif\n>  ifeq ($(uname_S),HP-UX)\n>  \tINLINE = __inline\n> -\tNO_IPV6=YesPlease\n> -\tNO_SETENV=YesPlease\n> -\tNO_STRCASESTR=YesPlease\n> +\tNO_IPV6 = YesPlease\n> +\tNO_SETENV = YesPlease\n> +\tNO_STRCASESTR = YesPlease\n>  \tNO_MEMMEM = YesPlease\n>  \tNO_MKSTEMPS = YesPlease\n>  \tNO_STRLCPY = YesPlease\n> @@ -1386,10 +1386,10 @@ ifeq ($(uname_S),NONSTOP_KERNEL)\n>  \tMKDIR_WO_TRAILING_SLASH = YesPlease\n>  \t# RFE 10-120912-4693 submitted to HP NonStop development.\n>  \tNO_SETITIMER = UnfortunatelyYes\n> -\tSANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin\n> -\tSHELL_PATH=/usr/local/bin/bash\n> +\tSANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin\n> +\tSHELL_PATH = /usr/local/bin/bash\n>  \t# as of H06.25/J06.14, we might better use this\n> -\t#SHELL_PATH=/usr/coreutils/bin/bash\n> +\t#SHELL_PATH = /usr/coreutils/bin/bash\n>  endif\n>  ifneq (,$(findstring MINGW,$(uname_S)))\n>  \tpathsep = ;\n> @@ -1437,7 +1437,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n>  \tX = .exe\n>  \tSPARSE_FLAGS = -Wno-one-bit-signed-bitfield\n>  ifneq (,$(wildcard ../THIS_IS_MSYSGIT))\n> -\thtmldir=doc/git/html/\n> +\thtmldir = doc/git/html/\n>  \tprefix =\n>  \tINSTALL = /bin/install\n>  \tEXTLIBS += /mingw/lib/libz.a\n> @@ -1559,7 +1559,7 @@ else\n>  \t\tCURL_LIBCURL = -lcurl\n>  \tendif\n>  \tifdef NEEDS_SSL_WITH_CURL\n> -\t\tCURL_LIBCURL +=\t-lssl\n> +\t\tCURL_LIBCURL += -lssl\n>  \t\tifdef NEEDS_CRYPTO_WITH_SSL\n>  \t\t\tCURL_LIBCURL += -lcrypto\n>  \t\tendif\n> @@ -1768,7 +1768,7 @@ ifdef OBJECT_CREATION_USES_RENAMES\n>  endif\n>  ifdef NO_STRUCT_ITIMERVAL\n>  \tCOMPAT_CFLAGS += -DNO_STRUCT_ITIMERVAL\n> -\tNO_SETITIMER=YesPlease\n> +\tNO_SETITIMER = YesPlease\n>  endif\n>  ifdef NO_SETITIMER\n>  \tCOMPAT_CFLAGS += -DNO_SETITIMER\n> @@ -1920,15 +1920,15 @@ ifneq (,$(XDL_FAST_HASH))\n>  endif\n>  \n>  ifeq ($(TCLTK_PATH),)\n> -NO_TCLTK=NoThanks\n> +NO_TCLTK = NoThanks\n>  endif\n>  \n>  ifeq ($(PERL_PATH),)\n> -NO_PERL=NoThanks\n> +NO_PERL = NoThanks\n>  endif\n>  \n>  ifeq ($(PYTHON_PATH),)\n> -NO_PYTHON=NoThanks\n> +NO_PYTHON = NoThanks\n>  endif\n>  \n>  QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir\n> @@ -1975,13 +1975,13 @@ PROFILE_DIR := $(CURDIR)\n>  ifeq (\"$(PROFILE)\",\"GEN\")\n>  \tCFLAGS += -fprofile-generate=$(PROFILE_DIR) -DNO_NORETURN=1\n>  \tEXTLIBS += -lgcov\n> -\texport CCACHE_DISABLE=t\n> -\tV=1\n> +\texport CCACHE_DISABLE = t\n> +\tV = 1\n>  else\n>  ifneq (\"$(PROFILE)\",\"\")\n>  \tCFLAGS += -fprofile-use=$(PROFILE_DIR) -fprofile-correction -DNO_NORETURN=1\n> -\texport CCACHE_DISABLE=t\n> -\tV=1\n> +\texport CCACHE_DISABLE = t\n> +\tV = 1\n>  endif\n>  endif\n>  \n> @@ -2830,7 +2830,7 @@ git.spec: git.spec.in GIT-VERSION-FILE\n>  \tsed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+\n>  \tmv $@+ $@\n>  \n> -GIT_TARNAME=git-$(GIT_VERSION)\n> +GIT_TARNAME = git-$(GIT_VERSION)\n>  dist: git.spec git-archive$(X) configure\n>  \t./git-archive --format=tar \\\n>  \t\t--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar\n> diff --git a/config.mak.in b/config.mak.in\n> index 69d4838..e8a9bb4 100644\n> --- a/config.mak.in\n> +++ b/config.mak.in\n> @@ -18,7 +18,7 @@ datarootdir = @datarootdir@\n>  template_dir = @datadir@/git-core/templates\n>  sysconfdir = @sysconfdir@\n>  \n> -mandir=@mandir@\n> +mandir = @mandir@\n>  \n>  srcdir = @srcdir@\n>  VPATH = @srcdir@\n> diff --git a/t/Makefile b/t/Makefile\n> index 88e289f..3025418 100644\n> --- a/t/Makefile\n> +++ b/t/Makefile\n> @@ -6,7 +6,7 @@\n>  -include ../config.mak.autogen\n>  -include ../config.mak\n>  \n> -#GIT_TEST_OPTS=--verbose --debug\n> +#GIT_TEST_OPTS = --verbose --debug\n>  SHELL_PATH ?= $(SHELL)\n>  PERL_PATH ?= /usr/bin/perl\n>  TAR ?= $(TAR)\n"}]}