libmicrohttpd

commit 9fa6946adf02b03567e4a8500c9611b6860d5748
parent 8ac6b1fb18250371bf7dd5357b76227f8df07fe8
Author: LRN <lrn1986@gmail.com>
Date:   Wed, 19 Feb 2014 08:52:25 +0000

More typo fixes and proper convenience lib makefile rules

Diffstat:
M
src/microhttpd/Makefile.am
 | 
6
++++--
M
src/platform/Makefile.am
 | 
8
++++----
M
src/testcurl/Makefile.am
 | 
2
+-

3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
@@ -22,8 +22,10 @@ libmicrohttpd_la_CPPFLAGS = \
 libmicrohttpd_la_LDFLAGS = \
   $(MHD_LIB_LDFLAGS) \
   -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
+libmicrohttpd_la_LIBADD =
+
 if HAVE_W32
-libmicrohttpd_LDADD = \
+libmicrohttpd_la_LIBADD += \
  $(top_builddir)/src/platform/libmicrohttpd_w32.la
 endif
 
@@ -56,7 +58,7 @@ endif
 if ENABLE_HTTPS
 libmicrohttpd_la_SOURCES += \
   connection_https.c connection_https.h
-libmicrohttpd_la_LIBADD = -lgnutls @LIBGCRYPT_LIBS@
+libmicrohttpd_la_LIBADD += -lgnutls @LIBGCRYPT_LIBS@
 endif
 
 
diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am
@@ -10,12 +10,12 @@ if USE_COVERAGE
 endif
 
 if HAVE_W32
-lib_LIBRARIES = \
-  libmicrohttpd_w32.a
-libmicrohttpd_w32_a_CPPFLAGS = \
+noinst_LTLIBRARIES = \
+  libmicrohttpd_w32.la
+libmicrohttpd_w32_la_CPPFLAGS = \
   $(AM_CPPFLAGS) \
   -DBUILDING_MHD_LIB=1
-libmicrohttpd_w32_a_SOURCES = \
+libmicrohttpd_w32_la_SOURCES = \
   w32functions.c
 endif
 
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
@@ -135,7 +135,7 @@ test_get_sendfile_LDADD = \
   $(top_builddir)/src/microhttpd/libmicrohttpd.la \
   @LIBCURL@
 if HAVE_W32
-test_get_sendfile_LDADD +=
+test_get_sendfile_LDADD += \
  $(top_builddir)/src/platform/libmicrohttpd_w32.la
 endif