Merge pull request #42 from sagar-apple/remove_tabs

Remove unnecessary tabs in Makefiles Merging based on 3 approvals, thanks!
project-chip · Mar 11, 2020 · a64b8ff · a64b8ff
2 parents 2af8930 + 5539f94
commit a64b8ff
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 31 deletions.
diff --git a/docs/style/STYLE_MAKEFILES.md b/docs/style/STYLE_MAKEFILES.md
@@ -0,0 +1,3 @@
+# CHIP Makefile Style Guide
+
+Use `tabs` only where strictly necessary. For example, Avoid using `tabs` to align line breaks.
diff --git a/src/lib/core/Makefile b/src/lib/core/Makefile
@@ -7,25 +7,25 @@ all: libcore.a run_tests
 
 include $(TOP_DIR)/.yams/cpp_rules.min
 
-Module_Includes = 	\
-	-I. 											\
-	-I$(TOP_DIR)/src		 						\
-	-I$(TOP_DIR)/src/include 						\
-	-I$(TOP_DIR)/src/lib/ 							\
-	-I$(TOP_DIR)/src/system 						\
-	-I$(TOP_DIR)/build/config/standalone/			\
-	-I$(TOP_DIR)/third_party/nlio/repo/include  	\
-	-I$(TOP_DIR)/third_party/nlassert/repo/include  \
+Module_Includes = \
+	-I. \
+	-I$(TOP_DIR)/src \
+	-I$(TOP_DIR)/src/include \
+	-I$(TOP_DIR)/src/lib/ \
+	-I$(TOP_DIR)/src/system \
+	-I$(TOP_DIR)/build/config/standalone/ \
+	-I$(TOP_DIR)/third_party/nlio/repo/include \
+	-I$(TOP_DIR)/third_party/nlassert/repo/include
 
 Module_Test_Includes = $(Module_Includes)
 
 CPP_Files = \
-	CHIPError.cpp			\
-	CHIPTLVWriter.cpp		\
-	CHIPTLVReader.cpp 		\
-	CHIPTLVUtilities.cpp	\
-	CHIPTLVUpdater.cpp		\
-	CHIPTLVDebug.cpp		\
+	CHIPError.cpp \
+	CHIPTLVWriter.cpp \
+	CHIPTLVReader.cpp \
+	CHIPTLVUtilities.cpp \
+	CHIPTLVUpdater.cpp \
+	CHIPTLVDebug.cpp
 
 libcore.a: $(CPP_Objects)
 	ar rvs $@ $^

diff --git a/src/lib/support/Makefile b/src/lib/support/Makefile
@@ -7,7 +7,7 @@ all: libsupport.a run_tests
 
 include $(TOP_DIR)/.yams/cpp_rules.min
 
-Module_Includes = 	\
+Module_Includes = \
 	-I. \
 	-I$(TOP_DIR)/src/include \
 	-I$(TOP_DIR)/src/lib \

diff --git a/src/system/Makefile b/src/system/Makefile
@@ -7,27 +7,27 @@ all: libSystemLayer.a run_tests
 
 include $(TOP_DIR)/.yams/cpp_rules.min
 
-Module_Includes = 	\
+Module_Includes = \
 				-I. \
-				-I$(TOP_DIR)/src									\
-				-I$(TOP_DIR)/src/include 							\
-				-I$(TOP_DIR)/src/lib/ 								\
-				-I$(TOP_DIR)/build/config/standalone/				\
-				-I$(TOP_DIR)/third_party/nlassert/repo/include/		\
-				-I$(TOP_DIR)/src/lib/core							\
+				-I$(TOP_DIR)/src \
+				-I$(TOP_DIR)/src/include \
+				-I$(TOP_DIR)/src/lib \
+				-I$(TOP_DIR)/build/config/standalone \
+				-I$(TOP_DIR)/third_party/nlassert/repo/include \
+				-I$(TOP_DIR)/src/lib/core \
 
 
 Module_Test_Includes = $(Module_Includes)
 
 CPP_Files = \
-	SystemMutex.cpp 			\
-	SystemError.cpp 			\
-	SystemClock.cpp 			\
-	SystemObject.cpp 			\
-	SystemStats.cpp 			\
-	SystemTimer.cpp 			\
-	SystemLayer.cpp				\
-	SystemFaultInjection.cpp 	\
+	SystemMutex.cpp \
+	SystemError.cpp \
+	SystemClock.cpp \
+	SystemObject.cpp \
+	SystemStats.cpp \
+	SystemTimer.cpp \
+	SystemLayer.cpp \
+	SystemFaultInjection.cpp \
 	SystemPacketBuffer.cpp
 
 libSystemLayer.a: $(CPP_Objects)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# CHIP Makefile Style Guide

		Use `tabs` only where strictly necessary. For example, Avoid using `tabs` to align line breaks.