Browse Source

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 <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Stefano Lattarini 12 years ago committed by Junio C Hamano
parent
commit
dd6fc7ca91
  1. 54
      Makefile
  2. 2
      config.mak.in
  3. 2
      t/Makefile

54
Makefile

@ -374,7 +374,7 @@ htmldir = share/doc/git-doc
ETC_GITCONFIG = $(sysconfdir)/gitconfig ETC_GITCONFIG = $(sysconfdir)/gitconfig
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
lib = lib lib = lib
# DESTDIR= # DESTDIR =
pathsep = : pathsep = :


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


LIB_FILE=libgit.a LIB_FILE = libgit.a
XDIFF_LIB=xdiff/lib.a XDIFF_LIB = xdiff/lib.a
VCSSVN_LIB=vcs-svn/lib.a VCSSVN_LIB = vcs-svn/lib.a


LIB_H += xdiff/xinclude.h LIB_H += xdiff/xinclude.h
LIB_H += xdiff/xmacros.h LIB_H += xdiff/xmacros.h
@ -1139,7 +1139,7 @@ ifeq ($(uname_S),NetBSD)
endif endif
ifeq ($(uname_S),AIX) ifeq ($(uname_S),AIX)
DEFAULT_PAGER = more DEFAULT_PAGER = more
NO_STRCASESTR=YesPlease NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease NO_MEMMEM = YesPlease
NO_MKDTEMP = YesPlease NO_MKDTEMP = YesPlease
NO_MKSTEMPS = YesPlease NO_MKSTEMPS = YesPlease
@ -1147,7 +1147,7 @@ ifeq ($(uname_S),AIX)
NO_NSEC = YesPlease NO_NSEC = YesPlease
FREAD_READS_DIRECTORIES = UnfortunatelyYes FREAD_READS_DIRECTORIES = UnfortunatelyYes
INTERNAL_QSORT = UnfortunatelyYes INTERNAL_QSORT = UnfortunatelyYes
NEEDS_LIBICONV=YesPlease NEEDS_LIBICONV = YesPlease
BASIC_CFLAGS += -D_LARGE_FILES BASIC_CFLAGS += -D_LARGE_FILES
ifeq ($(shell expr "$(uname_V)" : '[1234]'),1) ifeq ($(shell expr "$(uname_V)" : '[1234]'),1)
NO_PTHREADS = YesPlease NO_PTHREADS = YesPlease
@ -1155,13 +1155,13 @@ ifeq ($(uname_S),AIX)
PTHREAD_LIBS = -lpthread PTHREAD_LIBS = -lpthread
endif endif
ifeq ($(shell expr "$(uname_V).$(uname_R)" : '5\.1'),3) ifeq ($(shell expr "$(uname_V).$(uname_R)" : '5\.1'),3)
INLINE='' INLINE = ''
endif endif
GIT_TEST_CMP = cmp GIT_TEST_CMP = cmp
endif endif
ifeq ($(uname_S),GNU) ifeq ($(uname_S),GNU)
# GNU/Hurd # GNU/Hurd
NO_STRLCPY=YesPlease NO_STRLCPY = YesPlease
NO_MKSTEMPS = YesPlease NO_MKSTEMPS = YesPlease
HAVE_PATHS_H = YesPlease HAVE_PATHS_H = YesPlease
LIBC_CONTAINS_LIBINTL = YesPlease LIBC_CONTAINS_LIBINTL = YesPlease
@ -1187,9 +1187,9 @@ ifeq ($(uname_S),IRIX)
NEEDS_LIBGEN = YesPlease NEEDS_LIBGEN = YesPlease
endif endif
ifeq ($(uname_S),IRIX64) ifeq ($(uname_S),IRIX64)
NO_SETENV=YesPlease NO_SETENV = YesPlease
NO_UNSETENV = YesPlease NO_UNSETENV = YesPlease
NO_STRCASESTR=YesPlease NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease NO_MEMMEM = YesPlease
NO_MKSTEMPS = YesPlease NO_MKSTEMPS = YesPlease
NO_MKDTEMP = YesPlease NO_MKDTEMP = YesPlease
@ -1203,14 +1203,14 @@ ifeq ($(uname_S),IRIX64)
NO_REGEX = YesPlease NO_REGEX = YesPlease
NO_FNMATCH_CASEFOLD = YesPlease NO_FNMATCH_CASEFOLD = YesPlease
SNPRINTF_RETURNS_BOGUS = YesPlease SNPRINTF_RETURNS_BOGUS = YesPlease
SHELL_PATH=/usr/gnu/bin/bash SHELL_PATH = /usr/gnu/bin/bash
NEEDS_LIBGEN = YesPlease NEEDS_LIBGEN = YesPlease
endif endif
ifeq ($(uname_S),HP-UX) ifeq ($(uname_S),HP-UX)
INLINE = __inline INLINE = __inline
NO_IPV6=YesPlease NO_IPV6 = YesPlease
NO_SETENV=YesPlease NO_SETENV = YesPlease
NO_STRCASESTR=YesPlease NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease NO_MEMMEM = YesPlease
NO_MKSTEMPS = YesPlease NO_MKSTEMPS = YesPlease
NO_STRLCPY = YesPlease NO_STRLCPY = YesPlease
@ -1386,10 +1386,10 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
MKDIR_WO_TRAILING_SLASH = YesPlease MKDIR_WO_TRAILING_SLASH = YesPlease
# RFE 10-120912-4693 submitted to HP NonStop development. # RFE 10-120912-4693 submitted to HP NonStop development.
NO_SETITIMER = UnfortunatelyYes NO_SETITIMER = UnfortunatelyYes
SANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
SHELL_PATH=/usr/local/bin/bash SHELL_PATH = /usr/local/bin/bash
# as of H06.25/J06.14, we might better use this # as of H06.25/J06.14, we might better use this
#SHELL_PATH=/usr/coreutils/bin/bash #SHELL_PATH = /usr/coreutils/bin/bash
endif endif
ifneq (,$(findstring MINGW,$(uname_S))) ifneq (,$(findstring MINGW,$(uname_S)))
pathsep = ; pathsep = ;
@ -1437,7 +1437,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
X = .exe X = .exe
SPARSE_FLAGS = -Wno-one-bit-signed-bitfield SPARSE_FLAGS = -Wno-one-bit-signed-bitfield
ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
htmldir=doc/git/html/ htmldir = doc/git/html/
prefix = prefix =
INSTALL = /bin/install INSTALL = /bin/install
EXTLIBS += /mingw/lib/libz.a EXTLIBS += /mingw/lib/libz.a
@ -1768,7 +1768,7 @@ ifdef OBJECT_CREATION_USES_RENAMES
endif endif
ifdef NO_STRUCT_ITIMERVAL ifdef NO_STRUCT_ITIMERVAL
COMPAT_CFLAGS += -DNO_STRUCT_ITIMERVAL COMPAT_CFLAGS += -DNO_STRUCT_ITIMERVAL
NO_SETITIMER=YesPlease NO_SETITIMER = YesPlease
endif endif
ifdef NO_SETITIMER ifdef NO_SETITIMER
COMPAT_CFLAGS += -DNO_SETITIMER COMPAT_CFLAGS += -DNO_SETITIMER
@ -1920,15 +1920,15 @@ ifneq (,$(XDL_FAST_HASH))
endif endif


