Browse Source

[mod_secdownload] include algo_hmac.c in mod

algo_hmac.c used only with mod_secdownload,
so include algo_hmac.c in mod_secdownload instead of lighttpd executable
master
Glenn Strauss 7 months ago
parent
commit
29b9735338
  1. 4
      src/CMakeLists.txt
  2. 6
      src/Makefile.am
  3. 4
      src/SConscript
  4. 3
      src/meson.build

4
src/CMakeLists.txt

@ -753,7 +753,7 @@ set(COMMON_SRC
http_header.c http_kv.c keyvalue.c chunk.c
http_chunk.c fdevent.c gw_backend.c
stat_cache.c plugin.c http_etag.c array.c
algo_hmac.c algo_md5.c algo_sha1.c algo_splaytree.c
algo_md5.c algo_sha1.c algo_splaytree.c
fdevent_select.c fdevent_libev.c
fdevent_poll.c fdevent_linux_sysepoll.c
fdevent_solaris_devpoll.c fdevent_solaris_port.c
@ -829,7 +829,7 @@ add_and_install_library(mod_redirect mod_redirect.c)
add_and_install_library(mod_rewrite mod_rewrite.c)
add_and_install_library(mod_rrdtool mod_rrdtool.c)
add_and_install_library(mod_scgi mod_scgi.c)
add_and_install_library(mod_secdownload mod_secdownload.c)
add_and_install_library(mod_secdownload "mod_secdownload.c;algo_hmac.c")
add_and_install_library(mod_setenv mod_setenv.c)
add_and_install_library(mod_simple_vhost mod_simple_vhost.c)
add_and_install_library(mod_sockproxy mod_sockproxy.c)

6
src/Makefile.am

@ -73,7 +73,7 @@ common_src=base64.c buffer.c burl.c log.c \
http_header.c http_kv.c keyvalue.c chunk.c \
http_chunk.c fdevent.c gw_backend.c \
stat_cache.c plugin.c http_etag.c array.c \
algo_hmac.c algo_md5.c algo_sha1.c algo_splaytree.c \
algo_md5.c algo_sha1.c algo_splaytree.c \
fdevent_select.c fdevent_libev.c \
fdevent_poll.c fdevent_linux_sysepoll.c \
fdevent_solaris_devpoll.c fdevent_solaris_port.c \
@ -282,7 +282,7 @@ mod_ssi_la_LDFLAGS = $(common_module_ldflags)
mod_ssi_la_LIBADD = $(common_libadd)
lib_LTLIBRARIES += mod_secdownload.la
mod_secdownload_la_SOURCES = mod_secdownload.c
mod_secdownload_la_SOURCES = mod_secdownload.c algo_hmac.c
mod_secdownload_la_LDFLAGS = $(common_module_ldflags)
mod_secdownload_la_LIBADD = $(common_libadd) $(CRYPTO_LIB)
@ -516,7 +516,7 @@ lighttpd_SOURCES = \
mod_rewrite.c \
mod_rrdtool.c \
mod_scgi.c \
mod_secdownload.c \
mod_secdownload.c algo_hmac.c \
mod_setenv.c \
mod_simple_vhost.c \
mod_ssi_exprparser.c mod_ssi_expr.c mod_ssi.c \

4
src/SConscript

@ -59,7 +59,7 @@ common_src = Split("base64.c buffer.c burl.c log.c \
http_header.c http_kv.c keyvalue.c chunk.c \
http_chunk.c fdevent.c gw_backend.c \
stat_cache.c plugin.c http_etag.c array.c \
algo_hmac.c algo_md5.c algo_sha1.c algo_splaytree.c \
algo_md5.c algo_sha1.c algo_splaytree.c \
fdevent_select.c fdevent_libev.c \
fdevent_poll.c fdevent_linux_sysepoll.c \
fdevent_solaris_devpoll.c fdevent_solaris_port.c \
@ -118,7 +118,7 @@ modules = {
'mod_rewrite' : { 'src' : [ 'mod_rewrite.c' ] },
'mod_rrdtool' : { 'src' : [ 'mod_rrdtool.c' ] },
'mod_scgi' : { 'src' : [ 'mod_scgi.c' ] },
'mod_secdownload' : { 'src' : [ 'mod_secdownload.c' ], 'lib' : [ env['LIBCRYPTO'] ] },
'mod_secdownload' : { 'src' : [ 'mod_secdownload.c', 'algo_hmac.c' ], 'lib' : [ env['LIBCRYPTO'] ] },
'mod_setenv' : { 'src' : [ 'mod_setenv.c' ] },
'mod_simple_vhost' : { 'src' : [ 'mod_simple_vhost.c' ] },
'mod_sockproxy' : { 'src' : [ 'mod_sockproxy.c' ] },

3
src/meson.build

@ -706,7 +706,6 @@ configure_file(
)
common_src = [
'algo_hmac.c',
'algo_md5.c',
'algo_sha1.c',
'algo_splaytree.c',
@ -1000,7 +999,7 @@ modules = [
[ 'mod_rewrite', [ 'mod_rewrite.c' ] ],
[ 'mod_rrdtool', [ 'mod_rrdtool.c' ] ],
[ 'mod_scgi', [ 'mod_scgi.c' ], libws2_32 ],
[ 'mod_secdownload', [ 'mod_secdownload.c' ], libcrypto ],
[ 'mod_secdownload', [ 'mod_secdownload.c', 'algo_hmac.c' ], libcrypto ],
[ 'mod_setenv', [ 'mod_setenv.c' ] ],
[ 'mod_simple_vhost', [ 'mod_simple_vhost.c' ] ],
[ 'mod_sockproxy', [ 'mod_sockproxy.c' ] ],

Loading…
Cancel
Save