8267384d1 · cryptotaxi247/netdata-1

@@ -948,103 +948,101 @@ HTTPD_FILES = \

948 httpd/h2o_utils.h \

949 $(NULL)

950

951 -libh2o_dir = httpd/h2o

952 -

951 libh2o_a_SOURCES = \

954 - $(libh2o_dir)/deps/cloexec/cloexec.c \

955 - $(libh2o_dir)/deps/libgkc/gkc.c \

956 - $(libh2o_dir)/deps/libyrmcds/close.c \

957 - $(libh2o_dir)/deps/libyrmcds/connect.c \

958 - $(libh2o_dir)/deps/libyrmcds/recv.c \

959 - $(libh2o_dir)/deps/libyrmcds/send.c \

960 - $(libh2o_dir)/deps/libyrmcds/send_text.c \

961 - $(libh2o_dir)/deps/libyrmcds/socket.c \

962 - $(libh2o_dir)/deps/libyrmcds/strerror.c \

963 - $(libh2o_dir)/deps/libyrmcds/text_mode.c \

964 - $(libh2o_dir)/deps/picohttpparser/picohttpparser.c \

965 - $(libh2o_dir)/lib/common/cache.c \

966 - $(libh2o_dir)/lib/common/file.c \

967 - $(libh2o_dir)/lib/common/filecache.c \

968 - $(libh2o_dir)/lib/common/hostinfo.c \

969 - $(libh2o_dir)/lib/common/http1client.c \

970 - $(libh2o_dir)/lib/common/memcached.c \

971 - $(libh2o_dir)/lib/common/memory.c \

972 - $(libh2o_dir)/lib/common/multithread.c \

973 - $(libh2o_dir)/lib/common/serverutil.c \

974 - $(libh2o_dir)/lib/common/socket.c \

975 - $(libh2o_dir)/lib/common/socketpool.c \

976 - $(libh2o_dir)/lib/common/string.c \

977 - $(libh2o_dir)/lib/common/time.c \

978 - $(libh2o_dir)/lib/common/timeout.c \

979 - $(libh2o_dir)/lib/common/url.c \

980 - $(libh2o_dir)/lib/core/config.c \

981 - $(libh2o_dir)/lib/core/configurator.c \

982 - $(libh2o_dir)/lib/core/context.c \

983 - $(libh2o_dir)/lib/core/headers.c \

984 - $(libh2o_dir)/lib/core/logconf.c \

985 - $(libh2o_dir)/lib/core/proxy.c \

986 - $(libh2o_dir)/lib/core/request.c \

987 - $(libh2o_dir)/lib/core/token.c \

988 - $(libh2o_dir)/lib/core/util.c \

989 - $(libh2o_dir)/lib/handler/access_log.c \

990 - $(libh2o_dir)/lib/handler/chunked.c \

991 - $(libh2o_dir)/lib/handler/compress.c \

992 - $(libh2o_dir)/lib/handler/compress/gzip.c \

993 - $(libh2o_dir)/lib/handler/errordoc.c \

994 - $(libh2o_dir)/lib/handler/expires.c \

995 - $(libh2o_dir)/lib/handler/fastcgi.c \

996 - $(libh2o_dir)/lib/handler/file.c \

997 - $(libh2o_dir)/lib/handler/headers.c \

998 - $(libh2o_dir)/lib/handler/mimemap.c \

999 - $(libh2o_dir)/lib/handler/proxy.c \

1000 - $(libh2o_dir)/lib/handler/redirect.c \

1001 - $(libh2o_dir)/lib/handler/reproxy.c \

1002 - $(libh2o_dir)/lib/handler/throttle_resp.c \

1003 - $(libh2o_dir)/lib/handler/status.c \

1004 - $(libh2o_dir)/lib/handler/headers_util.c \

1005 - $(libh2o_dir)/lib/handler/status/events.c \

1006 - $(libh2o_dir)/lib/handler/status/requests.c \

1007 - $(libh2o_dir)/lib/handler/http2_debug_state.c \

1008 - $(libh2o_dir)/lib/handler/status/durations.c \

1009 - $(libh2o_dir)/lib/handler/configurator/access_log.c \

1010 - $(libh2o_dir)/lib/handler/configurator/compress.c \

1011 - $(libh2o_dir)/lib/handler/configurator/errordoc.c \

1012 - $(libh2o_dir)/lib/handler/configurator/expires.c \

