From e866c02895d0cbdea41a266168385d774ddea25a Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 15 Feb 2023 13:54:18 +0000
Subject:  Prepare for 0.1.6.2; auto-update INTERNAL_LIBS

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 INSTALL             |  6 +++---
 NEWS                |  6 ++++++
 doc/index.html      |  8 ++++----
 doc/upgrade.html    | 11 +++++++++++
 package/deps.mak    |  3 +--
 package/info        |  2 +-
 package/targets.mak |  3 ---
 tools/gen-deps.sh   | 11 +++++++++--
 8 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/INSTALL b/INSTALL
index 8aae05f..892409d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,9 +6,9 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.13.0.0 or later: https://skarnet.org/software/skalibs/
-  - optional: nsss version 0.2.0.2 or later: https://skarnet.org/software/nsss/
-  - optional: execline version 2.9.1.0 or later: https://skarnet.org/software/execline/
+  - skalibs version 2.13.1.0 or later: https://skarnet.org/software/skalibs/
+  - optional: nsss version 0.2.0.3 or later: https://skarnet.org/software/nsss/
+  - optional: execline version 2.9.2.0 or later: https://skarnet.org/software/execline/
 
  This software is Linux-specific. It will run on a Linux kernel,
 version 2.6.10 or later.
diff --git a/NEWS b/NEWS
index d79fa92..a51ccb6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for mdevd.
 
+In 0.1.6.2
+----------
+
+ - Build system upgrade
+
+
 In 0.1.6.1
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 1d71959..698bd83 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -99,16 +99,16 @@ and does not pull in any unnecessary code. </li>
 The Linux kernel must be 2.6.10 or later. </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.13.0.0 or later. It's a build-time requirement. It's also a run-time
+2.13.1.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
  <li> Optionally: <a href="//skarnet.org/software/execline/">nsss</a>
-version 0.2.0.2 or later. It's a build-time and run-time requirement, if
+version 0.2.0.3 or later. It's a build-time and run-time requirement, if
 you use the <tt>--enable-nsss</tt> option to configure; but you would
 only do that if you're replacing nsswitch on your whole system, and most
 people are not. </li>
  <li> Optionally: <a href="//skarnet.org/software/execline/">execline</a>
-version 2.9.1.0 or later. It's a only a run-time requirement, and only
+version 2.9.2.0 or later. It's a only a run-time requirement, and only
 if your <tt>mdev.conf</tt> file contains <tt>+</tt>, <tt>-</tt> or
 <tt>&amp;</tt> command directives. </li>
 </ul>
@@ -124,7 +124,7 @@ if your <tt>mdev.conf</tt> file contains <tt>+</tt>, <tt>-</tt> or
 
 <ul>
  <li> The current released version of mdevd is
-<a href="mdevd-0.1.6.1.tar.gz">0.1.6.1</a>. </li>
+<a href="mdevd-0.1.6.2.tar.gz">0.1.6.2</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/mdevd/">mdevd
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 02cfa3a..7fadce1 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,17 @@
 
 <h1> What has changed in mdevd </h1>
 
+<h2> in 0.1.6.2 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.13.1.0. </li>
+ <li> <a href="//skarnet.org/software/nsss/">nsss</a>
+optional dependency bumped to 0.2.0.3. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+optional dependency bumped to 2.9.2.0. </li>
+</ul>
+
 <h2> in 0.1.6.1 </h2>
 
 <ul>
diff --git a/package/deps.mak b/package/deps.mak
index 7820c93..99ecf8f 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -13,9 +13,8 @@ libmdevd.a.xyzzy: src/mdevd/mdevd_netlink_init.o src/mdevd/mdevd_uevent_read.o s
 else
 libmdevd.a.xyzzy: src/mdevd/mdevd_netlink_init.lo src/mdevd/mdevd_uevent_read.lo src/mdevd/mdevd_uevent_getvar.lo
 endif
-libmdevd.so.xyzzy: EXTRA_LIBS :=
-libmdevd.so.xyzzy: src/mdevd/mdevd_netlink_init.lo src/mdevd/mdevd_uevent_read.lo src/mdevd/mdevd_uevent_getvar.lo
 mdevd: EXTRA_LIBS := -lskarnet ${MAYBEPTHREAD_LIB}
 mdevd: src/mdevd/mdevd.o libmdevd.a.xyzzy ${LIBNSSS}
 mdevd-coldplug: EXTRA_LIBS := -lskarnet
 mdevd-coldplug: src/mdevd/mdevd-coldplug.o libmdevd.a.xyzzy
+INTERNAL_LIBS := libmdevd.a.xyzzy
diff --git a/package/info b/package/info
index 185f17b..c5993ba 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=mdevd
-version=0.1.6.1
+version=0.1.6.2
 category=admin
 package_macro_name=MDEVD
diff --git a/package/targets.mak b/package/targets.mak
index 1a21f42..870e5f1 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -2,7 +2,4 @@ BIN_TARGETS := \
 mdevd \
 mdevd-coldplug
 
-INTERNAL_LIBS := libmdevd.a.xyzzy
-
 LIBEXEC_TARGETS :=
-
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"
-- 
cgit v1.3.1