diff --git a/src/libs/zbxaudit/Makefile.am b/src/libs/zbxaudit/Makefile.am index a74ca5f4776..d86086fe5e2 100644 --- a/src/libs/zbxaudit/Makefile.am +++ b/src/libs/zbxaudit/Makefile.am @@ -13,3 +13,6 @@ libzbxaudit_a_SOURCES = \ audit_ha.c \ audit_proxy.c \ audit_settings.c + +libzbxaudit_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/libs/zbxdiag/Makefile.am b/src/libs/zbxdiag/Makefile.am index 337c1cb6cc3..ba31f12225b 100644 --- a/src/libs/zbxdiag/Makefile.am +++ b/src/libs/zbxdiag/Makefile.am @@ -3,4 +3,7 @@ noinst_LIBRARIES = libzbxdiag.a libzbxdiag_a_SOURCES = \ - diag.c + diag.c + +libzbxdiag_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/libs/zbxserver/Makefile.am b/src/libs/zbxserver/Makefile.am index b6cbe6ab803..5663d24c512 100644 --- a/src/libs/zbxserver/Makefile.am +++ b/src/libs/zbxserver/Makefile.am @@ -20,4 +20,6 @@ libzbxserver_a_SOURCES = \ calc_checks_eval.c \ evaluate_simple.c -libzbxserver_a_CFLAGS = $(LIBXML2_CFLAGS) +libzbxserver_a_CFLAGS = \ + $(LIBXML2_CFLAGS) \ + $(TLS_CFLAGS) diff --git a/src/libs/zbxstats/Makefile.am b/src/libs/zbxstats/Makefile.am index 70e878d68c1..64f387fe373 100644 --- a/src/libs/zbxstats/Makefile.am +++ b/src/libs/zbxstats/Makefile.am @@ -4,3 +4,6 @@ noinst_LIBRARIES = libzbxstats.a libzbxstats_a_SOURCES = \ stats.c + +libzbxstats_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_proxy/datasender/Makefile.am b/src/zabbix_proxy/datasender/Makefile.am index 8f098b8c8a8..b7a3d9f43d9 100644 --- a/src/zabbix_proxy/datasender/Makefile.am +++ b/src/zabbix_proxy/datasender/Makefile.am @@ -5,3 +5,6 @@ noinst_LIBRARIES = libzbxdatasender.a libzbxdatasender_a_SOURCES = \ datasender.c \ datasender.h + +libzbxdatasender_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_proxy/housekeeper/Makefile.am b/src/zabbix_proxy/housekeeper/Makefile.am index 2f93cf8e5f6..fa9faeb90d6 100644 --- a/src/zabbix_proxy/housekeeper/Makefile.am +++ b/src/zabbix_proxy/housekeeper/Makefile.am @@ -5,3 +5,6 @@ noinst_LIBRARIES = libzbxhousekeeper.a libzbxhousekeeper_a_SOURCES = \ housekeeper.c \ housekeeper.h + +libzbxhousekeeper_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_proxy/proxyconfig/Makefile.am b/src/zabbix_proxy/proxyconfig/Makefile.am index 0d5d718c86d..a2f6fb45b52 100644 --- a/src/zabbix_proxy/proxyconfig/Makefile.am +++ b/src/zabbix_proxy/proxyconfig/Makefile.am @@ -6,4 +6,6 @@ libzbxproxyconfig_a_SOURCES = \ proxyconfig.c \ proxyconfig.h -libzbxproxyconfig_a_CFLAGS = -I$(top_srcdir)/src/zabbix_proxy +libzbxproxyconfig_a_CFLAGS = \ + -I$(top_srcdir)/src/zabbix_proxy \ + $(TLS_CFLAGS) diff --git a/src/zabbix_proxy/proxyconfigwrite/Makefile.am b/src/zabbix_proxy/proxyconfigwrite/Makefile.am index 175513c0de6..5c953240c0f 100644 --- a/src/zabbix_proxy/proxyconfigwrite/Makefile.am +++ b/src/zabbix_proxy/proxyconfigwrite/Makefile.am @@ -6,4 +6,6 @@ libzbxproxyconfigwrite_a_SOURCES = \ proxyconfig_write.c \ proxyconfig_write.h -libzbxproxyconfigwrite_a_CFLAGS = -I$(top_srcdir)/src +libzbxproxyconfigwrite_a_CFLAGS = \ + -I$(top_srcdir)/src \ + $(TLS_CFLAGS) diff --git a/src/zabbix_proxy/rtc/Makefile.am b/src/zabbix_proxy/rtc/Makefile.am index a42f62023ca..19a43284f79 100644 --- a/src/zabbix_proxy/rtc/Makefile.am +++ b/src/zabbix_proxy/rtc/Makefile.am @@ -9,3 +9,5 @@ libzbxrtc_proxy_a_SOURCES = \ rtc_proxy.c \ rtc_proxy.h +libzbxrtc_proxy_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_proxy/stats/Makefile.am b/src/zabbix_proxy/stats/Makefile.am index 52af45a3475..ea3c6423a0d 100644 --- a/src/zabbix_proxy/stats/Makefile.am +++ b/src/zabbix_proxy/stats/Makefile.am @@ -5,3 +5,6 @@ noinst_LIBRARIES = libzbxserver_proxy.a libzbxserver_proxy_a_SOURCES = \ zabbix_stats.h \ proxy_stats.c + +libzbxserver_proxy_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_proxy/taskmanager/Makefile.am b/src/zabbix_proxy/taskmanager/Makefile.am index 112cc99fd65..f1e4552a127 100644 --- a/src/zabbix_proxy/taskmanager/Makefile.am +++ b/src/zabbix_proxy/taskmanager/Makefile.am @@ -6,3 +6,6 @@ libzbxtaskmanager_a_SOURCES = \ server_tasks.c \ taskmanager.c \ taskmanager.h + +libzbxtaskmanager_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/alerter/Makefile.am b/src/zabbix_server/alerter/Makefile.am index de0b935ed7c..c2899f7ffdc 100644 --- a/src/zabbix_server/alerter/Makefile.am +++ b/src/zabbix_server/alerter/Makefile.am @@ -11,4 +11,6 @@ libzbxalerter_a_SOURCES = \ alerter_protocol.c \ alerter_protocol.h -libzbxalerter_a_CFLAGS = $(LIBXML2_CFLAGS) +libzbxalerter_a_CFLAGS = \ + $(LIBXML2_CFLAGS) \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/dbconfig/Makefile.am b/src/zabbix_server/dbconfig/Makefile.am index a0c642ab807..3d470e73945 100644 --- a/src/zabbix_server/dbconfig/Makefile.am +++ b/src/zabbix_server/dbconfig/Makefile.am @@ -9,4 +9,5 @@ libzbxdbconfig_a_SOURCES = \ libzbxdbconfig_a_CFLAGS = \ -I$(top_srcdir)/src/libs/zbxcacheconfig \ -I$(top_srcdir)/src/libs/zbxcachehistory \ - -I$(top_srcdir)/src/libs/zbxcachevalue + -I$(top_srcdir)/src/libs/zbxcachevalue \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/dbsyncer/Makefile.am b/src/zabbix_server/dbsyncer/Makefile.am index 56365722095..33f286a1974 100644 --- a/src/zabbix_server/dbsyncer/Makefile.am +++ b/src/zabbix_server/dbsyncer/Makefile.am @@ -5,3 +5,6 @@ noinst_LIBRARIES = libzbxdbsyncer.a libzbxdbsyncer_a_SOURCES = \ dbsyncer.c \ dbsyncer.h + +libzbxdbsyncer_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/discoverer/Makefile.am b/src/zabbix_server/discoverer/Makefile.am index 70cc9e96cc2..04b05892a18 100644 --- a/src/zabbix_server/discoverer/Makefile.am +++ b/src/zabbix_server/discoverer/Makefile.am @@ -5,3 +5,6 @@ noinst_LIBRARIES = libzbxdiscoverer.a libzbxdiscoverer_a_SOURCES = \ discoverer.c \ discoverer.h + +libzbxdiscoverer_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/escalator/Makefile.am b/src/zabbix_server/escalator/Makefile.am index 371f47782d2..b636364c325 100644 --- a/src/zabbix_server/escalator/Makefile.am +++ b/src/zabbix_server/escalator/Makefile.am @@ -5,3 +5,6 @@ noinst_LIBRARIES = libzbxescalator.a libzbxescalator_a_SOURCES = \ escalator.c \ escalator.h + +libzbxescalator_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/ha/Makefile.am b/src/zabbix_server/ha/Makefile.am index 0baf600482a..f04e2f074e2 100644 --- a/src/zabbix_server/ha/Makefile.am +++ b/src/zabbix_server/ha/Makefile.am @@ -5,3 +5,6 @@ noinst_LIBRARIES = libzbxha.a libzbxha_a_SOURCES = \ ha_manager.c \ ha.h + +libzbxha_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/housekeeper/Makefile.am b/src/zabbix_server/housekeeper/Makefile.am index dd629b5954a..f392735452d 100644 --- a/src/zabbix_server/housekeeper/Makefile.am +++ b/src/zabbix_server/housekeeper/Makefile.am @@ -9,3 +9,6 @@ libzbxhousekeeper_a_SOURCES = \ history_compress.h \ trigger_housekeeper.c \ trigger_housekeeper.h + +libzbxhousekeeper_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/httppoller/Makefile.am b/src/zabbix_server/httppoller/Makefile.am index 60050e3f1e8..892db11b1ef 100644 --- a/src/zabbix_server/httppoller/Makefile.am +++ b/src/zabbix_server/httppoller/Makefile.am @@ -9,3 +9,6 @@ libzbxhttppoller_a_SOURCES = \ httppoller.h \ httptest.c \ httptest.h + +libzbxhttppoller_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/ipmi/Makefile.am b/src/zabbix_server/ipmi/Makefile.am index 0b64ea61cd0..949726308d4 100644 --- a/src/zabbix_server/ipmi/Makefile.am +++ b/src/zabbix_server/ipmi/Makefile.am @@ -14,4 +14,6 @@ libipmi_a_SOURCES = \ ipmi_protocol.c \ ipmi_protocol.h -libipmi_a_CFLAGS = $(OPENIPMI_CFLAGS) +libipmi_a_CFLAGS = \ + $(OPENIPMI_CFLAGS) \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/lld/Makefile.am b/src/zabbix_server/lld/Makefile.am index 176ee78403a..ff29a9b68c7 100644 --- a/src/zabbix_server/lld/Makefile.am +++ b/src/zabbix_server/lld/Makefile.am @@ -17,4 +17,6 @@ libzbxlld_a_SOURCES = \ lld_worker.c \ lld_worker.h -libzbxlld_a_CFLAGS = $(LIBXML2_CFLAGS) +libzbxlld_a_CFLAGS = \ + $(LIBXML2_CFLAGS) \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/pinger/Makefile.am b/src/zabbix_server/pinger/Makefile.am index 7ec738b686e..fbf25db7979 100644 --- a/src/zabbix_server/pinger/Makefile.am +++ b/src/zabbix_server/pinger/Makefile.am @@ -5,3 +5,6 @@ noinst_LIBRARIES = libzbxpinger.a libzbxpinger_a_SOURCES = \ pinger.c \ pinger.h + +libzbxpinger_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/poller/Makefile.am b/src/zabbix_server/poller/Makefile.am index b18661c6e37..c5a2dd912f7 100644 --- a/src/zabbix_server/poller/Makefile.am +++ b/src/zabbix_server/poller/Makefile.am @@ -59,9 +59,14 @@ libzbxpoller_a_CFLAGS = \ $(SNMP_CFLAGS) \ $(SSH2_CFLAGS) \ $(SSH_CFLAGS) \ - $(LIBXML2_CFLAGS) + $(LIBXML2_CFLAGS) \ + $(TLS_CFLAGS) libzbxpoller_server_a_CFLAGS = \ -I$(top_srcdir)/src/libs/zbxcacheconfig \ -I$(top_srcdir)/src/libs/zbxcachehistory \ - -I$(top_srcdir)/src/libs/zbxcachevalue + -I$(top_srcdir)/src/libs/zbxcachevalue \ + $(TLS_CFLAGS) + +libzbxpoller_proxy_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/preprocessor/Makefile.am b/src/zabbix_server/preprocessor/Makefile.am index 4ede95964d2..fe31aec483b 100644 --- a/src/zabbix_server/preprocessor/Makefile.am +++ b/src/zabbix_server/preprocessor/Makefile.am @@ -20,4 +20,5 @@ libpreprocessor_a_SOURCES = \ preproc_snmp.h libpreprocessor_a_CFLAGS = \ - $(LIBXML2_CFLAGS) + $(LIBXML2_CFLAGS) \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/proxyconfigread/Makefile.am b/src/zabbix_server/proxyconfigread/Makefile.am index 729575b5f3b..df6997907ac 100644 --- a/src/zabbix_server/proxyconfigread/Makefile.am +++ b/src/zabbix_server/proxyconfigread/Makefile.am @@ -6,4 +6,6 @@ libzbxproxyconfigread_a_SOURCES = \ proxyconfig_read.c \ proxyconfig_read.h -libzbxproxyconfigread_a_CFLAGS = -I$(top_srcdir)/src +libzbxproxyconfigread_a_CFLAGS = \ + -I$(top_srcdir)/src \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/proxypoller/Makefile.am b/src/zabbix_server/proxypoller/Makefile.am index a2dfa58e1d1..eea30b8b934 100644 --- a/src/zabbix_server/proxypoller/Makefile.am +++ b/src/zabbix_server/proxypoller/Makefile.am @@ -6,4 +6,6 @@ libzbxproxypoller_a_SOURCES = \ proxypoller.c \ proxypoller.h -libzbxproxypoller_a_CFLAGS = -I$(top_srcdir)/src/zabbix_server +libzbxproxypoller_a_CFLAGS = \ + -I$(top_srcdir)/src/zabbix_server \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/reporter/Makefile.am b/src/zabbix_server/reporter/Makefile.am index fd5b31122ef..37ddc25fb1b 100644 --- a/src/zabbix_server/reporter/Makefile.am +++ b/src/zabbix_server/reporter/Makefile.am @@ -10,3 +10,5 @@ libzbxreporter_a_SOURCES = \ report_protocol.c \ report_protocol.h +libzbxreporter_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/scripts/Makefile.am b/src/zabbix_server/scripts/Makefile.am index 817b0cdb388..1c688f596d0 100644 --- a/src/zabbix_server/scripts/Makefile.am +++ b/src/zabbix_server/scripts/Makefile.am @@ -5,3 +5,6 @@ noinst_LIBRARIES = libzbxscripts.a libzbxscripts_a_SOURCES = \ scripts.c \ scripts.h + +libzbxscripts_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/service/Makefile.am b/src/zabbix_server/service/Makefile.am index cdceb60e0fd..a1ec089371c 100644 --- a/src/zabbix_server/service/Makefile.am +++ b/src/zabbix_server/service/Makefile.am @@ -8,3 +8,6 @@ libservice_a_SOURCES = \ service_manager_impl.h \ service_actions.c \ service_actions.h + +libservice_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/snmptrapper/Makefile.am b/src/zabbix_server/snmptrapper/Makefile.am index 1d36a8808c5..eb4e881707c 100644 --- a/src/zabbix_server/snmptrapper/Makefile.am +++ b/src/zabbix_server/snmptrapper/Makefile.am @@ -5,3 +5,6 @@ noinst_LIBRARIES = libzbxsnmptrapper.a libzbxsnmptrapper_a_SOURCES = \ snmptrapper.c \ snmptrapper.h + +libzbxsnmptrapper_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/stats/Makefile.am b/src/zabbix_server/stats/Makefile.am index c8f323616da..b5784cfb34e 100644 --- a/src/zabbix_server/stats/Makefile.am +++ b/src/zabbix_server/stats/Makefile.am @@ -9,4 +9,5 @@ libzbxserver_server_a_SOURCES = \ libzbxserver_server_a_CFLAGS = \ -I$(top_srcdir)/src/libs/zbxcacheconfig \ -I$(top_srcdir)/src/libs/zbxcachehistory \ - -I$(top_srcdir)/src/libs/zbxcachevalue + -I$(top_srcdir)/src/libs/zbxcachevalue \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/taskmanager/Makefile.am b/src/zabbix_server/taskmanager/Makefile.am index dec8fddd202..5c17e4d6673 100644 --- a/src/zabbix_server/taskmanager/Makefile.am +++ b/src/zabbix_server/taskmanager/Makefile.am @@ -6,3 +6,6 @@ libzbxtaskmanager_a_SOURCES = \ proxy_tasks.c \ taskmanager.c \ taskmanager.h + +libzbxtaskmanager_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/timer/Makefile.am b/src/zabbix_server/timer/Makefile.am index 0f19ffb7409..763558a19f1 100644 --- a/src/zabbix_server/timer/Makefile.am +++ b/src/zabbix_server/timer/Makefile.am @@ -5,3 +5,6 @@ noinst_LIBRARIES = libzbxtimer.a libzbxtimer_a_SOURCES = \ timer.c \ timer.h + +libzbxtimer_a_CFLAGS = \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/trapper/Makefile.am b/src/zabbix_server/trapper/Makefile.am index 1b5a820967a..be55abe6038 100644 --- a/src/zabbix_server/trapper/Makefile.am +++ b/src/zabbix_server/trapper/Makefile.am @@ -30,8 +30,13 @@ libzbxtrapper_proxy_a_SOURCES = \ trapper_request.h libzbxtrapper_a_CFLAGS = \ - $(LIBXML2_CFLAGS) + $(LIBXML2_CFLAGS) \ + $(TLS_CFLAGS) -libzbxtrapper_server_a_CFLAGS = -I$(top_srcdir)/src/zabbix_server +libzbxtrapper_server_a_CFLAGS = \ + -I$(top_srcdir)/src/zabbix_server \ + $(TLS_CFLAGS) -libzbxtrapper_proxy_a_CFLAGS = -I$(top_srcdir)/src/zabbix_proxy +libzbxtrapper_proxy_a_CFLAGS = \ + -I$(top_srcdir)/src/zabbix_proxy \ + $(TLS_CFLAGS) diff --git a/src/zabbix_server/vmware/Makefile.am b/src/zabbix_server/vmware/Makefile.am index 845052c82e0..5673d90b3da 100644 --- a/src/zabbix_server/vmware/Makefile.am +++ b/src/zabbix_server/vmware/Makefile.am @@ -9,4 +9,6 @@ libzbxvmware_a_SOURCES = \ vmware_manager.c \ vmware.h -libzbxvmware_a_CFLAGS = $(LIBXML2_CFLAGS) +libzbxvmware_a_CFLAGS = \ + $(LIBXML2_CFLAGS) \ + $(TLS_CFLAGS)