[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32424 - in libmicrohttpd/src: microhttpd platform testcurl
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32424 - in libmicrohttpd/src: microhttpd platform testcurl |
Date: |
Wed, 19 Feb 2014 09:52:25 +0100 |
Author: LRN
Date: 2014-02-19 09:52:25 +0100 (Wed, 19 Feb 2014)
New Revision: 32424
Modified:
libmicrohttpd/src/microhttpd/Makefile.am
libmicrohttpd/src/platform/Makefile.am
libmicrohttpd/src/testcurl/Makefile.am
Log:
More typo fixes and proper convenience lib makefile rules
Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am 2014-02-19 08:44:10 UTC (rev
32423)
+++ libmicrohttpd/src/microhttpd/Makefile.am 2014-02-19 08:52:25 UTC (rev
32424)
@@ -22,8 +22,10 @@
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 @@
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
Modified: libmicrohttpd/src/platform/Makefile.am
===================================================================
--- libmicrohttpd/src/platform/Makefile.am 2014-02-19 08:44:10 UTC (rev
32423)
+++ libmicrohttpd/src/platform/Makefile.am 2014-02-19 08:52:25 UTC (rev
32424)
@@ -10,12 +10,12 @@
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
Modified: libmicrohttpd/src/testcurl/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/Makefile.am 2014-02-19 08:44:10 UTC (rev
32423)
+++ libmicrohttpd/src/testcurl/Makefile.am 2014-02-19 08:52:25 UTC (rev
32424)
@@ -135,7 +135,7 @@
$(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32424 - in libmicrohttpd/src: microhttpd platform testcurl,
gnunet <=