aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2014-04-01 06:22:37 +0000
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2014-04-01 06:22:37 +0000
commitb5d8ccf533db180e659425fa775dedf0eab1df85 (patch)
treee5c5e76f1931473a6fac4523741815c90997589e
parent08a582230d4371e3dd93db951e49cabf68e95398 (diff)
downloadlibmicrohttpd-b5d8ccf533db180e659425fa775dedf0eab1df85.tar.gz
libmicrohttpd-b5d8ccf533db180e659425fa775dedf0eab1df85.zip
Rename internal helper lib libmicrohttpd_w32.la -> libplatform_interface.la
-rw-r--r--src/microhttpd/Makefile.am2
-rw-r--r--src/platform/Makefile.am9
-rw-r--r--src/testcurl/Makefile.am4
3 files changed, 7 insertions, 8 deletions
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index dbc681c2..d3a303f2 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
5AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) 5AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS)
6 6
7if HAVE_W32 7if HAVE_W32
8MHD_W32_LIB = $(top_builddir)/src/platform/libmicrohttpd_w32.la 8MHD_W32_LIB = $(top_builddir)/src/platform/libplatform_interface.la
9endif 9endif
10 10
11lib_LTLIBRARIES = \ 11lib_LTLIBRARIES = \
diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am
index 5877f2d8..d97b5581 100644
--- a/src/platform/Makefile.am
+++ b/src/platform/Makefile.am
@@ -1,8 +1,7 @@
1AM_CPPFLAGS = \ 1AM_CPPFLAGS = \
2 -I$(top_srcdir)/src/include 2 -I$(top_srcdir)/src/include
3 3
4AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) \ 4AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS)
5 @LIBGCRYPT_CFLAGS@
6 5
7if USE_COVERAGE 6if USE_COVERAGE
8 AM_CFLAGS += --coverage 7 AM_CFLAGS += --coverage
@@ -10,11 +9,11 @@ endif
10 9
11if HAVE_W32 10if HAVE_W32
12noinst_LTLIBRARIES = \ 11noinst_LTLIBRARIES = \
13 libmicrohttpd_w32.la 12 libplatform_interface.la
14libmicrohttpd_w32_la_CPPFLAGS = \ 13libplatform_interface_la_CPPFLAGS = \
15 $(AM_CPPFLAGS) \ 14 $(AM_CPPFLAGS) \
16 -DBUILDING_MHD_LIB=1 15 -DBUILDING_MHD_LIB=1
17libmicrohttpd_w32_la_SOURCES = \ 16libplatform_interface_la_SOURCES = \
18 w32functions.c 17 w32functions.c
19endif 18endif
20 19
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index bf3937a0..bea82006 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -139,7 +139,7 @@ test_get_sendfile_LDADD = \
139 @LIBCURL@ 139 @LIBCURL@
140if HAVE_W32 140if HAVE_W32
141test_get_sendfile_LDADD += \ 141test_get_sendfile_LDADD += \
142 $(top_builddir)/src/platform/libmicrohttpd_w32.la 142 $(top_builddir)/src/platform/libplatform_interface.la
143endif 143endif
144 144
145test_urlparse_SOURCES = \ 145test_urlparse_SOURCES = \
@@ -220,7 +220,7 @@ test_get_sendfile11_LDADD = \
220 @LIBCURL@ 220 @LIBCURL@
221if HAVE_W32 221if HAVE_W32
222test_get_sendfile11_LDADD += \ 222test_get_sendfile11_LDADD += \
223 $(top_builddir)/src/platform/libmicrohttpd_w32.la 223 $(top_builddir)/src/platform/libplatform_interface.la
224endif 224endif
225 225
226test_post11_SOURCES = \ 226test_post11_SOURCES = \