walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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

Remove src/includes
This commit is contained in:
Tatsuhiro Tsujikawa 2022-12-26 21:20:51 +09:00 committed by GitHub
parent 5089dcd3f2 2ca0bb0a2f
commit 5b665b3e48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

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

2
Makefile.am
View File

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

1
examples/Makefile.am
View File

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

1
src/Makefile.am
View File

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

1
tests/CMakeLists.txt
View File

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