[kvm-unit-tests,v5,02/18] Makefile: cscope: also look in arch shared asm
diff mbox

Message ID 1455734459-31902-3-git-send-email-drjones@redhat.com
State Superseded
Headers show

Commit Message

Andrew Jones Feb. 17, 2016, 6:40 p.m. UTC
Signed-off-by: Andrew Jones <drjones@redhat.com>

---
Not exactly related to the powerpc initial drop, but ppc64 will
need it too.
---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

David Gibson Feb. 18, 2016, 2:36 a.m. UTC | #1
On Wed, Feb 17, 2016 at 07:40:43PM +0100, Andrew Jones wrote:
> Signed-off-by: Andrew Jones <drjones@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

Looks sane as best as I can tell, though I don't know much about
cscope or the kvm-unit-tests makefiles.

> 
> ---
> Not exactly related to the powerpc initial drop, but ppc64 will
> need it too.
> ---
>  Makefile | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 0be2b6670daf6..fe5cc620d473b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -85,9 +85,11 @@ distclean: clean libfdt_clean
>  	$(RM) lib/asm config.mak $(TEST_DIR)-run test.log msr.out cscope.*
>  	$(RM) -r tests
>  
> -cscope: common_dirs = lib lib/libfdt lib/linux lib/asm lib/asm-generic
> +cscope: cscope_dirs = lib lib/libfdt lib/linux
> +cscope: cscope_dirs += lib/$(ARCH)/asm lib/$(TEST_DIR)/asm lib/asm-generic
> +cscope: cscope_dirs += $(TEST_DIR) lib/$(TEST_DIR) lib/$(ARCH)
>  cscope:
>  	$(RM) ./cscope.*
> -	find -L $(TEST_DIR) lib/$(TEST_DIR) lib/$(ARCH) $(common_dirs) -maxdepth 1 \
> +	find -L $(cscope_dirs) -maxdepth 1 \
>  		-name '*.[chsS]' -print | sed 's,^\./,,' | sort -u > ./cscope.files
>  	cscope -bk

Patch
diff mbox

diff --git a/Makefile b/Makefile
index 0be2b6670daf6..fe5cc620d473b 100644
--- a/Makefile
+++ b/Makefile
@@ -85,9 +85,11 @@  distclean: clean libfdt_clean
 	$(RM) lib/asm config.mak $(TEST_DIR)-run test.log msr.out cscope.*
 	$(RM) -r tests
 
-cscope: common_dirs = lib lib/libfdt lib/linux lib/asm lib/asm-generic
+cscope: cscope_dirs = lib lib/libfdt lib/linux
+cscope: cscope_dirs += lib/$(ARCH)/asm lib/$(TEST_DIR)/asm lib/asm-generic
+cscope: cscope_dirs += $(TEST_DIR) lib/$(TEST_DIR) lib/$(ARCH)
 cscope:
 	$(RM) ./cscope.*
-	find -L $(TEST_DIR) lib/$(TEST_DIR) lib/$(ARCH) $(common_dirs) -maxdepth 1 \
+	find -L $(cscope_dirs) -maxdepth 1 \
 		-name '*.[chsS]' -print | sed 's,^\./,,' | sort -u > ./cscope.files
 	cscope -bk