Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary tabs in Makefiles #42

Merged
merged 4 commits into from
Mar 11, 2020
Merged

Remove unnecessary tabs in Makefiles #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9be5296
Remove unnecessary tabs in Makefiles
sagar-apple Mar 11, 2020
92221ee
Update style guide
sagar-apple Mar 11, 2020
a5e19ff
Move Makefile style guide to its own file
sagar-apple Mar 11, 2020
5539f94
Undo whitespace deletion
sagar-apple Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/style/STYLE_MAKEFILES.md
View file
Open in desktop
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.
30 changes: 15 additions & 15 deletions src/lib/core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@ $^
Expand Down
2 changes: 1 addition & 1 deletion src/lib/support/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
30 changes: 15 additions & 15 deletions src/system/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down