diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2016-10-24 13:26:11 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2016-10-24 13:26:11 +0000 |
| commit | a336f7b941a555b457c83756e4e4a3161c352e1e (patch) | |
| tree | 74c58a267a87205ab0d119c282eaa394c3aadd28 | |
| parent | 00ebd113f4dd68a723fe57c495cfa15168461a52 (diff) | |
| download | s6-networking-a336f7b941a555b457c83756e4e4a3161c352e1e.tar.xz | |
Fix stupid shared lib dependencies
| -rw-r--r-- | package/deps.mak | 13 | ||||
| -rwxr-xr-x | tools/gen-deps.sh | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/package/deps.mak b/package/deps.mak index 55d20da..79620f7 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -26,6 +26,9 @@ src/libs6net/s6net_ident_reply_parse.o src/libs6net/s6net_ident_reply_parse.lo: src/minidentd/mgetuid-default.o src/minidentd/mgetuid-default.lo: src/minidentd/mgetuid-default.c src/minidentd/mgetuid.h src/minidentd/mgetuid-linux.o src/minidentd/mgetuid-linux.lo: src/minidentd/mgetuid-linux.c src/minidentd/mgetuid.h src/minidentd/minidentd.o src/minidentd/minidentd.lo: src/minidentd/minidentd.c src/minidentd/mgetuid.h +src/tls/s6-tlsc.o src/tls/s6-tlsc.lo: src/tls/s6-tlsc.c src/tls/s6net-tls-internal.h +src/tls/s6-tlsd.o src/tls/s6-tlsd.lo: src/tls/s6-tlsd.c src/tls/s6net-tls-internal.h +src/tls/s6net_tls_mainloop.o src/tls/s6net_tls_mainloop.lo: src/tls/s6net_tls_mainloop.c src/tls/s6net-tls-internal.h s6-clockadd: EXTRA_LIBS := ${SYSCLOCK_LIB} s6-clockadd: src/clock/s6-clockadd.o -lskarnet @@ -60,7 +63,15 @@ 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 +libs6net.so.xyzzy: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} ${SOCKET_LIB} ${SYSCLOCK_LIB} ${TAINNOW_LIB} ${TIMER_LIB} ${UTIL_LIB} 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 +s6-tlsc: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} +s6-tlsc: src/tls/s6-tlsc.o src/tls/s6net_tls_mainloop.o -lskarnet ${TLS_LIBS} +s6-tlsclient: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} +s6-tlsclient: src/tls/s6-tlsclient.o -lskarnet +s6-tlsd: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} +s6-tlsd: src/tls/s6-tlsd.o src/tls/s6net_tls_mainloop.o -lskarnet ${TLS_LIBS} +s6-tlsserver: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} +s6-tlsserver: src/tls/s6-tlsserver.o -lskarnet diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh index 5c96dd1..2810ccc 100755 --- a/tools/gen-deps.sh +++ b/tools/gen-deps.sh @@ -60,6 +60,9 @@ 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" |