summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2019-02-22 14:41:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-24 15:32:39 (GMT)
commit65260a4f23761eceb37917e8bfc4aca36cc890ca (patch)
tree3c614531533065898992c7c0ff40214407406d75
parent9559f8ffb57ddf9ab3ec64b52aea1d9a645efba7 (diff)
downloadgit-65260a4f23761eceb37917e8bfc4aca36cc890ca.zip
git-65260a4f23761eceb37917e8bfc4aca36cc890ca.tar.gz
git-65260a4f23761eceb37917e8bfc4aca36cc890ca.tar.bz2
Makefile: add/remove comments at top and tweak whitespace
The top of the Makfile is mostly separated into logical steps like set default configuration, set programs etc., but there's some deviation from that. Let's add mostly comments where they're missing, remove those that don't add anything. The whitespace tweaking makes subsequent patches smaller. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index c53727e..0870fd4 100644
--- a/Makefile
+++ b/Makefile
@@ -507,15 +507,14 @@ GIT-VERSION-FILE: FORCE
-include GIT-VERSION-FILE
# CFLAGS and LDFLAGS are for the users to override from the command line.
-
CFLAGS = -g -O2 -Wall
LDFLAGS =
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
-
-# Create as necessary, replace existing, make ranlib unneeded.
ARFLAGS = rcs
+# Set our default configuration.
+#
# Among the variables below, these:
# gitexecdir
# template_dir
@@ -560,6 +559,7 @@ perllibdir_relative = $(patsubst $(prefix)/%,%,$(perllibdir))
export prefix bindir sharedir sysconfdir gitwebdir perllibdir localedir
+# Set our default programs
CC = cc
AR = ar
RM = rm -f
@@ -587,10 +587,6 @@ SP_EXTRA_FLAGS =
SPATCH_FLAGS = --all-includes --patch .
-
-
-### --- END CONFIGURATION SECTION ---
-
BASIC_CFLAGS = -I.
BASIC_LDFLAGS =