diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-12-29 12:16:18 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-12-29 12:16:18 +0000 |
| commit | c435b65a5cd697cef4d32311ce4fd9625eb87a4b (patch) | |
| tree | aa71f6613fc0262cfb63895bb19723b66c9b4062 /src | |
| parent | bf7efa8477569087226c12c865306c6ada18fb54 (diff) | |
- seperartion of LDFLAGS and LIBS in all Makefile.am (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@2449 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_agent/Makefile.am | 6 | ||||
| -rw-r--r-- | src/zabbix_server/Makefile.am | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am index efa21bb0..631f0910 100644 --- a/src/zabbix_agent/Makefile.am +++ b/src/zabbix_agent/Makefile.am @@ -1,11 +1,13 @@ SUBDIRS = bin_PROGRAMS = zabbix_agent zabbix_agentd zabbix_agent_SOURCES = zabbix_agent.c +zabbix_agent_LDFLAGS = @LDAP_LFLAGS@ zabbix_agent_LDADD = ../libs/zbxsysinfo/libzbxsysinfo.a ../libs/zbxsysinfo/@ARCH@/libzbxsysinfo2.a \ ../libs/zbxlog/libzbxlog.a \ ../libs/zbxcrypto/libzbxcrypto.a ../libs/zbxnet/libzbxnet.a ../libs/zbxconf/libzbxconf.a \ -../libs/zbxcommon/libzbxcommon.a @LDAP_LFLAGS@ +../libs/zbxcommon/libzbxcommon.a @LDAP_LIBS@ zabbix_agentd_SOURCES = active.c cpustat.c diskdevices.c interfaces.c logfiles.c stats.c zabbix_agentd.c +zabbix_agentd_LDFLAGS = @LDAP_LFLAGS@ zabbix_agentd_LDADD = ../libs/zbxsysinfo/libzbxsysinfo.a ../libs/zbxsysinfo/@ARCH@/libzbxsysinfo2.a ../libs/zbxlog/libzbxlog.a ../libs/zbxcrypto/libzbxcrypto.a \ ../libs/zbxpid/libzbxpid.a ../libs/zbxnet/libzbxnet.a ../libs/zbxconf/libzbxconf.a \ -../libs/zbxcommon/libzbxcommon.a @LDAP_LFLAGS@ +../libs/zbxcommon/libzbxcommon.a @LDAP_LIBS@ diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am index 5d773a36..c35a813b 100644 --- a/src/zabbix_server/Makefile.am +++ b/src/zabbix_server/Makefile.am @@ -1,8 +1,8 @@ SUBDIRS = alerter escalator housekeeper pinger poller timer trapper INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@ @SNMP_INCLUDE@ -LIBS=@LIBS@ @MYSQL_LFLAGS@ @PGSQL_LFLAGS@ @LDAP_LFLAGS@ @SNMP_LFLAGS@ bin_PROGRAMS = zabbix_server zabbix_server_SOURCES = evalfunc.c expression.c actions.c zlog.c functions.c server.c zabbix_server_LDADD = ../libs/zbxsysinfo/libzbxsysinfo.a ../libs/zbxsysinfo/@ARCH@/libzbxsysinfo2.a \ -../libs/zbxlog/libzbxlog.a ../libs/zbxpid/libzbxpid.a ../libs/zbxconf/libzbxconf.a ../libs/zbxcrypto/libzbxcrypto.a ../libs/zbxnet/libzbxnet.a pinger/libzbxpinger.a poller/libzbxpoller.a escalator/libzbxescalator.a housekeeper/libzbxhousekeeper.a alerter/libzbxalerter.a timer/libzbxtimer.a trapper/libzbxtrapper.a ../libs/zbxemail/libzbxemail.a ../libs/zbxdbhigh/libzbxdbhigh.a ../libs/zbxcommon/libzbxcommon.a +../libs/zbxlog/libzbxlog.a ../libs/zbxpid/libzbxpid.a ../libs/zbxconf/libzbxconf.a ../libs/zbxcrypto/libzbxcrypto.a ../libs/zbxnet/libzbxnet.a pinger/libzbxpinger.a poller/libzbxpoller.a escalator/libzbxescalator.a housekeeper/libzbxhousekeeper.a alerter/libzbxalerter.a timer/libzbxtimer.a trapper/libzbxtrapper.a ../libs/zbxemail/libzbxemail.a ../libs/zbxdbhigh/libzbxdbhigh.a ../libs/zbxcommon/libzbxcommon.a @MYSQL_LIBS@ @PGSQL_LIBS@ @LDAP_LIBS@ @SNMP_LIBS@ +zabbix_server_LDFLAGS=@MYSQL_LFLAGS@ @PGSQL_LFLAGS@ @LDAP_LFLAGS@ @SNMP_LFLAGS@ |