From cb14cc1a4cbaf83f0ef21f04821763f91814aaa6 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 24 Oct 2016 14:52:47 +0000
Subject:  Revert wrong shared lib fix

---
 package/deps.mak  | 2 +-
 tools/gen-deps.sh | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/deps.mak b/package/deps.mak
index 79620f7..4218772 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -63,7 +63,7 @@ s6-tcpserver6-socketbinder: src/conn-tools/s6-tcpserver6-socketbinder.o -lskarne
 s6-tcpserver6d: EXTRA_LIBS := ${SOCKET_LIB}
 s6-tcpserver6d: src/conn-tools/s6-tcpserver6d.o -lskarnet
 libs6net.a.xyzzy: src/libs6net/s6net_ident_client.o src/libs6net/s6net_ident_reply_get.o src/libs6net/s6net_ident_reply_parse.o src/libs6net/s6net_ident_error.o
-libs6net.so.xyzzy: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} ${SOCKET_LIB} ${SYSCLOCK_LIB} ${TAINNOW_LIB} ${TIMER_LIB} ${UTIL_LIB}
+libs6net.so.xyzzy: EXTRA_LIBS := -lskarnet
 libs6net.so.xyzzy: src/libs6net/s6net_ident_client.lo src/libs6net/s6net_ident_reply_get.lo src/libs6net/s6net_ident_reply_parse.lo src/libs6net/s6net_ident_error.lo
 minidentd: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
 minidentd: src/minidentd/minidentd.o src/minidentd/mgetuid.o -lskarnet
diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index 2810ccc..5c96dd1 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -60,9 +60,6 @@ for dir in $(ls -1 src | grep -v ^include) ; do
     libs=
     while read dep ; do
       if echo $dep | grep -q -e ^-l -e '^\${.*_LIB}' ; then
-        if test $dep = '-lskarnet' ; then
-          dep='-lskarnet ${SPAWN_LIB} ${SOCKET_LIB} ${SYSCLOCK_LIB} ${TAINNOW_LIB} ${TIMER_LIB} ${UTIL_LIB}'
-        fi
         libs="$libs $dep"
       else
         deps="$deps src/$dir/$dep"
-- 
cgit v1.2.3