commit c9004254ef3d56871ac4aca406a69d8fb93dca05 parent 255d410c6492e42a584880785d63560dc96acdb4 Author: Laurent Bercot <ska-skaware@skarnet.org> Date: Mon, 15 Dec 2014 23:54:43 +0000 Declare static/shared libs in configure, it's specific anyway Diffstat:
| M | Makefile | | | 3 | --- |
| M | configure | | | 13 | +++++++++++-- |
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git 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 @@ -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."