version: 2.3.0.0v2.3.0.0

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

3 files changed, 10 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 0fc3d40..0d34c7a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ CC = $(error Please use ./configure first)
 
 STATIC_LIBS :=
 SHARED_LIBS :=
-INTERNAL_LIBS :=
 LIB_DEFS :=
 BIN_SYMLINKS :=
 EXTRA_TEMP :=
diff --git a/package/deps.mak b/package/deps.mak
index d4e6bf6..8afd59b 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -134,3 +134,4 @@ s6-update-symlinks: EXTRA_LIBS := -lskarnet
 s6-update-symlinks: src/s6-portable-utils/s6-update-symlinks.o
 seekablepipe: EXTRA_LIBS := -lskarnet
 seekablepipe: src/s6-portable-utils/seekablepipe.o
+INTERNAL_LIBS :=
diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index 27e5b3e..befe021 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -7,6 +7,8 @@ echo '# This file has been generated by tools/gen-deps.sh'
 echo '#'
 echo
 
+internal_libs=
+
 for dir in src/include/${package} src/* ; do
   for file in $(ls -1 $dir | grep -- \\.h$) ; do
     {
@@ -70,8 +72,12 @@ for dir in $(ls -1 src | grep -v ^include) ; do
     echo else
     echo "lib${file}.a.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
     echo endif
-    echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs"
-    echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
+    if grep -E "^LIB_DEFS [+:]=" package/targets.mak | grep -qF "$file" ; then
+      echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs"
+      echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
+    else
+      internal_libs="$internal_libs lib${file}.a.xyzzy"
+    fi
   done
 
   for file in $(ls -1 src/$dir/deps-exe) ; do
@@ -91,3 +97,4 @@ for dir in $(ls -1 src | grep -v ^include) ; do
     echo "$file: src/$dir/$file.o$deps"
   done
 done
+echo "INTERNAL_LIBS :=$internal_libs"