Fix order of includes in Makefile

3 files changed, 23 insertions, 11 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 efe87d4..16590e5 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 9583a50..2ecfe72 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -1,4 +1,4 @@
-BIN_TARGETS = \
+BIN_TARGETS := \
 background \
 backtick \
 cd \
@@ -41,11 +41,13 @@ umask \
 unexport \
 wait
 
-SBIN_TARGETS =
-LIBEXEC_TARGETS =
+SBIN_TARGETS :=
+LIBEXEC_TARGETS :=
 
-SHARED_LIBS = \
-libexecline.so
+ifdef DO_SHARED
+SHARED_LIBS := libexecline.so
+endif
 
-STATIC_LIBS = \
-libexecline.a
+ifdef DO_STATIC
+STATIC_LIBS := libexecline.a
+endif