Build fixes

Signed-off-by: Laurent Bercot <ska@appnovation.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index 8d3c6cd..9e18eb1 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -59,26 +59,25 @@ echo
 for dir in $(ls -1 src | grep -v ^include) ; do
   for file in $(ls -1 src/$dir/deps-lib) ; do
     deps=
-    both=
     libs=
     while read dep ; do
-      if echo $dep | grep -qx '\${.*_LIB}' ; then
+      if echo $dep | grep -q -e '^-l' -e '^\${.*_LIB}' ; then
         libs="$libs $dep"
-      elif echo $dep | grep -q -e '^-l' -e '^\${LIB' ; then
-        both="$both $dep"
+      elif echo $dep | grep -q '^\${LIB' ; then
+        deps="$deps $dep"
       else
         deps="$deps src/$dir/$dep"
       fi
     done < src/$dir/deps-lib/$file
     echo 'ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)'
-    echo "lib${file}.a.xyzzy:${deps}${both}"
+    echo "lib${file}.a.xyzzy:${deps}"
     echo else
-    echo "lib${file}.a.xyzzy:$(echo "${deps}" | sed 's/\.o/.lo/g')${both}"
+    echo "lib${file}.a.xyzzy:$(echo ${deps} | sed 's/\.o/.lo/g')"
     echo endif
-    if grep -E "^LIB_DEFS [+:]=" package/targets.mak | grep -qF "$file" ; then
-      echo "lib${file}.pc: EXTRA_LIBS :=${both}${libs}"
+    if grep -qE "^LIB_DEFS [+:]= .*=$file" package/targets.mak ; then
+      echo "lib${file}.pc: EXTRA_LIBS :=${libs}"
       echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs"
-      echo "lib${file}.so.xyzzy:$(echo "${deps}${both}" | sed 's/\.o/.lo/g')"
+      echo "lib${file}.so.xyzzy:$(echo ${deps} | sed 's/\.o/.lo/g')"
     else
       internal_libs="$internal_libs lib${file}.a.xyzzy"
     fi