From 8afe543865fdfd750dec7daf45797018132d7939 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 12 Oct 2015 13:56:02 +0000
Subject:  Push back GNU make dependency to 3.81

---
 INSTALL           |  2 +-
 Makefile          |  4 ++--
 doc/index.html    |  2 +-
 package/deps.mak  | 37 ++++++++++++++++++-------------------
 tools/gen-deps.sh |  4 ++--
 5 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/INSTALL b/INSTALL
index 87f2d13..60f831a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@ Build Instructions
   ------------
 
   - A POSIX-compliant C development environment
-  - GNU make version 4.0 or later
+  - GNU make version 3.81 or later
   - skalibs version 2.3.7.1 or later: http://skarnet.org/software/skalibs/
   - execline version 2.1.4.1 or later: http://skarnet.org/software/execline/
   - s6 version 2.2.1.1 or later: http://skarnet.org/software/s6/
diff --git a/Makefile b/Makefile
index 6eba87f..c3b4a4a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 
 it: all
 
-make_need := 4.0
+make_need := 3.81
 ifeq "" "$(strip $(filter $(make_need), $(firstword $(sort $(make_need) $(MAKE_VERSION)))))"
 fail := $(error Your make ($(MAKE_VERSION)) is too old. You need $(make_need) or newer)
 endif
@@ -20,7 +20,7 @@ INTERNAL_LIBS :=
 EXTRA_TARGETS :=
 LIB_DEFS :=
 
-define library_definition =
+define library_definition
 LIB$(firstword $(subst =, ,$(1))) := lib$(lastword $(subst =, ,$(1))).$(if $(DO_ALLSTATIC),a,so).xyzzy
 ifdef DO_SHARED
 SHARED_LIBS += lib$(lastword $(subst =, ,$(1))).so.xyzzy
diff --git a/doc/index.html b/doc/index.html
index 340df6a..7c2e4ba 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -40,7 +40,7 @@ compiled with IPv6 support, s6-networking is IPv6-ready.
 
 <ul>
  <li> A POSIX-compliant system with a standard C development environment </li>
- <li> GNU make, version 4.0 or later </li>
+ <li> GNU make, version 3.81 or later </li>
  <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
 2.3.7.1 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
diff --git a/package/deps.mak b/package/deps.mak
index e7bf620..55d20da 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -25,43 +25,42 @@ src/libs6net/s6net_ident_reply_get.o src/libs6net/s6net_ident_reply_get.lo: src/
 src/libs6net/s6net_ident_reply_parse.o src/libs6net/s6net_ident_reply_parse.lo: src/libs6net/s6net_ident_reply_parse.c src/include/s6-networking/ident.h
 src/minidentd/mgetuid-default.o src/minidentd/mgetuid-default.lo: src/minidentd/mgetuid-default.c src/minidentd/mgetuid.h
 src/minidentd/mgetuid-linux.o src/minidentd/mgetuid-linux.lo: src/minidentd/mgetuid-linux.c src/minidentd/mgetuid.h
-src/minidentd/mgetuid.o src/minidentd/mgetuid.lo: src/minidentd/mgetuid.c src/minidentd/mgetuid.h
 src/minidentd/minidentd.o src/minidentd/minidentd.lo: src/minidentd/minidentd.c src/minidentd/mgetuid.h
 
-s6-clockadd: private EXTRA_LIBS := ${SYSCLOCK_LIB}
+s6-clockadd: EXTRA_LIBS := ${SYSCLOCK_LIB}
 s6-clockadd: src/clock/s6-clockadd.o -lskarnet
-s6-clockview: private EXTRA_LIBS := ${SYSCLOCK_LIB}
+s6-clockview: EXTRA_LIBS := ${SYSCLOCK_LIB}
 s6-clockview: src/clock/s6-clockview.o -lskarnet
-s6-sntpclock: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-sntpclock: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
 s6-sntpclock: src/clock/s6-sntpclock.o -lskarnet
-s6-taiclock: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-taiclock: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
 s6-taiclock: src/clock/s6-taiclock.o -lskarnet
-s6-taiclockd: private EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-taiclockd: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
 s6-taiclockd: src/clock/s6-taiclockd.o -lskarnet