1013 - $(libh2o_dir)/lib/handler/configurator/fastcgi.c \

1014 - $(libh2o_dir)/lib/handler/configurator/file.c \

1015 - $(libh2o_dir)/lib/handler/configurator/headers.c \

1016 - $(libh2o_dir)/lib/handler/configurator/proxy.c \

1017 - $(libh2o_dir)/lib/handler/configurator/redirect.c \

1018 - $(libh2o_dir)/lib/handler/configurator/reproxy.c \

1019 - $(libh2o_dir)/lib/handler/configurator/throttle_resp.c \

1020 - $(libh2o_dir)/lib/handler/configurator/status.c \

1021 - $(libh2o_dir)/lib/handler/configurator/http2_debug_state.c \

1022 - $(libh2o_dir)/lib/handler/configurator/headers_util.c \

1023 - $(libh2o_dir)/lib/http1.c \

1024 - $(libh2o_dir)/lib/tunnel.c \

1025 - $(libh2o_dir)/lib/http2/cache_digests.c \

1026 - $(libh2o_dir)/lib/http2/casper.c \

1027 - $(libh2o_dir)/lib/http2/connection.c \

1028 - $(libh2o_dir)/lib/http2/frame.c \

1029 - $(libh2o_dir)/lib/http2/hpack.c \

1030 - $(libh2o_dir)/lib/http2/scheduler.c \

1031 - $(libh2o_dir)/lib/http2/stream.c \

1032 - $(libh2o_dir)/lib/http2/http2_debug_state.c \

952 + httpd/h2o/deps/cloexec/cloexec.c \

953 + httpd/h2o/deps/libgkc/gkc.c \

954 + httpd/h2o/deps/libyrmcds/close.c \

955 + httpd/h2o/deps/libyrmcds/connect.c \

956 + httpd/h2o/deps/libyrmcds/recv.c \

957 + httpd/h2o/deps/libyrmcds/send.c \

958 + httpd/h2o/deps/libyrmcds/send_text.c \

959 + httpd/h2o/deps/libyrmcds/socket.c \

960 + httpd/h2o/deps/libyrmcds/strerror.c \

961 + httpd/h2o/deps/libyrmcds/text_mode.c \

962 + httpd/h2o/deps/picohttpparser/picohttpparser.c \

963 + httpd/h2o/lib/common/cache.c \

964 + httpd/h2o/lib/common/file.c \

965 + httpd/h2o/lib/common/filecache.c \

966 + httpd/h2o/lib/common/hostinfo.c \

967 + httpd/h2o/lib/common/http1client.c \

968 + httpd/h2o/lib/common/memcached.c \

969 + httpd/h2o/lib/common/memory.c \

970 + httpd/h2o/lib/common/multithread.c \

971 + httpd/h2o/lib/common/serverutil.c \

972 + httpd/h2o/lib/common/socket.c \

973 + httpd/h2o/lib/common/socketpool.c \

974 + httpd/h2o/lib/common/string.c \

975 + httpd/h2o/lib/common/time.c \

976 + httpd/h2o/lib/common/timeout.c \

977 + httpd/h2o/lib/common/url.c \

978 + httpd/h2o/lib/core/config.c \

979 + httpd/h2o/lib/core/configurator.c \

980 + httpd/h2o/lib/core/context.c \

981 + httpd/h2o/lib/core/headers.c \

982 + httpd/h2o/lib/core/logconf.c \

983 + httpd/h2o/lib/core/proxy.c \

984 + httpd/h2o/lib/core/request.c \

985 + httpd/h2o/lib/core/token.c \

986 + httpd/h2o/lib/core/util.c \

987 + httpd/h2o/lib/handler/access_log.c \

988 + httpd/h2o/lib/handler/chunked.c \

989 + httpd/h2o/lib/handler/compress.c \

990 + httpd/h2o/lib/handler/compress/gzip.c \

991 + httpd/h2o/lib/handler/errordoc.c \

992 + httpd/h2o/lib/handler/expires.c \

993 + httpd/h2o/lib/handler/fastcgi.c \

994 + httpd/h2o/lib/handler/file.c \

995 + httpd/h2o/lib/handler/headers.c \

996 + httpd/h2o/lib/handler/mimemap.c \

997 + httpd/h2o/lib/handler/proxy.c \

998 + httpd/h2o/lib/handler/redirect.c \

