From 964144b5207efc540c68aa1ae2b74626f3d59ac6 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 16 Dec 2014 00:01:35 +0000
Subject:  Fix include order in Makefile

---
 Makefile            |  2 +-
 configure           | 16 +++++++++++++---
 package/targets.mak | 14 ++++++++------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index c14a09d..706f687 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@ it: all
 CC = $(error Please use ./configure first)
 
 -include config.mak
-include package/deps.mak
 include package/targets.mak
+include package/deps.mak
 
 version_m := $(basename $(version))
 version_M := $(basename $(version_m))
diff --git a/configure b/configure
index c030856..0647be0 100755
--- a/configure
+++ b/configure
@@ -344,9 +344,19 @@ if $allstatic ; then
   vpathd=
 fi
   echo "vpath lib%.so$vpathd"
-echo
-$static || echo "STATIC_LIBS :="
-$shared || echo "SHARED_LIBS :="
+echo "STATIC_LIBS :="
+echo "SHARED_LIBS :="
+if $static ; then
+  echo "DO_STATIC := 1"
+else
+  echo "DO_STATIC :="
+fi
+if $shared ; then
+  echo "DO_SHARED := 1"
+else
+  echo "DO_SHARED :="
+fi
+
 exec 1>&3 3>&-
 echo "  ... done."
 
diff --git a/package/targets.mak b/package/targets.mak
index 2125f4e..4d1654c 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -1,4 +1,4 @@
-BIN_TARGETS = \
+BIN_TARGETS := \
 s6-connlimit \
 s6-getservbyname \
 s6-ioconnect \
@@ -24,13 +24,15 @@ s6-taiclock \
 s6-taiclockd \
 minidentd
 
-LIBEXEC_TARGETS =
+LIBEXEC_TARGETS :=
 
-SHARED_LIBS = \
-libs6net.so
+ifdef DO_SHARED
+SHARED_LIBS := libs6net.so
+endif
 
-STATIC_LIBS = \
-libs6net.a
+ifdef DO_STATIC
+STATIC_LIBS := libs6net.a
+endif
 
 src/minidentd/mgetuid.c: src/minidentd/mgetuid-linux.c src/minidentd/mgetuid-default.c
 	if grep -iF -- -linux- $(sysdeps)/target ; then \
-- 
cgit v1.2.3