ifeq ($(TCLTK_PATH),) ifeq ($(TCLTK_PATH),)
NO_TCLTK=NoThanks NO_TCLTK = NoThanks
endif endif


ifeq ($(PERL_PATH),) ifeq ($(PERL_PATH),)
NO_PERL=NoThanks NO_PERL = NoThanks
endif endif


ifeq ($(PYTHON_PATH),) ifeq ($(PYTHON_PATH),)
NO_PYTHON=NoThanks NO_PYTHON = NoThanks
endif endif


QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
@ -1975,13 +1975,13 @@ PROFILE_DIR := $(CURDIR)
ifeq ("$(PROFILE)","GEN") ifeq ("$(PROFILE)","GEN")
CFLAGS += -fprofile-generate=$(PROFILE_DIR) -DNO_NORETURN=1 CFLAGS += -fprofile-generate=$(PROFILE_DIR) -DNO_NORETURN=1
EXTLIBS += -lgcov EXTLIBS += -lgcov
export CCACHE_DISABLE=t export CCACHE_DISABLE = t
V=1 V = 1
else else
ifneq ("$(PROFILE)","") ifneq ("$(PROFILE)","")
CFLAGS += -fprofile-use=$(PROFILE_DIR) -fprofile-correction -DNO_NORETURN=1 CFLAGS += -fprofile-use=$(PROFILE_DIR) -fprofile-correction -DNO_NORETURN=1
export CCACHE_DISABLE=t export CCACHE_DISABLE = t
V=1 V = 1
endif endif
endif endif


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


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

2
config.mak.in

@ -18,7 +18,7 @@ datarootdir = @datarootdir@
template_dir = @datadir@/git-core/templates template_dir = @datadir@/git-core/templates
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@


mandir=@mandir@ mandir = @mandir@


srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@

2
t/Makefile

@ -6,7 +6,7 @@
-include ../config.mak.autogen -include ../config.mak.autogen
-include ../config.mak -include ../config.mak


#GIT_TEST_OPTS=--verbose --debug #GIT_TEST_OPTS = --verbose --debug
SHELL_PATH ?= $(SHELL) SHELL_PATH ?= $(SHELL)
PERL_PATH ?= /usr/bin/perl PERL_PATH ?= /usr/bin/perl
TAR ?= $(TAR) TAR ?= $(TAR)

Loading…
Cancel
Save