Merge pull request #1848 from nghttp2/remove-src-includes

Remove src/includes

CMakeLists.txt

@@ -474,7 +474,6 @@ add_subdirectory(lib)
 #add_subdirectory(lib/includes)
 add_subdirectory(third-party)
 add_subdirectory(src)
-#add_subdirectory(src/includes)
 add_subdirectory(examples)
 add_subdirectory(tests)
 #add_subdirectory(tests/testdata)

Makefile.am

@@ -55,5 +55,5 @@ clang-format:
 	CLANGFORMAT=`git config --get clangformat.binary`; \
 	test -z $${CLANGFORMAT} && CLANGFORMAT="clang-format"; \
 	$${CLANGFORMAT} -i lib/*.{c,h} lib/includes/nghttp2/*.h \
-	src/*.{c,cc,h} src/includes/nghttp2/*.h examples/*.{c,cc} \
+	src/*.{c,cc,h} examples/*.{c,cc} \
 	tests/*.{c,h} bpf/*.c fuzz/*.cc

examples/Makefile.am

@@ -30,7 +30,6 @@ AM_CXXFLAGS = $(WARNCXXFLAGS) $(CXX1XCXXFLAGS)
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/includes \
 	-I$(top_builddir)/lib/includes \
-	-I$(top_srcdir)/src/includes \
 	-I$(top_srcdir)/third-party \
 	@LIBEVENT_OPENSSL_CFLAGS@ \
 	@OPENSSL_CFLAGS@ \

src/Makefile.am

@@ -37,7 +37,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/includes \
 	-I$(top_builddir)/lib/includes \
 	-I$(top_srcdir)/lib \
-	-I$(top_srcdir)/src/includes \
 	-I$(top_srcdir)/third-party \
 	-I$(top_srcdir)/third-party/llhttp/include \
 	@JEMALLOC_CFLAGS@ \

tests/CMakeLists.txt

@@ -6,7 +6,6 @@ if(HAVE_CUNIT)
   include_directories(
     "${CMAKE_SOURCE_DIR}/lib/includes"
     "${CMAKE_SOURCE_DIR}/lib"
-    "${CMAKE_SOURCE_DIR}/src/includes"
     "${CMAKE_BINARY_DIR}/lib/includes"
     ${CUNIT_INCLUDE_DIRS}
   )