From d6bd929e5d05bbbae766c82825aaa2b6d7425b6b Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Sat, 29 Sep 2018 22:09:58 -0400 Subject: [PATCH] [build] put request.c in common src put request.c in common src for CMake, SCons, and meson builds (request.c is already in common source list in Makefile.am) --- src/CMakeLists.txt | 2 +- src/SConscript | 3 ++- src/meson.build | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0da3a469..c4969497 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -580,6 +580,7 @@ set(COMMON_SRC http-header-glue.c http_auth.c http_vhostdb.c + request.c sock_addr.c splaytree.c rand.c @@ -612,7 +613,6 @@ add_executable(lighttpd network_write.c configfile.c configparser.c - request.c ${COMMON_SRC} ) set(L_INSTALL_TARGETS ${L_INSTALL_TARGETS} lighttpd) diff --git a/src/SConscript b/src/SConscript index 554b2d79..3263e525 100644 --- a/src/SConscript +++ b/src/SConscript @@ -73,6 +73,7 @@ common_src = Split("base64.c buffer.c burl.c log.c \ http-header-glue.c \ http_auth.c \ http_vhostdb.c \ + request.c \ sock_addr.c \ splaytree.c \ rand.c \ @@ -83,7 +84,7 @@ src = Split("server.c response.c connections.c \ inet_ntop_cache.c \ network.c \ network_write.c \ - configfile.c configparser.c request.c") + configfile.c configparser.c") lemon = env.Program('lemon', 'lemon.c', LIBS = GatherLibs(env)) diff --git a/src/meson.build b/src/meson.build index 4717eaa7..52a422b7 100644 --- a/src/meson.build +++ b/src/meson.build @@ -585,6 +585,7 @@ common_src = [ 'md5.c', 'plugin.c', 'rand.c', + 'request.c', 'safe_memclear.c', 'sock_addr.c', 'splaytree.c', @@ -601,7 +602,6 @@ main_src = [ 'inet_ntop_cache.c', 'network_write.c', 'network.c', - 'request.c', 'response.c', 'server.c', ]