From bb860115256409a89356406c424bd2aea04bb6db Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 21 Oct 2019 17:22:02 +0000
Subject:  Fix gen-deps.sh for cross-builds

---
 package/deps.mak  | 8 ++++----
 tools/gen-deps.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/deps.mak b/package/deps.mak
index 2e717e3..73d84da 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -5,7 +5,7 @@
 src/mdevd/mdevd-coldplug.o src/mdevd/mdevd-coldplug.lo: src/mdevd/mdevd-coldplug.c
 src/mdevd/mdevd.o src/mdevd/mdevd.lo: src/mdevd/mdevd.c
 
-mdevd: EXTRA_LIBS := ${MAYBEPTHREAD_LIB}
-mdevd: src/mdevd/mdevd.o ${LIBNSSS} -lskarnet
-mdevd-coldplug: EXTRA_LIBS :=
-mdevd-coldplug: src/mdevd/mdevd-coldplug.o -lskarnet
+mdevd: EXTRA_LIBS := -lskarnet ${MAYBEPTHREAD_LIB}
+mdevd: src/mdevd/mdevd.o ${LIBNSSS}
+mdevd-coldplug: EXTRA_LIBS := -lskarnet
+mdevd-coldplug: src/mdevd/mdevd-coldplug.o
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"
-- 
cgit v1.3.1