Minor changes.

git-svn-id: svn://svn.zabbix.com/trunk@2147 97f52cf1-0a1b-0410-bd0e-c28be96e8082

5 files changed, 9 insertions, 34 deletions

diff --git a/src/libs/zbxsysinfo/Makefile.am b/src/libs/zbxsysinfo/Makefile.am
index bc7b2fb7..d2b67728 100644
--- a/src/libs/zbxsysinfo/Makefile.am
+++ b/src/libs/zbxsysinfo/Makefile.am
@@ -1,31 +1,4 @@
-if CONFIG_HOST_LINUX
-SUBDIRS=linux
-libzbxsysinfo_a_LIBADD =  linux/libzbxsysinfo2.a ../zbxcommon/libzbxcommon.a ../zbxcrypto/libzbxcrypto.a
-endif
-
-if CONFIG_HOST_FREEBSD
-SUBDIRS=freebsd
-libzbxsysinfo_a_LIBADD = freebsd/libzbxsysinfo2.a ../zbxcommon/libzbxcommon.a ../zbxcrypto/libzbxcrypto.a
-endif
-
-libzbxsysinfo_a_SOURCES=common/common.c common/file.c common/system.c
+SUBDIRS=@ARCH@
+libzbxsysinfo_a_LIBADD = ../zbxcommon/libzbxcommon.a ../zbxcrypto/libzbxcrypto.a
+libzbxsysinfo_a_SOURCES=common/common.c common/file.c common/system.c @ARCH@/@ARCH@.c
 lib_LIBRARIES=libzbxsysinfo.a
-
-if CONFIG_HOST_HPUX
-endif
-
-if CONFIG_HOST_FREEBSD
-endif
-
-if CONFIG_HOST_LINUX
-endif
-
-if CONFIG_HOST_OPENBSD
-endif
-
-if CONFIG_HOST_SOLARIS
-endif
-
-if CONFIG_HOST_UNKNOWN
-endif
-
diff --git a/src/libs/zbxsysinfo/linux/Makefile.am b/src/libs/zbxsysinfo/linux/Makefile.am
index d8681740..61445b63 100644
--- a/src/libs/zbxsysinfo/linux/Makefile.am
+++ b/src/libs/zbxsysinfo/linux/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=
 
-libzbxsysinfo2_a_SOURCES=supported.c cpu.c diskio.c diskspace.c inodes.c memory.c sensors.c swap.c uptime.c
+libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c memory.c sensors.c swap.c uptime.c
 
 lib_LIBRARIES=libzbxsysinfo2.a
 libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
diff --git a/src/libs/zbxsysinfo/linux/supported.c b/src/libs/zbxsysinfo/linux/linux.c
index 71da5581..71da5581 100644
--- a/src/libs/zbxsysinfo/linux/supported.c
+++ b/src/libs/zbxsysinfo/linux/linux.c
diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am
index 2ddc31f6..77ee891a 100644
--- a/src/zabbix_agent/Makefile.am
+++ b/src/zabbix_agent/Makefile.am
@@ -1,10 +1,11 @@
 SUBDIRS =
 bin_PROGRAMS = zabbix_agent zabbix_agentd
 zabbix_agent_SOURCES =  zabbix_agent.c
-zabbix_agent_LDADD = ../libs/zbxsysinfo/libzbxsysinfo.a ../libs/zbxlog/libzbxlog.a \
+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@
 zabbix_agentd_SOURCES = active.c  cpustat.c  diskdevices.c  interfaces.c  logfiles.c  stats.c  zabbix_agentd.c
-zabbix_agentd_LDADD = ../libs/zbxsysinfo/libzbxsysinfo.a ../libs/zbxlog/libzbxlog.a ../libs/zbxcrypto/libzbxcrypto.a \
+zabbix_agentd_LDADD = ../libs/zbxsysinfo/libzbxsysinfo.a ../libs/zbxsysinfo/linux/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@
diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
index a265a855..46910db3 100644
--- a/src/zabbix_server/Makefile.am
+++ b/src/zabbix_server/Makefile.am
@@ -3,5 +3,6 @@ INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@ @SNMP_INCLUDE@
 
 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/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
+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
 zabbix_server_LDFLAGS=@MYSQL_LFLAGS@ @PGSQL_LFLAGS@ @LDAP_LFLAGS@ @SNMP_LFLAGS@