summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/deps.mak20
-rwxr-xr-xtools/gen-deps.sh2
2 files changed, 11 insertions, 11 deletions
diff --git a/package/deps.mak b/package/deps.mak
index 7f7740c..1258cbd 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -165,13 +165,13 @@ libnsssd.a.xyzzy: src/nsssd/nsssd_main.lo src/nsssd/nsssd_convert.lo
endif
libnsssd.so.xyzzy: EXTRA_LIBS := -lskarnet
libnsssd.so.xyzzy: src/nsssd/nsssd_main.lo src/nsssd/nsssd_convert.lo
-nsssd-nslcd: EXTRA_LIBS :=
-nsssd-nslcd: src/nsssd/nsssd-nslcd.o ${LIBNSSSD} -lskarnet
-nsssd-unix: EXTRA_LIBS :=
-nsssd-unix: src/nsssd/nsssd-unix.o ${LIBNSSS} ${LIBNSSSD} -lskarnet
-test-all-fallback: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
-test-all-fallback: src/tests/test-all-fallback.o ${LIBNSSS} -lskarnet
-test-switch: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
-test-switch: src/tests/test-switch.o ${LIBNSSS} -lskarnet
-test-unix: EXTRA_LIBS :=
-test-unix: src/tests/test-unix.o ${LIBNSSS} -lskarnet
+nsssd-nslcd: EXTRA_LIBS := -lskarnet
+nsssd-nslcd: src/nsssd/nsssd-nslcd.o ${LIBNSSSD}
+nsssd-unix: EXTRA_LIBS := -lskarnet
+nsssd-unix: src/nsssd/nsssd-unix.o ${LIBNSSS} ${LIBNSSSD}
+test-all-fallback: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
+test-all-fallback: src/tests/test-all-fallback.o ${LIBNSSS}
+test-switch: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
+test-switch: src/tests/test-switch.o ${LIBNSSS}
+test-unix: EXTRA_LIBS := -lskarnet
+test-unix: src/tests/test-unix.o ${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"