summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2016-12-04 13:44:23 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2016-12-04 13:44:23 +0000
commit5d38ea056c82221a0ddc206cd57dd7c1852a3159 (patch)
tree9494c8025aa9e0ffc3402eba9fd93b4843fe07a6 /tools
parent05f12f4e141e94b3aee7ec79eb6fb47ffd56a119 (diff)
downloads6-networking-5d38ea056c82221a0ddc206cd57dd7c1852a3159.tar.xz
Remove s6-tls* dependency to libs6net. Improve gen-deps to make dynlinking easier.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/gen-deps.sh4
1 files changed, 2 insertions, 2 deletions
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"