diff options
-rw-r--r-- | Makefile | 3 | ||||
-rwxr-xr-x | configure | 13 |
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." |