Move http-parser to third-party dir and fix `make distcheck`

Makefile.am

@@ -20,7 +20,7 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = lib src examples python tests doc
+SUBDIRS = lib third-party src examples python tests doc
 
 ACLOCAL_AMFLAGS = -I m4
 

configure.ac

@@ -355,6 +355,7 @@ AC_CONFIG_FILES([
   lib/includes/nghttp2/nghttp2ver.h
   tests/Makefile
   tests/testdata/Makefile
+  third-party/Makefile
   src/Makefile
   examples/Makefile
   python/Makefile

examples/Makefile.am

@@ -23,26 +23,26 @@
 
 if ENABLE_EXAMPLES
 
-AM_CFLAGS = -Wall
 AM_CPPFLAGS = \
 	-Wall \
-	-I$(srcdir)/../lib/includes \
+	-I$(top_srcdir)/lib/includes \
-	-I$(builddir)/../lib/includes \
+	-I$(top_builddir)/lib/includes \
-	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/third-party \
 	@LIBEVENT_OPENSSL_CFLAGS@ \
 	@OPENSSL_CFLAGS@ \
 	@DEFS@
 AM_LDFLAGS = \
 	@LIBEVENT_OPENSSL_LIBS@ \
 	@OPENSSL_LIBS@
-LDADD = $(top_builddir)/lib/libnghttp2.la
+LDADD = \
+	$(top_builddir)/lib/libnghttp2.la \
+	$(top_builddir)/third-party/libhttp-parser.la
 
 noinst_PROGRAMS = client libevent-client libevent-server
+
 client_SOURCES = client.c
 
-libevent_client_SOURCES = \
+libevent_client_SOURCES = libevent-client.c
-	libevent-client.c \
-	$(top_srcdir)/src/http-parser/http_parser.c
 
 libevent_server_SOURCES = libevent-server.c
 

src/Makefile.am

@@ -30,6 +30,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/includes \
 	-I$(top_builddir)/lib/includes \
 	-I$(top_srcdir)/lib \
+	-I$(top_srcdir)/third-party \
 	@LIBSPDYLAY_CFLAGS@ \
 	@XML_CPPFLAGS@	\
 	@LIBEVENT_OPENSSL_CFLAGS@ \
@@ -44,7 +45,9 @@ AM_LDFLAGS = \
 	@JANSSON_LIBS@ \
 	@SRC_LIBS@
 
-LDADD = $(top_builddir)/lib/libnghttp2.la
+LDADD = \
+	$(top_builddir)/lib/libnghttp2.la \
+	$(top_builddir)/third-party/libhttp-parser.la
 
 if ENABLE_APP
 
@@ -61,8 +64,7 @@ HTML_PARSER_OBJECTS += HtmlParser.cc
 endif # HAVE_LIBXML2
 
 nghttp_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} nghttp.cc \
-	${HTML_PARSER_OBJECTS} ${HTML_PARSER_HFILES} \
+	${HTML_PARSER_OBJECTS} ${HTML_PARSER_HFILES}
-	http-parser/http_parser.c http-parser/http_parser.h
 
 nghttpd_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} nghttpd.cc \
 	HttpServer.cc HttpServer.h
@@ -88,8 +90,7 @@ NGHTTPX_SRCS = \
 	shrpx_ssl.cc shrpx_ssl.h \
 	shrpx_thread_event_receiver.cc shrpx_thread_event_receiver.h \
 	shrpx_worker.cc shrpx_worker.h \
-	shrpx_accesslog.cc shrpx_accesslog.h\
+	shrpx_accesslog.cc shrpx_accesslog.h
-	http-parser/http_parser.c http-parser/http_parser.h
 
 if HAVE_SPDYLAY
 NGHTTPX_SRCS += shrpx_spdy_upstream.cc shrpx_spdy_upstream.h

third-party/Makefile.am

@@ -0,0 +1,29 @@
+# nghttp2 - HTTP/2.0 C Library
+
+# Copyright (c) 2014 Tatsuhiro Tsujikawa
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+AM_CPPFLAGS = -Wall @DEFS@
+
+noinst_LTLIBRARIES = libhttp-parser.la
+libhttp_parser_la_SOURCES = \
+	http-parser/http_parser.c \
+	http-parser/http_parser.h