commit e4791b96c8c3d172b25db65f15f46d086362c0f1
parent f5dd0355a32915d9524004e8b1c0e0a6b360c604
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date: Thu, 20 Feb 2014 13:16:57 +0000
create W32 static lib with MS lib.exe if available
Diffstat:
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -206,6 +206,7 @@ if test "x$enable_shared" = "xyes" && test "x$os_is_native_w32" = "xyes"; then
fi
AM_CONDITIONAL(W32_SHARED_LIB_EXP, [test "x$w32_shared_lib_exp" = "xyes"])
AM_CONDITIONAL(USE_MS_LIB_TOOL, [test "x$ac_cv_use_ms_lib_tool" = "xyes"])
+AM_CONDITIONAL(W32_STATIC_LIB, [test "x$os_is_native_w32" = "xyes" && test "x$enable_static" = "xyes"])
if test "$enable_epoll" = "yes"
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
@@ -43,6 +43,18 @@ else
W32_MHD_LIB_LDFLAGS =
endif
+if W32_STATIC_LIB
+noinst_DATA += $(lt_cv_objdir)/libmicrohttpd-static.lib
+MOSTLYCLEANFILES += $(lt_cv_objdir)/libmicrohttpd-static.lib
+
+$(lt_cv_objdir)/libmicrohttpd-static.lib: libmicrohttpd.la $(libmicrohttpd_la_OBJECTS)
+if USE_MS_LIB_TOOL
+ $(MS_LIB_TOOL) -out:$@ $(libmicrohttpd_la_OBJECTS:.lo=.o)
+else
+ cp $(lt_cv_objdir)/libmicrohttpd.a $@
+endif
+endif
+
libmicrohttpd_la_SOURCES = \
connection.c connection.h \