More typo fixes and proper convenience lib makefile rules

3 files changed, 9 insertions, 7 deletions

diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 64870fa2..65ced4c4 100644
--- 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
index e1cdffec..c79e4fc2 100644
--- 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
index 892ffceb..29aa2e9c 100644
--- 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