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 /Makefile.am | |
parent | 7f193935fa7ec246bfa619d0fd7d6ce1a059fb1c (diff) | |
download | libmicrohttpd-639c6a9880b73c1bbef0944e8934cece1e5191ac.tar.gz libmicrohttpd-639c6a9880b73c1bbef0944e8934cece1e5191ac.zip |
merging libmicrospdy into tree
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 001dbec0..5a67d875 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -1,6 +1,6 @@ | |||
1 | ACLOCAL_AMFLAGS = -I m4 | 1 | ACLOCAL_AMFLAGS = -I m4 |
2 | SUBDIRS = contrib src doc m4 . | 2 | SUBDIRS = contrib src doc m4 . |
3 | EXTRA_DIST = acinclude.m4 libmicrohttpd.pc.in | 3 | EXTRA_DIST = acinclude.m4 libmicrohttpd.pc.in libmicrospdy.pc.in |
4 | 4 | ||
5 | pkgconfigdir = $(libdir)/pkgconfig | 5 | pkgconfigdir = $(libdir)/pkgconfig |
6 | pkgconfig_DATA = libmicrohttpd.pc | 6 | pkgconfig_DATA = libmicrohttpd.pc |