aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-05-05 19:21:40 +0000
committerChristian Grothoff <christian@grothoff.org>2013-05-05 19:21:40 +0000
commit639c6a9880b73c1bbef0944e8934cece1e5191ac (patch)
treeb9ed0484f989630340614e7d5dab084ff76e61da /Makefile.am
parent7f193935fa7ec246bfa619d0fd7d6ce1a059fb1c (diff)
downloadlibmicrohttpd-639c6a9880b73c1bbef0944e8934cece1e5191ac.tar.gz
libmicrohttpd-639c6a9880b73c1bbef0944e8934cece1e5191ac.zip
merging libmicrospdy into tree
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
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 @@
1ACLOCAL_AMFLAGS = -I m4 1ACLOCAL_AMFLAGS = -I m4
2SUBDIRS = contrib src doc m4 . 2SUBDIRS = contrib src doc m4 .
3EXTRA_DIST = acinclude.m4 libmicrohttpd.pc.in 3EXTRA_DIST = acinclude.m4 libmicrohttpd.pc.in libmicrospdy.pc.in
4 4
5pkgconfigdir = $(libdir)/pkgconfig 5pkgconfigdir = $(libdir)/pkgconfig
6pkgconfig_DATA = libmicrohttpd.pc 6pkgconfig_DATA = libmicrohttpd.pc