Fix include order in Makefile

3 files changed, 22 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index c8ff735..73d9cbb 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ it: all
 
 CC = $(error Please use ./configure first)
 
-include package/targets.mak
 -include config.mak
+include package/targets.mak
 include package/deps.mak
 
 version_m := $(basename $(version))
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 dbc4608..78af02f 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -1,4 +1,4 @@
-BIN_TARGETS = \
+BIN_TARGETS := \
 skadnsd \
 s6-randomip \
 s6-dnsqualify \
@@ -16,12 +16,12 @@ s6-dnsname-filter \
 s6-dnsq \
 s6-dnsqr
 
-LIBEXEC_TARGETS =
+LIBEXEC_TARGETS :=
 
-SHARED_LIBS = \
-libs6dns.so \
-libskadns.so
+ifdef DO_SHARED
+SHARED_LIBS := libs6dns.so libskadns.so
+endif
 
-STATIC_LIBS = \
-libs6dns.a \
-libskadns.a
+ifdef DO_STATIC
+STATIC_LIBS := libs6dns.a libskadns.a
+endif