[master] 888b2ea3f flint scripts to handle one- or two-level structure

[Nils Goroll]

commit 888b2ea3f49ef1bfd64c156fd4b527e9c345ff00
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Jan 7 15:07:54 2021 +0100

    flint scripts to handle one- or two-level structure

diff --git a/bin/varnishadm/flint.sh b/bin/varnishadm/flint.sh
index 631bb1394..e214869e8 100755
--- a/bin/varnishadm/flint.sh
+++ b/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
diff --git a/bin/varnishd/flint.sh b/bin/varnishd/flint.sh
index 2442255bc..4228abdc7 100755
--- a/bin/varnishd/flint.sh
+++ b/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
diff --git a/bin/varnishhist/flint.sh b/bin/varnishhist/flint.sh
index 631bb1394..e214869e8 100755
--- a/bin/varnishhist/flint.sh
+++ b/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
diff --git a/bin/varnishlog/flint.sh b/bin/varnishlog/flint.sh
index 74b7d70e8..6a5decb69 100755
--- a/bin/varnishlog/flint.sh
+++ b/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
diff --git a/bin/varnishncsa/flint.sh b/bin/varnishncsa/flint.sh
index 631bb1394..e214869e8 100755
--- a/bin/varnishncsa/flint.sh
+++ b/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
diff --git a/bin/varnishstat/flint.sh b/bin/varnishstat/flint.sh
index 67dd342d4..4663fc1de 100755
--- a/bin/varnishstat/flint.sh
+++ b/bin/varnishstat/flint.sh
@@ -7,6 +7,4 @@ FLOPS='
 
 	../../lib/libvarnishapi/flint.lnt
 	../../lib/libvarnishapi/*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh
diff --git a/bin/varnishtest/flint.sh b/bin/varnishtest/flint.sh
index 2512c7e04..0caf8a248 100755
--- a/bin/varnishtest/flint.sh
+++ b/bin/varnishtest/flint.sh
@@ -6,7 +6,4 @@ FLOPS='
 	-DTOP_BUILDDIR="foo"
 	-I../../lib/libvgz
 	*.c
-'
-
-. ../../tools/flint_skel.sh
-
+' ../../tools/flint_skel.sh
diff --git a/bin/varnishtop/flint.sh b/bin/varnishtop/flint.sh
index 631bb1394..e214869e8 100755
--- a/bin/varnishtop/flint.sh
+++ b/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
diff --git a/lib/libvarnish/flint.sh b/lib/libvarnish/flint.sh
index 0964d4c89..80600044a 100755
--- a/lib/libvarnish/flint.sh
+++ b/lib/libvarnish/flint.sh
@@ -2,6 +2,4 @@
 
 FLOPS='
 	*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh
diff --git a/lib/libvarnishapi/flint.sh b/lib/libvarnishapi/flint.sh
index 0964d4c89..80600044a 100755
--- a/lib/libvarnishapi/flint.sh
+++ b/lib/libvarnishapi/flint.sh
@@ -2,6 +2,4 @@
 
 FLOPS='
 	*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh
diff --git a/lib/libvcc/flint.sh b/lib/libvcc/flint.sh
index 0964d4c89..80600044a 100755
--- a/lib/libvcc/flint.sh
+++ b/lib/libvcc/flint.sh
@@ -2,6 +2,4 @@
 
 FLOPS='
 	*.c
-'
-
-. ../../tools/flint_skel.sh
+' ../../tools/flint_skel.sh
diff --git a/tools/flint_skel.sh b/tools/flint_skel.sh
old mode 100644
new mode 100755
index 561a7d05e..decb073ce
--- a/tools/flint_skel.sh
+++ b/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