From 634f3f6f5da79e150e320a0d73434ceaa3c0b18b Mon Sep 17 00:00:00 2001
From: Kolan Sh <mecareful@gmail.com>
Date: Sat, 9 Jul 2011 00:46:36 +0400
Subject: [PATCH] =?UTF-8?q?fxd:=20=D0=BE=D0=B1=D1=80=D0=B0=D1=82=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=8F=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B0=20INCLUDE=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B4=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=B1?=
 =?UTF-8?q?=D1=8B=D0=BB=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D1=87=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B9=20=3D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bash/smake/smake.sh | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/bash/smake/smake.sh b/bash/smake/smake.sh
index 6243071..9613b11 100755
--- a/bash/smake/smake.sh
+++ b/bash/smake/smake.sh
@@ -135,10 +135,6 @@ while [ $nfiles != $nparsed ]; do
 	let nparsed++
 done
 
-for i in `seq 0 $((nfiles-1))`; do
-	echo ${flist[$i]}:${fdeplist[$i]}
-done
-
 # ======= Target rules =======
 echo 'target_objs = \' >> Makefile
 
@@ -167,7 +163,6 @@ for i in `seq 0 $((nfiles-1))`; do
 	[[ "$extension" != c &&	"$extension" != cpp
 	   && "$extension" != cxx && "$extension" != cc ]] && continue
 	echo -n `basename $f.o:` >> Makefile
-	#echo -ne "\t${fpath[$i]}" >> Makefile
 
 	dep_lst=${fdeplist[$i]}
 	_dep_lst=
@@ -193,24 +188,14 @@ for i in `seq 0 $((nfiles-1))`; do
 				echo ' \' >> Makefile
 				echo -ne "\t" >> Makefile
 				fname=${fpath[$j]}
-				k=`echo $REP_INCLUDE | sed 's~ ~\n~g' | wc -l`
-				REVERT_REP_INCLUDE=`echo "$REP_INCLUDE" | sed "s~ ~\n~g" | sort -ur`
-				echo "==================="
-				echo k=$k
-				echo "REVERT_REP_INCLUDE=$REVERT_REP_INCLUDE"
-				echo "==================="
-				for d in $REVERT_REP_INCLUDE ; do
-					echo "==================="
-					echo "fname=$_fname ; d=$d ; INCLUDE$k"
+				k=1
+				for d in $REP_INCLUDE ; do
 					_fname=`echo ${fpath[$j]} | sed "s~^$d~\$\(INCLUDE$k\)~" `
 					[ "$_fname" != "${fpath[$j]}" ] && fname=$_fname
-					echo "fname=$_fname ; d=$d ; INCLUDE$k"
-					echo "==================="
-					let k--
+					let k++
 				done
 
 				echo -n "$fname" >> Makefile
-				#echo -ne "\t${fpath[$j]}" >> Makefile
 				break
 			fi
 		done