diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2019-10-21 17:22:42 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2019-10-21 17:22:42 +0000 |
| commit | 83e2c1743a3cf4ada2cd10a556ebadbe1bef0699 (patch) | |
| tree | a1a6f3282eb2212feeb0442b48ad1c1b5eaf4791 | |
| parent | fc6a213a41a3e9ad2e04577262cb0c39f189dd5c (diff) | |
| download | utmps-83e2c1743a3cf4ada2cd10a556ebadbe1bef0699.tar.xz | |
Fix gen-deps.sh for cross-builds
| -rw-r--r-- | package/deps.mak | 8 | ||||
| -rwxr-xr-x | tools/gen-deps.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package/deps.mak b/package/deps.mak index 0d57ffb..4093dd8 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -36,7 +36,7 @@ libutmps.a.xyzzy: src/utmps/endutxent.lo src/utmps/getutxent.lo src/utmps/getutx endif libutmps.so.xyzzy: EXTRA_LIBS := -lskarnet libutmps.so.xyzzy: src/utmps/endutxent.lo src/utmps/getutxent.lo src/utmps/getutxid.lo src/utmps/getutxline.lo src/utmps/logwtmp.lo src/utmps/pututxline.lo src/utmps/setutxent.lo src/utmps/updwtmpx.lo src/utmps/utmpxname.lo src/utmps/utmps_end.lo src/utmps/utmps_getent.lo src/utmps/utmps_getid.lo src/utmps/utmps_getline.lo src/utmps/utmps_here.lo src/utmps/utmps_here_maybe_init.lo src/utmps/utmps_putline.lo src/utmps/utmps_rewind.lo src/utmps/utmps_start.lo src/utmps/utmps_updwtmpx.lo src/utmps/utmps_utmpx_pack.lo src/utmps/utmps_utmpx_unpack.lo -utmps-utmpd: EXTRA_LIBS := ${MAYBEPTHREAD_LIB} -utmps-utmpd: src/utmps/utmps-utmpd.o libutmps.a.xyzzy ${LIBNSSS} -lskarnet -utmps-wtmpd: EXTRA_LIBS := ${MAYBEPTHREAD_LIB} -utmps-wtmpd: src/utmps/utmps-wtmpd.o libutmps.a.xyzzy ${LIBNSSS} -lskarnet +utmps-utmpd: EXTRA_LIBS := -lskarnet ${MAYBEPTHREAD_LIB} +utmps-utmpd: src/utmps/utmps-utmpd.o libutmps.a.xyzzy ${LIBNSSS} +utmps-wtmpd: EXTRA_LIBS := -lskarnet ${MAYBEPTHREAD_LIB} +utmps-wtmpd: src/utmps/utmps-wtmpd.o libutmps.a.xyzzy ${LIBNSSS} diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh index 6383ac2..27e5b3e 100755 --- a/tools/gen-deps.sh +++ b/tools/gen-deps.sh @@ -81,7 +81,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 -e ^-l -e '^\${.*_LIB}' ; then libs="$libs $dep" else deps="$deps $dep" |