From 5d38ea056c82221a0ddc206cd57dd7c1852a3159 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sun, 4 Dec 2016 13:44:23 +0000
Subject:  Remove s6-tls* dependency to libs6net. Improve gen-deps to make
 dynlinking easier.

---
 tools/gen-deps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools/gen-deps.sh')

diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index 5c96dd1..4eb487e 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -59,7 +59,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do
     deps=
     libs=
     while read dep ; do
-      if echo $dep | grep -q -e ^-l -e '^\${.*_LIB}' ; then
+      if echo $dep | grep -q -e ^-l -e '^\${LIB.*}$' -e '^\${.*_LIB}$' ; then
         libs="$libs $dep"
       else
         deps="$deps src/$dir/$dep"
@@ -77,7 +77,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do
       if echo $dep | grep -q -- \\.o$ ; then
         dep="src/$dir/$dep"
       fi
-      if echo $dep | grep -q -- '^\${.*_LIB}' ; then
+      if echo $dep | grep -q -- '^\${.*_LIB}$' ; then
         libs="$libs $dep"
       else
         deps="$deps $dep"
-- 
cgit v1.2.3