diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2016-10-24 14:52:53 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2016-10-24 14:52:53 +0000 |
| commit | ac965cabbe882c0211a25423d9387588c3550c89 (patch) | |
| tree | 71a19f5b441fac06449356dd4021fff4a81a9a1f | |
| parent | d6c327bf2a244f8954bf2fd94636890dbe868ed6 (diff) | |
| download | execline-ac965cabbe882c0211a25423d9387588c3550c89.tar.xz | |
Revert wrong shared lib fix
| -rw-r--r-- | package/deps.mak | 2 | ||||
| -rwxr-xr-x | tools/gen-deps.sh | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/package/deps.mak b/package/deps.mak index 08c4cee..c29928b 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -165,5 +165,5 @@ wait: src/execline/wait.o ${LIBEXECLINE} -lskarnet withstdinas: EXTRA_LIBS := withstdinas: src/execline/withstdinas.o -lskarnet libexecline.a.xyzzy: src/libexecline/el_execsequence.o src/libexecline/el_getstrict.o src/libexecline/el_parse.o src/libexecline/el_parse_from_buffer.o src/libexecline/el_parse_from_string.o src/libexecline/el_popenv.o src/libexecline/el_pushenv.o src/libexecline/el_semicolon.o src/libexecline/el_spawn0.o src/libexecline/el_spawn1.o src/libexecline/el_substandrun.o src/libexecline/el_substandrun_str.o src/libexecline/el_substitute.o src/libexecline/el_transform.o src/libexecline/el_vardupl.o src/libexecline/exlsn_define.o src/libexecline/exlsn_elglob.o src/libexecline/exlsn_import.o src/libexecline/exlsn_multidefine.o src/libexecline/exlsn_exlp.o src/libexecline/exlsn_main.o src/libexecline/exlsn_free.o src/libexecline/exlp.o -libexecline.so.xyzzy: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} ${SOCKET_LIB} ${SYSCLOCK_LIB} ${TAINNOW_LIB} ${TIMER_LIB} ${UTIL_LIB} +libexecline.so.xyzzy: EXTRA_LIBS := -lskarnet libexecline.so.xyzzy: src/libexecline/el_execsequence.lo src/libexecline/el_getstrict.lo src/libexecline/el_parse.lo src/libexecline/el_parse_from_buffer.lo src/libexecline/el_parse_from_string.lo src/libexecline/el_popenv.lo src/libexecline/el_pushenv.lo src/libexecline/el_semicolon.lo src/libexecline/el_spawn0.lo src/libexecline/el_spawn1.lo src/libexecline/el_substandrun.lo src/libexecline/el_substandrun_str.lo src/libexecline/el_substitute.lo src/libexecline/el_transform.lo src/libexecline/el_vardupl.lo src/libexecline/exlsn_define.lo src/libexecline/exlsn_elglob.lo src/libexecline/exlsn_import.lo src/libexecline/exlsn_multidefine.lo src/libexecline/exlsn_exlp.lo src/libexecline/exlsn_main.lo src/libexecline/exlsn_free.lo src/libexecline/exlp.lo 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" |