From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH] Makefile: whitespace style fixes in macro definitions Date: Mon, 10 Dec 2012 08:37:35 -0800 Message-ID: <7vmwxlc180.fsf@alter.siamese.dyndns.org> References: <0544836357d56c05188941ef5a471605fa6d4881.1355049367.git.stefano.lattarini@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Stefano Lattarini X-From: git-owner@vger.kernel.org Mon Dec 10 17:38:00 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ti6Me-00050F-Ez for gcvg-git-2@plane.gmane.org; Mon, 10 Dec 2012 17:37:56 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751549Ab2LJQhj (ORCPT ); Mon, 10 Dec 2012 11:37:39 -0500 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:47163 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751337Ab2LJQhi (ORCPT ); Mon, 10 Dec 2012 11:37:38 -0500 Received: from smtp.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id 3A6F48CD1; Mon, 10 Dec 2012 11:37:38 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=u28GY+aFJbjrSdUXRWRE3TmnM/Q=; b=HLV8Kt nlMlKY9YjuV19czn5/FrIP+WaGAax1gSLsINkDitXxb06G4Vp6d+0qZFT/ZCSkSo Cf1j2AIPwScyuc2apfqekBpiHqHz7vMH4TpcPQNDeBK/wUlEpg5VvDe9Rtmjpsw4 /Q3QRwqOQtv4syGjTqFj1fYHbPX9WxjRTXAwA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=Mlo6MTUEqlfuFit2LqbG1Nt2V6mK7H+1 hy/+YYA0ZujZq66AVdxGnBL4EwKIeOMobtGP3CalCeeV6TTvy7qT0IBRX4ZXVA38 +NezKAOIU+ZaVNsR7ELQDhOrVPSuwFqarISI6+7icYnyh+KEzUiIgChe3Bi1v/Pq nDntMBEV9l4= Received: from b-pb-sasl-quonix.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id 264718CD0; Mon, 10 Dec 2012 11:37:38 -0500 (EST) Received: from pobox.com (unknown [98.234.214.94]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by b-sasl-quonix.pobox.com (Postfix) with ESMTPSA id 3FC698CCD; Mon, 10 Dec 2012 11:37:37 -0500 (EST) In-Reply-To: <0544836357d56c05188941ef5a471605fa6d4881.1355049367.git.stefano.lattarini@gmail.com> (Stefano Lattarini's message of "Sun, 9 Dec 2012 11:36:17 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Pobox-Relay-ID: E80EA42E-42E7-11E2-8848-995F2E706CDE-77302942!b-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Stefano Lattarini writes: > 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 > --- Makes sense to do this kind of clean-up when these files are quiescent (and they are). Thanks. > Makefile | 56 ++++++++++++++++++++++++++++---------------------------- > config.mak.in | 2 +- > t/Makefile | 2 +- > 3 files changed, 30 insertions(+), 30 deletions(-) > > diff --git a/Makefile b/Makefile > index 4ad6fbd..736ecd4 100644 > --- a/Makefile > +++ b/Makefile > @@ -374,7 +374,7 @@ htmldir = share/doc/git-doc > ETC_GITCONFIG = $(sysconfdir)/gitconfig > ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes > lib = lib > -# DESTDIR= > +# DESTDIR = > pathsep = : > > export prefix bindir sharedir sysconfdir gitwebdir localedir > @@ -575,9 +575,9 @@ endif > export PERL_PATH > export PYTHON_PATH > > -LIB_FILE=libgit.a > -XDIFF_LIB=xdiff/lib.a > -VCSSVN_LIB=vcs-svn/lib.a > +LIB_FILE = libgit.a > +XDIFF_LIB = xdiff/lib.a > +VCSSVN_LIB = vcs-svn/lib.a > > LIB_H += xdiff/xinclude.h > LIB_H += xdiff/xmacros.h > @@ -1139,7 +1139,7 @@ ifeq ($(uname_S),NetBSD) > endif > ifeq ($(uname_S),AIX) > DEFAULT_PAGER = more > - NO_STRCASESTR=YesPlease > + NO_STRCASESTR = YesPlease > NO_MEMMEM = YesPlease > NO_MKDTEMP = YesPlease > NO_MKSTEMPS = YesPlease > @@ -1147,7 +1147,7 @@ ifeq ($(uname_S),AIX) > NO_NSEC = YesPlease > FREAD_READS_DIRECTORIES = UnfortunatelyYes > INTERNAL_QSORT = UnfortunatelyYes > - NEEDS_LIBICONV=YesPlease > + NEEDS_LIBICONV = YesPlease > BASIC_CFLAGS += -D_LARGE_FILES > ifeq ($(shell expr "$(uname_V)" : '[1234]'),1) > NO_PTHREADS = YesPlease > @@ -1155,13 +1155,13 @@ ifeq ($(uname_S),AIX) > PTHREAD_LIBS = -lpthread > endif > ifeq ($(shell expr "$(uname_V).$(uname_R)" : '5\.1'),3) > - INLINE='' > + INLINE = '' > endif > GIT_TEST_CMP = cmp > endif > ifeq ($(uname_S),GNU) > # GNU/Hurd > - NO_STRLCPY=YesPlease > + NO_STRLCPY = YesPlease > NO_MKSTEMPS = YesPlease > HAVE_PATHS_H = YesPlease > LIBC_CONTAINS_LIBINTL = YesPlease > @@ -1187,9 +1187,9 @@ ifeq ($(uname_S),IRIX) > NEEDS_LIBGEN = YesPlease > endif > ifeq ($(uname_S),IRIX64) > - NO_SETENV=YesPlease > + NO_SETENV = YesPlease > NO_UNSETENV = YesPlease > - NO_STRCASESTR=YesPlease > + NO_STRCASESTR = YesPlease > NO_MEMMEM = YesPlease > NO_MKSTEMPS = YesPlease > NO_MKDTEMP = YesPlease > @@ -1203,14 +1203,14 @@ ifeq ($(uname_S),IRIX64) > NO_REGEX = YesPlease > NO_FNMATCH_CASEFOLD = YesPlease > SNPRINTF_RETURNS_BOGUS = YesPlease > - SHELL_PATH=/usr/gnu/bin/bash > + SHELL_PATH = /usr/gnu/bin/bash > NEEDS_LIBGEN = YesPlease > endif > ifeq ($(uname_S),HP-UX) > INLINE = __inline > - NO_IPV6=YesPlease > - NO_SETENV=YesPlease > - NO_STRCASESTR=YesPlease > + NO_IPV6 = YesPlease > + NO_SETENV = YesPlease > + NO_STRCASESTR = YesPlease > NO_MEMMEM = YesPlease > NO_MKSTEMPS = YesPlease > NO_STRLCPY = YesPlease > @@ -1386,10 +1386,10 @@ ifeq ($(uname_S),NONSTOP_KERNEL) > MKDIR_WO_TRAILING_SLASH = YesPlease > # RFE 10-120912-4693 submitted to HP NonStop development. > NO_SETITIMER = UnfortunatelyYes > - SANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin > - SHELL_PATH=/usr/local/bin/bash > + SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin > + SHELL_PATH = /usr/local/bin/bash > # as of H06.25/J06.14, we might better use this > - #SHELL_PATH=/usr/coreutils/bin/bash > + #SHELL_PATH = /usr/coreutils/bin/bash > endif > ifneq (,$(findstring MINGW,$(uname_S))) > pathsep = ; > @@ -1437,7 +1437,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) > X = .exe > SPARSE_FLAGS = -Wno-one-bit-signed-bitfield > ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) > - htmldir=doc/git/html/ > + htmldir = doc/git/html/ > prefix = > INSTALL = /bin/install > EXTLIBS += /mingw/lib/libz.a > @@ -1559,7 +1559,7 @@ else > CURL_LIBCURL = -lcurl > endif > ifdef NEEDS_SSL_WITH_CURL > - CURL_LIBCURL += -lssl > + CURL_LIBCURL += -lssl > ifdef NEEDS_CRYPTO_WITH_SSL > CURL_LIBCURL += -lcrypto > endif > @@ -1768,7 +1768,7 @@ ifdef OBJECT_CREATION_USES_RENAMES > endif > ifdef NO_STRUCT_ITIMERVAL > COMPAT_CFLAGS += -DNO_STRUCT_ITIMERVAL > - NO_SETITIMER=YesPlease > + NO_SETITIMER = YesPlease > endif > ifdef NO_SETITIMER > COMPAT_CFLAGS += -DNO_SETITIMER > @@ -1920,15 +1920,15 @@ ifneq (,$(XDL_FAST_HASH)) > endif > > ifeq ($(TCLTK_PATH),) > -NO_TCLTK=NoThanks > +NO_TCLTK = NoThanks > endif > > ifeq ($(PERL_PATH),) > -NO_PERL=NoThanks > +NO_PERL = NoThanks > endif > > ifeq ($(PYTHON_PATH),) > -NO_PYTHON=NoThanks > +NO_PYTHON = NoThanks > endif > > QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir > @@ -1975,13 +1975,13 @@ PROFILE_DIR := $(CURDIR) > ifeq ("$(PROFILE)","GEN") > CFLAGS += -fprofile-generate=$(PROFILE_DIR) -DNO_NORETURN=1 > EXTLIBS += -lgcov > - export CCACHE_DISABLE=t > - V=1 > + export CCACHE_DISABLE = t > + V = 1 > else > ifneq ("$(PROFILE)","") > CFLAGS += -fprofile-use=$(PROFILE_DIR) -fprofile-correction -DNO_NORETURN=1 > - export CCACHE_DISABLE=t > - V=1 > + export CCACHE_DISABLE = t > + V = 1 > endif > endif > > @@ -2830,7 +2830,7 @@ git.spec: git.spec.in GIT-VERSION-FILE > sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+ > mv $@+ $@ > > -GIT_TARNAME=git-$(GIT_VERSION) > +GIT_TARNAME = git-$(GIT_VERSION) > dist: git.spec git-archive$(X) configure > ./git-archive --format=tar \ > --prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar > diff --git a/config.mak.in b/config.mak.in > index 69d4838..e8a9bb4 100644 > --- a/config.mak.in > +++ b/config.mak.in > @@ -18,7 +18,7 @@ datarootdir = @datarootdir@ > template_dir = @datadir@/git-core/templates > sysconfdir = @sysconfdir@ > > -mandir=@mandir@ > +mandir = @mandir@ > > srcdir = @srcdir@ > VPATH = @srcdir@ > diff --git a/t/Makefile b/t/Makefile > index 88e289f..3025418 100644 > --- a/t/Makefile > +++ b/t/Makefile > @@ -6,7 +6,7 @@ > -include ../config.mak.autogen > -include ../config.mak > > -#GIT_TEST_OPTS=--verbose --debug > +#GIT_TEST_OPTS = --verbose --debug > SHELL_PATH ?= $(SHELL) > PERL_PATH ?= /usr/bin/perl > TAR ?= $(TAR)