svn commit: smb-build r15 - in trunk: . lib script testprog

tridge at samba.org tridge at samba.org
Wed Jul 13 09:29:14 GMT 2005


Author: tridge
Date: 2005-07-13 09:29:14 +0000 (Wed, 13 Jul 2005)
New Revision: 15

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=smb-build&rev=15

Log:
replaced .cflags files with extra_cflags.txt





Added:
   trunk/extra_cflags.txt
Removed:
   trunk/lib/.cflags
   trunk/testprog/.cflags
Modified:
   trunk/script/cflags.sh


Changeset:
Added: trunk/extra_cflags.txt
===================================================================
--- trunk/extra_cflags.txt	2005-07-13 08:30:05 UTC (rev 14)
+++ trunk/extra_cflags.txt	2005-07-13 09:29:14 UTC (rev 15)
@@ -0,0 +1,2 @@
+lib/replace -Ifoobar -Ixxx
+testprog -DTESTPROG_FLAGS=1

Deleted: trunk/lib/.cflags
===================================================================
--- trunk/lib/.cflags	2005-07-13 08:30:05 UTC (rev 14)
+++ trunk/lib/.cflags	2005-07-13 09:29:14 UTC (rev 15)
@@ -1 +0,0 @@
--Ifoo

Modified: trunk/script/cflags.sh
===================================================================
--- trunk/script/cflags.sh	2005-07-13 08:30:05 UTC (rev 14)
+++ trunk/script/cflags.sh	2005-07-13 09:29:14 UTC (rev 15)
@@ -2,12 +2,23 @@
 
 TARGET=$1
 
-DIR=`dirname $TARGET`
-while [ "$DIR" != "." ]; do
-    if [ -r $DIR/.cflags ]; then
-	cat $DIR/.cflags
-	exit 0
-    fi
-    DIR=`dirname $DIR`
+check_flags()
+{
+    NAME=$1
+    (
+     while read tag flags; do
+	 if [ "$tag" = "$NAME" ]; then
+	     echo "$flags"
+	     exit 0;
+	 fi
+     done
+    ) < extra_cflags.txt
+}
+
+
+NAME=$TARGET
+while [ "$NAME" != "." ]; do
+    check_flags "$NAME"
+    NAME=`dirname $NAME`
 done
 exit 0;

Deleted: trunk/testprog/.cflags
===================================================================
--- trunk/testprog/.cflags	2005-07-13 08:30:05 UTC (rev 14)
+++ trunk/testprog/.cflags	2005-07-13 09:29:14 UTC (rev 15)
@@ -1 +0,0 @@
--DTESTPROG_FLAGS=1



More information about the samba-cvs mailing list