flint scripts to handle one- or two-level structure

bin/varnishadm/flint.sh

@@ -4,6 +4,4 @@ FLOPS='
 	*.c
 	../../lib/libvarnishapi/flint.lnt
 	../../lib/libvarnishapi/*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh

bin/varnishd/flint.sh

@@ -21,6 +21,4 @@ FLOPS='
 	../../lib/libvcc/*.c
 	../../vmod/flint.lnt
 	../../vmod/*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh

bin/varnishhist/flint.sh

@@ -4,6 +4,4 @@ FLOPS='
 	*.c
 	../../lib/libvarnishapi/flint.lnt
 	../../lib/libvarnishapi/*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh

bin/varnishlog/flint.sh

@@ -5,7 +5,4 @@ FLOPS='
 	*.c
 	../../lib/libvarnishapi/flint.lnt
 	../../lib/libvarnishapi/*.c
-'
-
-. ../../tools/flint_skel.sh
-
+' ../../tools/flint_skel.sh

bin/varnishncsa/flint.sh

@@ -4,6 +4,4 @@ FLOPS='
 	*.c
 	../../lib/libvarnishapi/flint.lnt
 	../../lib/libvarnishapi/*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh

bin/varnishstat/flint.sh

@@ -7,6 +7,4 @@ FLOPS='
 
 	../../lib/libvarnishapi/flint.lnt
 	../../lib/libvarnishapi/*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh

bin/varnishtest/flint.sh

@@ -6,7 +6,4 @@ FLOPS='
 	-DTOP_BUILDDIR="foo"
 	-I../../lib/libvgz
 	*.c
-'
-
-. ../../tools/flint_skel.sh
-
+' ../../tools/flint_skel.sh

bin/varnishtop/flint.sh

@@ -4,6 +4,4 @@ FLOPS='
 	*.c
 	../../lib/libvarnishapi/flint.lnt
 	../../lib/libvarnishapi/*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh

lib/libvarnish/flint.sh

@@ -2,6 +2,4 @@
 
 FLOPS='
 	*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh

lib/libvarnishapi/flint.sh

@@ -2,6 +2,4 @@
 
 FLOPS='
 	*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh

lib/libvcc/flint.sh

@@ -2,6 +2,4 @@
 
 FLOPS='
 	*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh

tools/flint_skel.sh

@@ -6,15 +6,27 @@ if [ "x$1" = "x-ok" -a -f _.fl ] ; then
 	exit 0
 fi
 
+d=$(dirname $0)
+l=1
+if [ $d = ../../tools ] ; then
+    l=2
+fi
+
 flexelint \
 	-D__FLEXELINT__ \
-	../../flint.lnt \
+	$(if [ $l -eq 2 ] ; then echo ../../flint.lnt ; fi) \
 	../flint.lnt \
 	flint.lnt \
 	-zero \
 	-I. \
-	-I../../include \
-	-I../.. \
+	$(if [ $l -eq 2 ] ; then
+	      echo -I../../include
+	      echo -I../..
+	  else
+	      echo -I../include
+	      echo -I..
+	  fi
+	) \
 	-I/usr/local/include \
 	$FLOPS \
 	2>&1 | tee _.fl