From 2ca0bb0a2fd5faeef0a27c07216f76727981dad2 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Mon, 26 Dec 2022 19:45:12 +0900 Subject: [PATCH] Remove src/includes --- CMakeLists.txt | 1 - Makefile.am | 2 +- examples/Makefile.am | 1 - src/Makefile.am | 1 - tests/CMakeLists.txt | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c8d87a5..80df80ee 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/Makefile.am b/Makefile.am index a7cb1af2..7086674e 100644 --- a/Makefile.am +++ b/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 diff --git a/examples/Makefile.am b/examples/Makefile.am index b23a3414..7b682ed4 100644 --- a/examples/Makefile.am +++ b/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@ \ diff --git a/src/Makefile.am b/src/Makefile.am index 63ad1a34..d334b888 100644 --- a/src/Makefile.am +++ b/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@ \ diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index bcd0d4af..e8a5adbd 100644 --- a/tests/CMakeLists.txt +++ b/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} )