-s6-getservbyname: private EXTRA_LIBS := ${SOCKET_LIB}
+s6-getservbyname: EXTRA_LIBS := ${SOCKET_LIB}
 s6-getservbyname: src/conn-tools/s6-getservbyname.o -lskarnet
-s6-ident-client: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-ident-client: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
 s6-ident-client: src/conn-tools/s6-ident-client.o ${LIBS6NET} -lskarnet
-s6-tcpclient: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-tcpclient: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
 s6-tcpclient: src/conn-tools/s6-tcpclient.o ${LIBS6NET} -ls6dns -lskarnet
-s6-tcpserver: private EXTRA_LIBS :=
+s6-tcpserver: EXTRA_LIBS :=
 s6-tcpserver: src/conn-tools/s6-tcpserver.o -lskarnet
-s6-tcpserver-access: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-tcpserver-access: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
 s6-tcpserver-access: src/conn-tools/s6-tcpserver-access.o ${LIBS6NET} -ls6dns -ls6 -lskarnet
-s6-tcpserver4: private EXTRA_LIBS := ${SOCKET_LIB}
+s6-tcpserver4: EXTRA_LIBS := ${SOCKET_LIB}
 s6-tcpserver4: src/conn-tools/s6-tcpserver4.o -lskarnet
-s6-tcpserver4-socketbinder: private EXTRA_LIBS := ${SOCKET_LIB}
+s6-tcpserver4-socketbinder: EXTRA_LIBS := ${SOCKET_LIB}
 s6-tcpserver4-socketbinder: src/conn-tools/s6-tcpserver4-socketbinder.o -lskarnet
-s6-tcpserver4d: private EXTRA_LIBS := ${SOCKET_LIB}
+s6-tcpserver4d: EXTRA_LIBS := ${SOCKET_LIB}
 s6-tcpserver4d: src/conn-tools/s6-tcpserver4d.o -lskarnet
-s6-tcpserver6: private EXTRA_LIBS := ${SOCKET_LIB}
+s6-tcpserver6: EXTRA_LIBS := ${SOCKET_LIB}
 s6-tcpserver6: src/conn-tools/s6-tcpserver6.o -lskarnet
-s6-tcpserver6-socketbinder: private EXTRA_LIBS := ${SOCKET_LIB}
+s6-tcpserver6-socketbinder: EXTRA_LIBS := ${SOCKET_LIB}
 s6-tcpserver6-socketbinder: src/conn-tools/s6-tcpserver6-socketbinder.o -lskarnet
-s6-tcpserver6d: private EXTRA_LIBS := ${SOCKET_LIB}
+s6-tcpserver6d: EXTRA_LIBS := ${SOCKET_LIB}
 s6-tcpserver6d: src/conn-tools/s6-tcpserver6d.o -lskarnet
 libs6net.a.xyzzy: src/libs6net/s6net_ident_client.o src/libs6net/s6net_ident_reply_get.o src/libs6net/s6net_ident_reply_parse.o src/libs6net/s6net_ident_error.o
-libs6net.so.xyzzy: private EXTRA_LIBS := -lskarnet
+libs6net.so.xyzzy: EXTRA_LIBS := -lskarnet
 libs6net.so.xyzzy: src/libs6net/s6net_ident_client.lo src/libs6net/s6net_ident_reply_get.lo src/libs6net/s6net_ident_reply_parse.lo src/libs6net/s6net_ident_error.lo
-minidentd: private EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+minidentd: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
 minidentd: src/minidentd/minidentd.o src/minidentd/mgetuid.o -lskarnet
diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index f8cf5ee..5c96dd1 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -66,7 +66,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do
       fi
     done < src/$dir/deps-lib/$file
     echo "lib${file}.a.xyzzy:$deps"
-    echo "lib${file}.so.xyzzy: private EXTRA_LIBS :=$libs"
+    echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs"
     echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
   done
 
@@ -83,7 +83,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do
         deps="$deps $dep"
       fi
     done < src/$dir/deps-exe/$file
-    echo "$file: private EXTRA_LIBS :=$libs"
+    echo "$file: EXTRA_LIBS :=$libs"
     echo "$file: src/$dir/$file.o$deps"
   done
 done
-- 
cgit v1.2.3