diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-02-19 06:47:35 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-02-19 06:47:35 +0000 |
commit | 68c667f88b985191a21a308c92d72a7dad172bf2 (patch) | |
tree | f46b3e532359e24b4678159cfadd35f6951b6021 /src | |
parent | 745673d704c48aaa719d57132abf2039bcd0169d (diff) | |
download | libmicrohttpd-68c667f88b985191a21a308c92d72a7dad172bf2.tar.gz libmicrohttpd-68c667f88b985191a21a308c92d72a7dad172bf2.zip |
move headers to src/include, build w32functions.c as static library (untested) to make 'make distclean' work cleanly
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/include/Makefile.am | 2 | ||||
-rw-r--r-- | src/include/platform_interface.h (renamed from src/platform/platform_interface.h) | 0 | ||||
-rw-r--r-- | src/include/w32functions.h (renamed from src/platform/w32functions.h) | 0 | ||||
-rw-r--r-- | src/microhttpd/Makefile.am | 15 | ||||
-rw-r--r-- | src/platform/Makefile.am | 21 | ||||
-rw-r--r-- | src/testcurl/Makefile.am | 78 |
7 files changed, 69 insertions, 49 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9808c479..d01c622a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -18,7 +18,7 @@ microspdy += testspdy | |||
18 | endif | 18 | endif |
19 | endif | 19 | endif |
20 | 20 | ||
21 | SUBDIRS = include microhttpd $(microspdy) examples $(curltests) $(zzuftests) . | 21 | SUBDIRS = include platform microhttpd $(microspdy) examples $(curltests) $(zzuftests) . |
22 | 22 | ||
23 | EXTRA_DIST = \ | 23 | EXTRA_DIST = \ |
24 | datadir/cert-and-key.pem \ | 24 | datadir/cert-and-key.pem \ |
diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 66761396..728bee83 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am | |||
@@ -6,4 +6,4 @@ endif | |||
6 | 6 | ||
7 | include_HEADERS = microhttpd.h $(microspdy) | 7 | include_HEADERS = microhttpd.h $(microspdy) |
8 | 8 | ||
9 | EXTRA_DIST = platform.h | 9 | EXTRA_DIST = platform.h platform_interface.h w32functions.h |
diff --git a/src/platform/platform_interface.h b/src/include/platform_interface.h index 22f78166..22f78166 100644 --- a/src/platform/platform_interface.h +++ b/src/include/platform_interface.h | |||
diff --git a/src/platform/w32functions.h b/src/include/w32functions.h index 7a25803b..7a25803b 100644 --- a/src/platform/w32functions.h +++ b/src/include/w32functions.h | |||
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am index b88e6fa9..3eecb12d 100644 --- a/src/microhttpd/Makefile.am +++ b/src/microhttpd/Makefile.am | |||
@@ -1,11 +1,6 @@ | |||
1 | if HAVE_W32 | ||
2 | W32FUNC_SRC = ../platform/w32functions.c ../platform/w32functions.h | ||
3 | endif | ||
4 | |||
5 | AM_CPPFLAGS = \ | 1 | AM_CPPFLAGS = \ |
6 | -I$(top_srcdir)/src/include \ | 2 | -I$(top_srcdir)/src/include \ |
7 | -I$(top_srcdir)/src/microhttpd \ | 3 | -I$(top_srcdir)/src/microhttpd |
8 | -I$(top_srcdir)/src/platform | ||
9 | 4 | ||
10 | AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) \ | 5 | AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) \ |
11 | @LIBGCRYPT_CFLAGS@ | 6 | @LIBGCRYPT_CFLAGS@ |
@@ -21,13 +16,19 @@ libmicrohttpd_la_SOURCES = \ | |||
21 | internal.c internal.h \ | 16 | internal.c internal.h \ |
22 | memorypool.c memorypool.h \ | 17 | memorypool.c memorypool.h \ |
23 | response.c response.h \ | 18 | response.c response.h \ |
24 | ../platform/platform_interface.h $(W32FUNC_SRC) | ||
25 | libmicrohttpd_la_CPPFLAGS = \ | 19 | libmicrohttpd_la_CPPFLAGS = \ |
26 | $(AM_CPPFLAGS) \ | 20 | $(AM_CPPFLAGS) \ |
27 | -DBUILDING_MHD_LIB=1 | 21 | -DBUILDING_MHD_LIB=1 |
22 | libmicrohttpd_la_CFLAGS = \ | ||
23 | $(AM_CFLAGS) \ | ||
24 | -DBUILDING_MHD_LIB=1 | ||
28 | libmicrohttpd_la_LDFLAGS = \ | 25 | libmicrohttpd_la_LDFLAGS = \ |
29 | $(MHD_LIB_LDFLAGS) \ | 26 | $(MHD_LIB_LDFLAGS) \ |
30 | -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ | 27 | -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ |
28 | if HAVE_W32 | ||
29 | libmicrohttpd_LDADD = | ||
30 | $(top_builddir)/src/platform/libmicrohttpd_w32.la | ||
31 | endif | ||
31 | 32 | ||
32 | if USE_COVERAGE | 33 | if USE_COVERAGE |
33 | AM_CFLAGS += --coverage | 34 | AM_CFLAGS += --coverage |
diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am new file mode 100644 index 00000000..e1cdffec --- /dev/null +++ b/src/platform/Makefile.am | |||
@@ -0,0 +1,21 @@ | |||
1 | AM_CPPFLAGS = \ | ||
2 | -I$(top_srcdir)/src/include \ | ||
3 | -I$(top_srcdir)/src/microhttpd | ||
4 | |||
5 | AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) \ | ||
6 | @LIBGCRYPT_CFLAGS@ | ||
7 | |||
8 | if USE_COVERAGE | ||
9 | AM_CFLAGS += --coverage | ||
10 | endif | ||
11 | |||
12 | if HAVE_W32 | ||
13 | lib_LIBRARIES = \ | ||
14 | libmicrohttpd_w32.a | ||
15 | libmicrohttpd_w32_a_CPPFLAGS = \ | ||
16 | $(AM_CPPFLAGS) \ | ||
17 | -DBUILDING_MHD_LIB=1 | ||
18 | libmicrohttpd_w32_a_SOURCES = \ | ||
19 | w32functions.c | ||
20 | endif | ||
21 | |||
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am index 934587d7..892ffceb 100644 --- a/src/testcurl/Makefile.am +++ b/src/testcurl/Makefile.am | |||
@@ -12,7 +12,6 @@ AM_CPPFLAGS = \ | |||
12 | -I$(top_srcdir) \ | 12 | -I$(top_srcdir) \ |
13 | -I$(top_srcdir)/src/microhttpd \ | 13 | -I$(top_srcdir)/src/microhttpd \ |
14 | -I$(top_srcdir)/src/include \ | 14 | -I$(top_srcdir)/src/include \ |
15 | -I$(top_srcdir)/src/platform \ | ||
16 | $(LIBCURL_CPPFLAGS) | 15 | $(LIBCURL_CPPFLAGS) |
17 | 16 | ||
18 | if !HAVE_W32 | 17 | if !HAVE_W32 |
@@ -57,7 +56,7 @@ if HAVE_POSTPROCESSOR | |||
57 | test_post_loop \ | 56 | test_post_loop \ |
58 | test_post11 \ | 57 | test_post11 \ |
59 | test_postform11 \ | 58 | test_postform11 \ |
60 | test_post_loop11 | 59 | test_post_loop11 |
61 | endif | 60 | endif |
62 | 61 | ||
63 | noinst_PROGRAMS = \ | 62 | noinst_PROGRAMS = \ |
@@ -90,33 +89,33 @@ test_get_SOURCES = \ | |||
90 | test_get.c | 89 | test_get.c |
91 | test_get_LDADD = \ | 90 | test_get_LDADD = \ |
92 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 91 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
93 | @LIBCURL@ | 92 | @LIBCURL@ |
94 | 93 | ||
95 | test_quiesce_SOURCES = \ | 94 | test_quiesce_SOURCES = \ |
96 | test_quiesce.c | 95 | test_quiesce.c |
97 | test_quiesce_LDADD = \ | 96 | test_quiesce_LDADD = \ |
98 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 97 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
99 | @LIBCURL@ | 98 | @LIBCURL@ |
100 | 99 | ||
101 | test_callback_SOURCES = \ | 100 | test_callback_SOURCES = \ |
102 | test_callback.c | 101 | test_callback.c |
103 | test_callback_LDADD = \ | 102 | test_callback_LDADD = \ |
104 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 103 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
105 | @LIBCURL@ | 104 | @LIBCURL@ |
106 | 105 | ||
107 | perf_get_SOURCES = \ | 106 | perf_get_SOURCES = \ |
108 | perf_get.c \ | 107 | perf_get.c \ |
109 | gauger.h | 108 | gauger.h |
110 | perf_get_LDADD = \ | 109 | perf_get_LDADD = \ |
111 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 110 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
112 | @LIBCURL@ | 111 | @LIBCURL@ |
113 | 112 | ||
114 | perf_get_concurrent_SOURCES = \ | 113 | perf_get_concurrent_SOURCES = \ |
115 | perf_get_concurrent.c \ | 114 | perf_get_concurrent.c \ |
116 | gauger.h | 115 | gauger.h |
117 | perf_get_concurrent_LDADD = \ | 116 | perf_get_concurrent_LDADD = \ |
118 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 117 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
119 | @LIBCURL@ | 118 | @LIBCURL@ |
120 | 119 | ||
121 | test_digestauth_SOURCES = \ | 120 | test_digestauth_SOURCES = \ |
122 | test_digestauth.c | 121 | test_digestauth.c |
@@ -131,56 +130,55 @@ test_digestauth_with_arguments_LDADD = \ | |||
131 | @LIBCURL@ @LIBGCRYPT_LIBS@ | 130 | @LIBCURL@ @LIBGCRYPT_LIBS@ |
132 | 131 | ||
133 | test_get_sendfile_SOURCES = \ | 132 | test_get_sendfile_SOURCES = \ |
134 | test_get_sendfile.c \ | 133 | test_get_sendfile.c |
135 | ../platform/platform_interface.h | ||
136 | if HAVE_W32 | ||
137 | test_get_sendfile_SOURCES += \ | ||
138 | ../platform/w32functions.h ../platform/w32functions.c | ||
139 | endif | ||
140 | test_get_sendfile_LDADD = \ | 134 | test_get_sendfile_LDADD = \ |
141 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 135 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
142 | @LIBCURL@ | 136 | @LIBCURL@ |
137 | if HAVE_W32 | ||
138 | test_get_sendfile_LDADD += | ||
139 | $(top_builddir)/src/platform/libmicrohttpd_w32.la | ||
140 | endif | ||
143 | 141 | ||
144 | test_urlparse_SOURCES = \ | 142 | test_urlparse_SOURCES = \ |
145 | test_urlparse.c | 143 | test_urlparse.c |
146 | test_urlparse_LDADD = \ | 144 | test_urlparse_LDADD = \ |
147 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 145 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
148 | @LIBCURL@ | 146 | @LIBCURL@ |
149 | 147 | ||
150 | test_get_response_cleanup_SOURCES = \ | 148 | test_get_response_cleanup_SOURCES = \ |
151 | test_get_response_cleanup.c | 149 | test_get_response_cleanup.c |
152 | test_get_response_cleanup_LDADD = \ | 150 | test_get_response_cleanup_LDADD = \ |
153 | $(top_builddir)/src/microhttpd/libmicrohttpd.la | 151 | $(top_builddir)/src/microhttpd/libmicrohttpd.la |
154 | 152 | ||
155 | test_get_chunked_SOURCES = \ | 153 | test_get_chunked_SOURCES = \ |
156 | test_get_chunked.c | 154 | test_get_chunked.c |
157 | test_get_chunked_LDADD = \ | 155 | test_get_chunked_LDADD = \ |
158 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 156 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
159 | @LIBCURL@ | 157 | @LIBCURL@ |
160 | 158 | ||
161 | test_post_SOURCES = \ | 159 | test_post_SOURCES = \ |
162 | test_post.c | 160 | test_post.c |
163 | test_post_LDADD = \ | 161 | test_post_LDADD = \ |
164 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 162 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
165 | @LIBCURL@ | 163 | @LIBCURL@ |
166 | 164 | ||
167 | test_process_headers_SOURCES = \ | 165 | test_process_headers_SOURCES = \ |
168 | test_process_headers.c | 166 | test_process_headers.c |
169 | test_process_headers_LDADD = \ | 167 | test_process_headers_LDADD = \ |
170 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 168 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
171 | @LIBCURL@ | 169 | @LIBCURL@ |
172 | 170 | ||
173 | test_parse_cookies_SOURCES = \ | 171 | test_parse_cookies_SOURCES = \ |
174 | test_parse_cookies.c | 172 | test_parse_cookies.c |
175 | test_parse_cookies_LDADD = \ | 173 | test_parse_cookies_LDADD = \ |
176 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 174 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
177 | @LIBCURL@ | 175 | @LIBCURL@ |
178 | 176 | ||
179 | test_process_arguments_SOURCES = \ | 177 | test_process_arguments_SOURCES = \ |
180 | test_process_arguments.c | 178 | test_process_arguments.c |
181 | test_process_arguments_LDADD = \ | 179 | test_process_arguments_LDADD = \ |
182 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 180 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
183 | @LIBCURL@ | 181 | @LIBCURL@ |
184 | 182 | ||
185 | test_postform_SOURCES = \ | 183 | test_postform_SOURCES = \ |
186 | test_postform.c | 184 | test_postform.c |
@@ -192,41 +190,41 @@ test_post_loop_SOURCES = \ | |||
192 | test_post_loop.c | 190 | test_post_loop.c |
193 | test_post_loop_LDADD = \ | 191 | test_post_loop_LDADD = \ |
194 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 192 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
195 | @LIBCURL@ | 193 | @LIBCURL@ |
196 | 194 | ||
197 | test_put_SOURCES = \ | 195 | test_put_SOURCES = \ |
198 | test_put.c | 196 | test_put.c |
199 | test_put_LDADD = \ | 197 | test_put_LDADD = \ |
200 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 198 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
201 | @LIBCURL@ | 199 | @LIBCURL@ |
202 | 200 | ||
203 | test_put_chunked_SOURCES = \ | 201 | test_put_chunked_SOURCES = \ |
204 | test_put_chunked.c | 202 | test_put_chunked.c |
205 | test_put_chunked_LDADD = \ | 203 | test_put_chunked_LDADD = \ |
206 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 204 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
207 | @LIBCURL@ | 205 | @LIBCURL@ |
208 | 206 | ||
209 | test_get11_SOURCES = \ | 207 | test_get11_SOURCES = \ |
210 | test_get.c | 208 | test_get.c |
211 | test_get11_LDADD = \ | 209 | test_get11_LDADD = \ |
212 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 210 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
213 | @LIBCURL@ | 211 | @LIBCURL@ |
214 | 212 | ||
215 | test_get_sendfile11_SOURCES = \ | 213 | test_get_sendfile11_SOURCES = \ |
216 | test_get_sendfile.c | 214 | test_get_sendfile.c |
217 | if HAVE_W32 | ||
218 | test_get_sendfile11_SOURCES += \ | ||
219 | ../platform/w32functions.h ../platform/w32functions.c | ||
220 | endif | ||
221 | test_get_sendfile11_LDADD = \ | 215 | test_get_sendfile11_LDADD = \ |
222 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 216 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
223 | @LIBCURL@ | 217 | @LIBCURL@ |
218 | if HAVE_W32 | ||
219 | test_get_sendfile11_LDADD += \ | ||
220 | $(top_builddir)/src/platform/libmicrohttpd_w32.la | ||
221 | endif | ||
224 | 222 | ||
225 | test_post11_SOURCES = \ | 223 | test_post11_SOURCES = \ |
226 | test_post.c | 224 | test_post.c |
227 | test_post11_LDADD = \ | 225 | test_post11_LDADD = \ |
228 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 226 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
229 | @LIBCURL@ | 227 | @LIBCURL@ |
230 | 228 | ||
231 | test_postform11_SOURCES = \ | 229 | test_postform11_SOURCES = \ |
232 | test_postform.c | 230 | test_postform.c |
@@ -238,53 +236,53 @@ test_post_loop11_SOURCES = \ | |||
238 | test_post_loop.c | 236 | test_post_loop.c |
239 | test_post_loop11_LDADD = \ | 237 | test_post_loop11_LDADD = \ |
240 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 238 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
241 | @LIBCURL@ | 239 | @LIBCURL@ |
242 | 240 | ||
243 | test_put11_SOURCES = \ | 241 | test_put11_SOURCES = \ |
244 | test_put.c | 242 | test_put.c |
245 | test_put11_LDADD = \ | 243 | test_put11_LDADD = \ |
246 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 244 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
247 | @LIBCURL@ | 245 | @LIBCURL@ |
248 | 246 | ||
249 | test_large_put_SOURCES = \ | 247 | test_large_put_SOURCES = \ |
250 | test_large_put.c | 248 | test_large_put.c |
251 | test_large_put_LDADD = \ | 249 | test_large_put_LDADD = \ |
252 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 250 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
253 | @LIBCURL@ | 251 | @LIBCURL@ |
254 | 252 | ||
255 | test_large_put11_SOURCES = \ | 253 | test_large_put11_SOURCES = \ |
256 | test_large_put.c | 254 | test_large_put.c |
257 | test_large_put11_LDADD = \ | 255 | test_large_put11_LDADD = \ |
258 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 256 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
259 | @LIBCURL@ | 257 | @LIBCURL@ |
260 | 258 | ||
261 | test_long_header_SOURCES = \ | 259 | test_long_header_SOURCES = \ |
262 | test_long_header.c | 260 | test_long_header.c |
263 | test_long_header_LDADD = \ | 261 | test_long_header_LDADD = \ |
264 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 262 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
265 | @LIBCURL@ | 263 | @LIBCURL@ |
266 | 264 | ||
267 | test_long_header11_SOURCES = \ | 265 | test_long_header11_SOURCES = \ |
268 | test_long_header.c | 266 | test_long_header.c |
269 | test_long_header11_LDADD = \ | 267 | test_long_header11_LDADD = \ |
270 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 268 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
271 | @LIBCURL@ | 269 | @LIBCURL@ |
272 | 270 | ||
273 | test_iplimit11_SOURCES = \ | 271 | test_iplimit11_SOURCES = \ |
274 | test_iplimit.c | 272 | test_iplimit.c |
275 | test_iplimit11_LDADD = \ | 273 | test_iplimit11_LDADD = \ |
276 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 274 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
277 | @LIBCURL@ | 275 | @LIBCURL@ |
278 | 276 | ||
279 | test_termination_SOURCES = \ | 277 | test_termination_SOURCES = \ |
280 | test_termination.c | 278 | test_termination.c |
281 | test_termination_LDADD = \ | 279 | test_termination_LDADD = \ |
282 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 280 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
283 | @LIBCURL@ | 281 | @LIBCURL@ |
284 | 282 | ||
285 | test_timeout_SOURCES = \ | 283 | test_timeout_SOURCES = \ |
286 | test_timeout.c | 284 | test_timeout.c |
287 | test_timeout_LDADD = \ | 285 | test_timeout_LDADD = \ |
288 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 286 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
289 | @LIBCURL@ | 287 | @LIBCURL@ |
290 | 288 | ||