diff options
| author | Christian Grothoff <christian@grothoff.org> | 2013-05-05 19:21:40 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2013-05-05 19:21:40 +0000 |
| commit | 639c6a9880b73c1bbef0944e8934cece1e5191ac (patch) | |
| tree | b9ed0484f989630340614e7d5dab084ff76e61da /src/Makefile.am | |
| parent | 7f193935fa7ec246bfa619d0fd7d6ce1a059fb1c (diff) | |
| download | libmicrohttpd-639c6a9880b73c1bbef0944e8934cece1e5191ac.tar.gz libmicrohttpd-639c6a9880b73c1bbef0944e8934cece1e5191ac.zip | |
merging libmicrospdy into tree
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 79b19bf5..8e9bcc2f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
| @@ -6,4 +6,13 @@ zzuftests = testzzuf | |||
| 6 | endif | 6 | endif |
| 7 | endif | 7 | endif |
| 8 | endif | 8 | endif |
| 9 | SUBDIRS = include microhttpd examples $(curltests) $(zzuftests) . | 9 | if ENABLE_SPDY |
| 10 | # fixme: should test for spdylay before building testspdy! | ||
| 11 | microspdy = microspdy testspdy | ||
| 12 | endif | ||
| 13 | |||
| 14 | SUBDIRS = include microhttpd $(microspdy) examples $(curltests) $(zzuftests) . | ||
| 15 | |||
| 16 | EXTRA_DIST = \ | ||
| 17 | datadir/cert-and-key.pem \ | ||
| 18 | datadir/cert-and-key-for-wireshark.pem | ||