summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2014-12-15 23:54:43 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2014-12-15 23:54:43 +0000
commitc9004254ef3d56871ac4aca406a69d8fb93dca05 (patch)
tree5344fe3af9472fea7689a076c1929b082cf2deef
parent255d410c6492e42a584880785d63560dc96acdb4 (diff)
downloadskalibs-c9004254ef3d56871ac4aca406a69d8fb93dca05.tar.xz
Declare static/shared libs in configure, it's specific anyway
-rw-r--r--Makefile3
-rwxr-xr-xconfigure13
2 files changed, 11 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index b86cf74..32dc746 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,6 @@ it: all
CC = $(error Please use ./configure first)
-SHARED_LIBS := libskarnet.so
-STATIC_LIBS := libskarnet.a
-
-include config.mak
include package/deps.mak
diff --git a/configure b/configure
index 2078556..219d6a5 100755
--- a/configure
+++ b/configure
@@ -514,8 +514,17 @@ if test -n "$vpathd" ; then
echo "vpath lib%.so$vpathd"
fi
-$static || echo "STATIC_LIBS :="
-$shared || echo "SHARED_LIBS :="
+if $static ; then
+ echo "STATIC_LIBS := libskarnet.a"
+else
+ echo "STATIC_LIBS :="
+fi
+if $shared ; then
+ echo "SHARED_LIBS := libskarnet.so"
+else
+ echo "SHARED_LIBS :="
+fi
+
exec 1>&3 3>&-
echo " ... done."