summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres G. Aragoneses <knocte@gmail.com>2013-01-21 21:23:46 +0000
committerAndres G. Aragoneses <knocte@gmail.com>2013-01-21 21:23:46 +0000
commit3e6d7a1750f1bec55ec1e81f25cce7b91eb2372e (patch)
treef66fdeba57fa96e1fe17b4e869ba385b0b990b39
parentf1e252203622f9320080e190cfa65b0ab20b7b00 (diff)
build: cosmetic tabs vs spaces correction
Makefiles are actually the only exception to the 4-spaces rule in the coding guidelines, so we mention this from now on in HACKING.
-rw-r--r--HACKING2
-rw-r--r--build/build.rules.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/HACKING b/HACKING
index 6338a90d5..69bab023f 100644
--- a/HACKING
+++ b/HACKING
@@ -80,7 +80,7 @@ guidelines. If code is in violation, you will be asked to reformat it.
Dictionary<K, V> not Dictionary<K,V>
- 9. Use 4 space characters for indentation, NOT tabs
+ 9. Use 4 space characters for indentation, NOT tabs (except in Makefiles)
10. Try to observe a 120 character wrap margin. If your lines are over 120
characters, break and indent them logically.
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 344b90fad..aa37864d7 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -8,8 +8,8 @@ INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldir
INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
if ENABLE_TESTS
- LINK += " $(NUNIT_LIBS)"
- ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
+ LINK += " $(NUNIT_LIBS)"
+ ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
endif
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))