From 294c6b9a696c1a0f24516fdab2d6e73c3cdae49f Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Mon, 8 Feb 2010 00:25:59 +0100
Subject: [PATCH] --- yaml --- r: 199518 b: refs/heads/master c:
 f81b1be40c44b33b9706d64c117edd29e627ad12 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/scripts/tags.sh | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index fc80bc757a00..beec9b40f8c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0679c730395d0bde9a46939e7ba255b4ba7dd7c
+refs/heads/master: f81b1be40c44b33b9706d64c117edd29e627ad12
diff --git a/trunk/scripts/tags.sh b/trunk/scripts/tags.sh
index 1a0c44d7c4a7..c1220419e59d 100755
--- a/trunk/scripts/tags.sh
+++ b/trunk/scripts/tags.sh
@@ -32,13 +32,20 @@ fi
 # find sources in arch/$ARCH
 find_arch_sources()
 {
-	find ${tree}arch/$1 $ignore -name "$2" -print;
+	for i in $archincludedir; do
+		prune="$prune -wholename $i -prune -o"
+	done
+	find ${tree}arch/$1 $ignore $prune -name "$2" -print;
 }
 
 # find sources in arch/$1/include
 find_arch_include_sources()
 {
-	find ${tree}arch/$1/include $ignore -name "$2" -print;
+	include=$(find ${tree}arch/$1/ -name include -type d);
+	if [ -n "$include" ]; then
+		archincludedir="$archincludedir $include"
+		find $include $ignore -name "$2" -print;
+	fi
 }
 
 # find sources in include/
@@ -63,14 +70,15 @@ find_sources()
 
 all_sources()
 {
-	for arch in $ALLSOURCE_ARCHS
-	do
-		find_sources $arch '*.[chS]'
-	done
+	find_arch_include_sources ${ARCH} '*.[chS]'
 	if [ ! -z "$archinclude" ]; then
 		find_arch_include_sources $archinclude '*.[chS]'
 	fi
 	find_include_sources '*.[chS]'
+	for arch in $ALLSOURCE_ARCHS
+	do
+		find_sources $arch '*.[chS]'
+	done
 	find_other_sources '*.[chS]'
 }