999 + httpd/h2o/lib/handler/reproxy.c \

1000 + httpd/h2o/lib/handler/throttle_resp.c \

1001 + httpd/h2o/lib/handler/status.c \

1002 + httpd/h2o/lib/handler/headers_util.c \

1003 + httpd/h2o/lib/handler/status/events.c \

1004 + httpd/h2o/lib/handler/status/requests.c \

1005 + httpd/h2o/lib/handler/http2_debug_state.c \

1006 + httpd/h2o/lib/handler/status/durations.c \

1007 + httpd/h2o/lib/handler/configurator/access_log.c \

1008 + httpd/h2o/lib/handler/configurator/compress.c \

1009 + httpd/h2o/lib/handler/configurator/errordoc.c \

1010 + httpd/h2o/lib/handler/configurator/expires.c \

1011 + httpd/h2o/lib/handler/configurator/fastcgi.c \

1012 + httpd/h2o/lib/handler/configurator/file.c \

1013 + httpd/h2o/lib/handler/configurator/headers.c \

1014 + httpd/h2o/lib/handler/configurator/proxy.c \

1015 + httpd/h2o/lib/handler/configurator/redirect.c \

1016 + httpd/h2o/lib/handler/configurator/reproxy.c \

1017 + httpd/h2o/lib/handler/configurator/throttle_resp.c \

1018 + httpd/h2o/lib/handler/configurator/status.c \

1019 + httpd/h2o/lib/handler/configurator/http2_debug_state.c \

1020 + httpd/h2o/lib/handler/configurator/headers_util.c \

1021 + httpd/h2o/lib/http1.c \

1022 + httpd/h2o/lib/tunnel.c \

1023 + httpd/h2o/lib/http2/cache_digests.c \

1024 + httpd/h2o/lib/http2/casper.c \

1025 + httpd/h2o/lib/http2/connection.c \

1026 + httpd/h2o/lib/http2/frame.c \

1027 + httpd/h2o/lib/http2/hpack.c \

1028 + httpd/h2o/lib/http2/scheduler.c \

1029 + httpd/h2o/lib/http2/stream.c \

1030 + httpd/h2o/lib/http2/http2_debug_state.c \

1031 $(NULL)

1032

1033 libh2o_a_INCLUDES = \

1036 - -I$(srcdir)/$(libh2o_dir)/include \

1037 - -I$(srcdir)/$(libh2o_dir)/deps/cloexec \

1038 - -I$(srcdir)/$(libh2o_dir)/deps/brotli/enc \

1039 - -I$(srcdir)/$(libh2o_dir)/deps/golombset \

1040 - -I$(srcdir)/$(libh2o_dir)/deps/libgkc \

1041 - -I$(srcdir)/$(libh2o_dir)/deps/libyrmcds \

1042 - -I$(srcdir)/$(libh2o_dir)/deps/klib \

1043 - -I$(srcdir)/$(libh2o_dir)/deps/neverbleed \

1044 - -I$(srcdir)/$(libh2o_dir)/deps/picohttpparser \

1045 - -I$(srcdir)/$(libh2o_dir)/deps/picotest \

1046 - -I$(srcdir)/$(libh2o_dir)/deps/yaml/include \

1047 - -I$(srcdir)/$(libh2o_dir)/deps/yoml \

1034 + -I$(srcdir)/httpd/h2o/include \

1035 + -I$(srcdir)/httpd/h2o/deps/cloexec \

1036 + -I$(srcdir)/httpd/h2o/deps/brotli/enc \

1037 + -I$(srcdir)/httpd/h2o/deps/golombset \

1038 + -I$(srcdir)/httpd/h2o/deps/libgkc \

1039 + -I$(srcdir)/httpd/h2o/deps/libyrmcds \

1040 + -I$(srcdir)/httpd/h2o/deps/klib \

1041 + -I$(srcdir)/httpd/h2o/deps/neverbleed \

1042 + -I$(srcdir)/httpd/h2o/deps/picohttpparser \

1043 + -I$(srcdir)/httpd/h2o/deps/picotest \

1044 + -I$(srcdir)/httpd/h2o/deps/yaml/include \

1045 + -I$(srcdir)/httpd/h2o/deps/yoml \

1046 $(NULL)

1047

1048 if ENABLE_HTTPD

Fix $(libh2o_dir) not expanded properly sometimes. (#15253)