summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2015-04-01 11:38:01 +0100
committerdanh-arm <dan.handley@arm.com>2015-04-01 11:38:01 +0100
commit099b6051572674da78aac2e4bc55076fbcdbebc6 (patch)
tree46447c66c8bb0c50bb2d49895cb3e64b29ba7bd4
parent874cd37f0bd78e7fc9c6b452f9b5331e89d0284e (diff)
parent662109a54b9ecf5414dbda8700f4001c1b08d143 (diff)
Merge pull request #279 from sandrine-bailleux/sb/fix-checkpatch
Bug Fix: Fix checkpatch rule in Makefile
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9d93a944..aefcd2c6 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,9 @@ CHECK_IGNORE = --ignore COMPLEX_MACRO \
CHECKPATCH_ARGS = --no-tree --no-signoff ${CHECK_IGNORE}
CHECKCODE_ARGS = --no-patch --no-tree --no-signoff ${CHECK_IGNORE}
# Do not check the coding style on C library files
-CHECK_PATHS = $(shell ls -I include -I lib) $(shell ls -I stdlib include) $(shell ls -I stdlib lib)
+CHECK_PATHS = $(shell ls -I include -I lib) \
+ $(addprefix include/,$(shell ls -I stdlib include)) \
+ $(addprefix lib/,$(shell ls -I stdlib lib))
ifeq (${V},0)
Q=@
@@ -371,7 +373,7 @@ checkcodebase: locate-checkpatch
checkpatch: locate-checkpatch
@echo " CHECKING STYLE"
- @git log -p ${BASE_COMMIT}..HEAD -- ${CHECK_PATHS} | ${CHECKPATCH} ${CHECKPATCH_ARGS} - || true
+ ${Q}git log -p ${BASE_COMMIT}..HEAD -- ${CHECK_PATHS} | ${CHECKPATCH} ${CHECKPATCH_ARGS} - || true
.PHONY: ${CRTTOOL}
${CRTTOOL}: