improved makefiles

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

42 files changed, 466 insertions, 239 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 0147c58e..71989a3a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,19 @@
+## Process this file with automake to produce Makefile.in
+
+AGENT_DIRS = zabbix_agent zabbix_get zabbix_sender
+SERVER_DIRS = zabbix_server
+
 if AGENT
-AGENT_DIRS = libs zabbix_agent zabbix_get zabbix_sender
+AGENT_SUBDIRS = $(AGENT_DIRS)
+else
+AGENT_EXTRA_SUBDIRS = $(AGENT_DIRS)
 endif
+
 if SERVER
-SERVER_DIRS = libs zabbix_server
+SERVER_SUBDIRS = $(SERVER_DIRS)
+else
+SERVER_EXTRA_SUBDIRS = $(SERVER_DIRS)
 endif
-SUBDIRS = $(AGENT_DIRS) $(SERVER_DIRS)
+
+SUBDIRS = libs $(AGENT_SUBDIRS) $(SERVER_SUBDIRS)
+EXTRA_SUBDIRS = $(AGENT_EXTRA_SUBDIRS) $(SERVER_EXTRA_SUBDIRS)
diff --git a/src/libs/Makefile.am b/src/libs/Makefile.am
index cfa634eb..37b5530b 100644
--- a/src/libs/Makefile.am
+++ b/src/libs/Makefile.am
@@ -1,7 +1,12 @@
-if AGENT
-AGENT_DIRS = zbxcrypto zbxcommon zbxlog zbxnet zbxnix zbxconf zbxsysinfo zbxplugin zbxsys
-endif
+## Process this file with automake to produce Makefile.in
+
+SERVER_DIRS = zbxdbhigh zbxemail zbxsms zbxcomms
+
 if SERVER
-SERVER_DIRS = zbxcrypto zbxcommon zbxlog zbxnet zbxnix zbxconf zbxdbhigh zbxemail zbxsms zbxsysinfo zbxplugin zbxsys zbxcomms
+SERVER_SUBDIRS = $(SERVER_DIRS)
+else
+EXTRA_SUBDIRS = $(SERVER_DIRS)
 endif
-SUBDIRS=$(AGENT_DIRS) $(SERVER_DIRS)
+
+SUBDIRS = zbxcrypto zbxcommon zbxlog zbxnet zbxnix zbxconf zbxsysinfo zbxplugin zbxsys $(SERVER_SUBDIRS)
+
diff --git a/src/libs/zbxcommon/Makefile.am b/src/libs/zbxcommon/Makefile.am
index 1d958604..e9efd230 100644
--- a/src/libs/zbxcommon/Makefile.am
+++ b/src/libs/zbxcommon/Makefile.am
@@ -1,3 +1,14 @@
-SUBDIRS=
-lib_LIBRARIES=libzbxcommon.a
-libzbxcommon_a_SOURCES=misc.c regexp.c xml.c comms.c str.c zbxgetopt.c alias.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxcommon.a
+
+libzbxcommon_a_SOURCES = \
+	misc.c \
+	regexp.c \
+	xml.c \
+	comms.c \
+	str.c \
+	zbxgetopt.c \
+	alias.c
+
+EXTRA_DIR = gnuregex.c
diff --git a/src/libs/zbxcomms/Makefile.am b/src/libs/zbxcomms/Makefile.am
index 0002031d..ff11b156 100644
--- a/src/libs/zbxcomms/Makefile.am
+++ b/src/libs/zbxcomms/Makefile.am
@@ -1,3 +1,5 @@
-SUBDIRS=
-lib_LIBRARIES=libzbxcomms.a
-libzbxcomms_a_SOURCES=comms.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxcomms.a
+
+libzbxcomms_a_SOURCES = comms.c
diff --git a/src/libs/zbxconf/Makefile.am b/src/libs/zbxconf/Makefile.am
index a299ad7e..b912d214 100644
--- a/src/libs/zbxconf/Makefile.am
+++ b/src/libs/zbxconf/Makefile.am
@@ -1,3 +1,5 @@
-SUBDIRS=
-lib_LIBRARIES=libzbxconf.a
-libzbxconf_a_SOURCES=cfg.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxconf.a
+
+libzbxconf_a_SOURCES = cfg.c
diff --git a/src/libs/zbxcrypto/Makefile.am b/src/libs/zbxcrypto/Makefile.am
index 3ff84e2a..06e10fae 100644
--- a/src/libs/zbxcrypto/Makefile.am
+++ b/src/libs/zbxcrypto/Makefile.am
@@ -1,3 +1,7 @@
-SUBDIRS=
-libzbxcrypto_a_SOURCES=md5.c base64.c
-lib_LIBRARIES=libzbxcrypto.a
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxcrypto.a
+
+libzbxcrypto_a_SOURCES = \
+	md5.c \
+	base64.c
diff --git a/src/libs/zbxdbhigh/Makefile.am b/src/libs/zbxdbhigh/Makefile.am
index f6d3f9e2..77e90eab 100644
--- a/src/libs/zbxdbhigh/Makefile.am
+++ b/src/libs/zbxdbhigh/Makefile.am
@@ -1,5 +1,13 @@
-SUBDIRS=
-INCLUDES=-I@top_srcdir@/include @MYSQL_CFLAGS@ @POSTGRESQL_CFLAGS@ @ORACLE_INCLUDE@
-libzbxdbhigh_a_SOURCES=action.c graph.c item.c trigger.c host.c db.c
-lib_LIBRARIES=libzbxdbhigh.a
-#libzbxdbhigh_a_LIBADD = ../zbxcommon/libzbxcommon.a
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxdbhigh.a
+
+libzbxdbhigh_a_SOURCES = \
+	action.c \
+	graph.c \
+	item.c \
+	trigger.c \
+	host.c \
+	db.c
+
+libzbxdbhigh_a_CPPFLAGS = $(DB_CPPFLAGS)
diff --git a/src/libs/zbxemail/Makefile.am b/src/libs/zbxemail/Makefile.am
index 37ed0cf6..e6be97e0 100644
--- a/src/libs/zbxemail/Makefile.am
+++ b/src/libs/zbxemail/Makefile.am
@@ -1,3 +1,5 @@
-SUBDIRS=
-lib_LIBRARIES=libzbxemail.a
-libzbxemail_a_SOURCES=email.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxemail.a
+
+libzbxemail_a_SOURCES = email.c
diff --git a/src/libs/zbxlog/Makefile.am b/src/libs/zbxlog/Makefile.am
index 73f21e39..69846f37 100644
--- a/src/libs/zbxlog/Makefile.am
+++ b/src/libs/zbxlog/Makefile.am
@@ -1,3 +1,5 @@
-SUBDIRS=
-lib_LIBRARIES=libzbxlog.a
-libzbxlog_a_SOURCES=log.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxlog.a
+
+libzbxlog_a_SOURCES = log.c
diff --git a/src/libs/zbxnet/Makefile.am b/src/libs/zbxnet/Makefile.am
index 32d03ce0..7c6041f2 100644
--- a/src/libs/zbxnet/Makefile.am
+++ b/src/libs/zbxnet/Makefile.am
@@ -1,3 +1,7 @@
-SUBDIRS=
-lib_LIBRARIES=libzbxnet.a
-libzbxnet_a_SOURCES=security.c zbxsock.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxnet.a
+
+libzbxnet_a_SOURCES = \
+	security.c \
+	zbxsock.c
diff --git a/src/libs/zbxnix/Makefile.am b/src/libs/zbxnix/Makefile.am
index a941a070..21ca807b 100644
--- a/src/libs/zbxnix/Makefile.am
+++ b/src/libs/zbxnix/Makefile.am
@@ -1,3 +1,5 @@
-SUBDIRS=
-lib_LIBRARIES=libzbxnix.a
-libzbxnix_a_SOURCES=daemon.c pid.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxnix.a
+
+libzbxnix_a_SOURCES = daemon.c pid.c
diff --git a/src/libs/zbxpid/Makefile.am b/src/libs/zbxpid/Makefile.am
deleted file mode 100644
index 8115f264..00000000
--- a/src/libs/zbxpid/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS=
-lib_LIBRARIES=libzbxpid.a
-libzbxpid_a_SOURCES=pid.c
diff --git a/src/libs/zbxpid/pid.c b/src/libs/zbxpid/pid.c
deleted file mode 100644
index 4e477b9f..00000000
--- a/src/libs/zbxpid/pid.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* 
-** ZABBIX
-** Copyright (C) 2000-2005 SIA Zabbix
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**/
-
-
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <syslog.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <time.h>
-
-#include "log.h"
-#include "common.h"
-
-int	create_pid_file(const char *pidfile)
-{
-	FILE	*f;
-
-/* Check if PID file already exists */
-	f = fopen(pidfile, "r");
-	if(f != NULL)
-	{
-		fprintf(stderr, "File [%s] exists. Is this process already running ?\n",
-			pidfile);
-		zabbix_log( LOG_LEVEL_CRIT, "File [%s] exists. Is this process already running ?",
-			pidfile);
-		if(fclose(f) != 0)
-		{
-			fprintf(stderr, "Cannot close file [%s] [%s]", pidfile, strerror(errno));
-			zabbix_log( LOG_LEVEL_WARNING, "Cannot close file [%s] [%s]",
-				pidfile, strerror(errno));
-		}
-
-		return FAIL;
-	}
-
-	f = fopen(pidfile, "w");
-
-	if( f == NULL)
-	{
-		fprintf(stderr, "Cannot create PID file [%s] [%s]\n",
-			pidfile, strerror(errno));
-		zabbix_log( LOG_LEVEL_CRIT, "Cannot create PID file [%s] [%s]",
-			pidfile, strerror(errno));
-
-		return FAIL;
-	}
-
-	fprintf(f,"%d",(int)getpid());
-	if(fclose(f) != 0)
-	{
-		fprintf(stderr, "Cannot close file [%s] [%s]", pidfile, strerror(errno));
-		zabbix_log( LOG_LEVEL_WARNING, "Cannot close file [%s] [%s]",
-			pidfile, strerror(errno));
-	}
-
-	return SUCCEED;
-}
diff --git a/src/libs/zbxplugin/Makefile.am b/src/libs/zbxplugin/Makefile.am
index edd081b1..1162a575 100644
--- a/src/libs/zbxplugin/Makefile.am
+++ b/src/libs/zbxplugin/Makefile.am
@@ -1,4 +1,5 @@
-SUBDIRS=
-lib_LIBRARIES=libzbxplugin.a
-libzbxplugin_a_SOURCES=zbxplugin.c
+## Process this file with automake to produce Makefile.in
 
+noinst_LIBRARIES = libzbxplugin.a
+
+libzbxplugin_a_SOURCES = zbxplugin.c
diff --git a/src/libs/zbxsms/Makefile.am b/src/libs/zbxsms/Makefile.am
index c3ad0476..c26f7d7e 100644
--- a/src/libs/zbxsms/Makefile.am
+++ b/src/libs/zbxsms/Makefile.am
@@ -1,3 +1,5 @@
-SUBDIRS=
-lib_LIBRARIES=libzbxsms.a
-libzbxsms_a_SOURCES=sms.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxsms.a
+
+libzbxsms_a_SOURCES = sms.c
diff --git a/src/libs/zbxsys/Makefile.am b/src/libs/zbxsys/Makefile.am
index 0bdc60ac..72c38408 100644
--- a/src/libs/zbxsys/Makefile.am
+++ b/src/libs/zbxsys/Makefile.am
@@ -1,3 +1,7 @@
-SUBDIRS=
-lib_LIBRARIES=libzbxsys.a
-libzbxsys_a_SOURCES=threads.c mutexs.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxsys.a
+
+libzbxsys_a_SOURCES = threads.c mutexs.c
+
+EXTRA_DIST = symbols.c
diff --git a/src/libs/zbxsysinfo/Makefile.am b/src/libs/zbxsysinfo/Makefile.am
index d33b5db8..76c73a91 100644
--- a/src/libs/zbxsysinfo/Makefile.am
+++ b/src/libs/zbxsysinfo/Makefile.am
@@ -1,4 +1,27 @@
-SUBDIRS=@ARCH@
-#libzbxsysinfo_a_LIBADD = ../zbxcommon/libzbxcommon.a ../zbxcrypto/libzbxcrypto.a
-libzbxsysinfo_a_SOURCES=common/common.c common/file.c common/ntp.c common/system.c common/http.c  @ARCH@/@ARCH@.c
-lib_LIBRARIES=libzbxsysinfo.a
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = $(ARCH)
+
+noinst_LIBRARIES = libzbxsysinfo.a
+
+libzbxsysinfo_a_SOURCES = \
+	common/common.c \
+	common/file.c \
+	common/ntp.c \
+	common/system.c \
+	common/http.c \
+	@ARCH@/@ARCH@.c
+
+EXTRA_SUBDIRS = \
+	aix aix/aix.c \
+	common \
+	freebsd freebsd/freebsd.c \
+	hpux hpux/hpux.c \
+	linux linux/linux.c \
+	netbsd netbsd/netbsd.c \
+	openbsd openbsd/openbsd.c \
+	osf osf/osf.c \
+	osx osx/osx.c \
+	solaris solaris/solaris.c \
+	unknown unknown/unknown.c \
+	win32
diff --git a/src/libs/zbxsysinfo/aix/Makefile.am b/src/libs/zbxsysinfo/aix/Makefile.am
index 1905eecf..06659da1 100644
--- a/src/libs/zbxsysinfo/aix/Makefile.am
+++ b/src/libs/zbxsysinfo/aix/Makefile.am
@@ -1,6 +1,16 @@
-SUBDIRS=
+## Process this file with automake to produce Makefile.in
 
-libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c kernel.c memory.c net.c proc.c sensors.c swap.c uptime.c
+noinst_LIBRARIES = libzbxsysinfo2.a
 
-lib_LIBRARIES=libzbxsysinfo2.a
-#libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
+libzbxsysinfo2_a_SOURCES = \
+	cpu.c \
+	diskio.c \
+	diskspace.c \
+	inodes.c \
+	kernel.c \
+	memory.c \
+	net.c \
+	proc.c \
+	sensors.c \
+	swap.c \
+	uptime.c
diff --git a/src/libs/zbxsysinfo/freebsd/Makefile.am b/src/libs/zbxsysinfo/freebsd/Makefile.am
index 1905eecf..06659da1 100644
--- a/src/libs/zbxsysinfo/freebsd/Makefile.am
+++ b/src/libs/zbxsysinfo/freebsd/Makefile.am
@@ -1,6 +1,16 @@
-SUBDIRS=
+## Process this file with automake to produce Makefile.in
 
-libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c kernel.c memory.c net.c proc.c sensors.c swap.c uptime.c
+noinst_LIBRARIES = libzbxsysinfo2.a
 
-lib_LIBRARIES=libzbxsysinfo2.a
-#libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
+libzbxsysinfo2_a_SOURCES = \
+	cpu.c \
+	diskio.c \
+	diskspace.c \
+	inodes.c \
+	kernel.c \
+	memory.c \
+	net.c \
+	proc.c \
+	sensors.c \
+	swap.c \
+	uptime.c
diff --git a/src/libs/zbxsysinfo/hpux/Makefile.am b/src/libs/zbxsysinfo/hpux/Makefile.am
index 1905eecf..06659da1 100644
--- a/src/libs/zbxsysinfo/hpux/Makefile.am
+++ b/src/libs/zbxsysinfo/hpux/Makefile.am
@@ -1,6 +1,16 @@
-SUBDIRS=
+## Process this file with automake to produce Makefile.in
 
-libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c kernel.c memory.c net.c proc.c sensors.c swap.c uptime.c
+noinst_LIBRARIES = libzbxsysinfo2.a
 
-lib_LIBRARIES=libzbxsysinfo2.a
-#libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
+libzbxsysinfo2_a_SOURCES = \
+	cpu.c \
+	diskio.c \
+	diskspace.c \
+	inodes.c \
+	kernel.c \
+	memory.c \
+	net.c \
+	proc.c \
+	sensors.c \
+	swap.c \
+	uptime.c
diff --git a/src/libs/zbxsysinfo/linux/Makefile.am b/src/libs/zbxsysinfo/linux/Makefile.am
index f261faf9..d52238b6 100644
--- a/src/libs/zbxsysinfo/linux/Makefile.am
+++ b/src/libs/zbxsysinfo/linux/Makefile.am
@@ -1,6 +1,17 @@
-SUBDIRS=
+## Process this file with automake to produce Makefile.in
 
-libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c kernel.c memory.c net.c proc.c sensors.c swap.c uptime.c boottime.c
+noinst_LIBRARIES = libzbxsysinfo2.a
 
-lib_LIBRARIES=libzbxsysinfo2.a
-#libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
+libzbxsysinfo2_a_SOURCES = \
+	cpu.c \
+	diskio.c \
+	diskspace.c \
+	inodes.c \
+	kernel.c \
+	memory.c \
+	net.c \
+	proc.c \
+	sensors.c \
+	swap.c \
+	uptime.c \
+	boottime.c
diff --git a/src/libs/zbxsysinfo/netbsd/Makefile.am b/src/libs/zbxsysinfo/netbsd/Makefile.am
index 1905eecf..06659da1 100644
--- a/src/libs/zbxsysinfo/netbsd/Makefile.am
+++ b/src/libs/zbxsysinfo/netbsd/Makefile.am
@@ -1,6 +1,16 @@
-SUBDIRS=
+## Process this file with automake to produce Makefile.in
 
-libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c kernel.c memory.c net.c proc.c sensors.c swap.c uptime.c
+noinst_LIBRARIES = libzbxsysinfo2.a
 
-lib_LIBRARIES=libzbxsysinfo2.a
-#libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
+libzbxsysinfo2_a_SOURCES = \
+	cpu.c \
+	diskio.c \
+	diskspace.c \
+	inodes.c \
+	kernel.c \
+	memory.c \
+	net.c \
+	proc.c \
+	sensors.c \
+	swap.c \
+	uptime.c
diff --git a/src/libs/zbxsysinfo/openbsd/Makefile.am b/src/libs/zbxsysinfo/openbsd/Makefile.am
index 1905eecf..06659da1 100644
--- a/src/libs/zbxsysinfo/openbsd/Makefile.am
+++ b/src/libs/zbxsysinfo/openbsd/Makefile.am
@@ -1,6 +1,16 @@
-SUBDIRS=
+## Process this file with automake to produce Makefile.in
 
-libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c kernel.c memory.c net.c proc.c sensors.c swap.c uptime.c
+noinst_LIBRARIES = libzbxsysinfo2.a
 
-lib_LIBRARIES=libzbxsysinfo2.a
-#libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
+libzbxsysinfo2_a_SOURCES = \
+	cpu.c \
+	diskio.c \
+	diskspace.c \
+	inodes.c \
+	kernel.c \
+	memory.c \
+	net.c \
+	proc.c \
+	sensors.c \
+	swap.c \
+	uptime.c
diff --git a/src/libs/zbxsysinfo/osf/Makefile.am b/src/libs/zbxsysinfo/osf/Makefile.am
index 1905eecf..06659da1 100644
--- a/src/libs/zbxsysinfo/osf/Makefile.am
+++ b/src/libs/zbxsysinfo/osf/Makefile.am
@@ -1,6 +1,16 @@
-SUBDIRS=
+## Process this file with automake to produce Makefile.in
 
-libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c kernel.c memory.c net.c proc.c sensors.c swap.c uptime.c
+noinst_LIBRARIES = libzbxsysinfo2.a
 
-lib_LIBRARIES=libzbxsysinfo2.a
-#libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
+libzbxsysinfo2_a_SOURCES = \
+	cpu.c \
+	diskio.c \
+	diskspace.c \
+	inodes.c \
+	kernel.c \
+	memory.c \
+	net.c \
+	proc.c \
+	sensors.c \
+	swap.c \
+	uptime.c
diff --git a/src/libs/zbxsysinfo/osx/Makefile.am b/src/libs/zbxsysinfo/osx/Makefile.am
index 1905eecf..06659da1 100644
--- a/src/libs/zbxsysinfo/osx/Makefile.am
+++ b/src/libs/zbxsysinfo/osx/Makefile.am
@@ -1,6 +1,16 @@
-SUBDIRS=
+## Process this file with automake to produce Makefile.in
 
-libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c kernel.c memory.c net.c proc.c sensors.c swap.c uptime.c
+noinst_LIBRARIES = libzbxsysinfo2.a
 
-lib_LIBRARIES=libzbxsysinfo2.a
-#libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
+libzbxsysinfo2_a_SOURCES = \
+	cpu.c \
+	diskio.c \
+	diskspace.c \
+	inodes.c \
+	kernel.c \
+	memory.c \
+	net.c \
+	proc.c \
+	sensors.c \
+	swap.c \
+	uptime.c
diff --git a/src/libs/zbxsysinfo/solaris/Makefile.am b/src/libs/zbxsysinfo/solaris/Makefile.am
index 1905eecf..06659da1 100644
--- a/src/libs/zbxsysinfo/solaris/Makefile.am
+++ b/src/libs/zbxsysinfo/solaris/Makefile.am
@@ -1,6 +1,16 @@
-SUBDIRS=
+## Process this file with automake to produce Makefile.in
 
-libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c kernel.c memory.c net.c proc.c sensors.c swap.c uptime.c
+noinst_LIBRARIES = libzbxsysinfo2.a
 
-lib_LIBRARIES=libzbxsysinfo2.a
-#libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
+libzbxsysinfo2_a_SOURCES = \
+	cpu.c \
+	diskio.c \
+	diskspace.c \
+	inodes.c \
+	kernel.c \
+	memory.c \
+	net.c \
+	proc.c \
+	sensors.c \
+	swap.c \
+	uptime.c
diff --git a/src/libs/zbxsysinfo/unknown/Makefile.am b/src/libs/zbxsysinfo/unknown/Makefile.am
index 1905eecf..06659da1 100644
--- a/src/libs/zbxsysinfo/unknown/Makefile.am
+++ b/src/libs/zbxsysinfo/unknown/Makefile.am
@@ -1,6 +1,16 @@
-SUBDIRS=
+## Process this file with automake to produce Makefile.in
 
-libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c kernel.c memory.c net.c proc.c sensors.c swap.c uptime.c
+noinst_LIBRARIES = libzbxsysinfo2.a
 
-lib_LIBRARIES=libzbxsysinfo2.a
-#libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
+libzbxsysinfo2_a_SOURCES = \
+	cpu.c \
+	diskio.c \
+	diskspace.c \
+	inodes.c \
+	kernel.c \
+	memory.c \
+	net.c \
+	proc.c \
+	sensors.c \
+	swap.c \
+	uptime.c
diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am
index 3054ee98..80a4d4a9 100644
--- a/src/zabbix_agent/Makefile.am
+++ b/src/zabbix_agent/Makefile.am
@@ -1,13 +1,36 @@
-SUBDIRS =
-bin_PROGRAMS = zabbix_agent zabbix_agentd
-zabbix_agent_SOURCES =  zabbix_agent.c zbxconf.c
-zabbix_agent_LDFLAGS = @LDAP_LFLAGS@
-zabbix_agent_LDADD = ../libs/zbxsysinfo/libzbxsysinfo.a ../libs/zbxsysinfo/@ARCH@/libzbxsysinfo2.a \
-../libs/zbxlog/libzbxlog.a ../libs/zbxsys/libzbxsys.a ../libs/zbxnix/libzbxnix.a ../libs/zbxnet/libzbxnet.a \
-../libs/zbxconf/libzbxconf.a ../libs/zbxcommon/libzbxcommon.a ../libs/zbxcrypto/libzbxcrypto.a @LDAP_LIBS@
-zabbix_agentd_SOURCES = active.c  stats.c cpustat.c  diskdevices.c  interfaces.c  logfiles.c zabbix_agentd.c zbxconf.c listener.c eventlog.c
+## Process this file with automake to produce Makefile.in
+
+AM_LDFLAGS = $(LDAP_LFLAGS)
+
+LDADD = \
+	../libs/zbxsysinfo/libzbxsysinfo.a \
+	../libs/zbxsysinfo/$(ARCH)/libzbxsysinfo2.a \
+	../libs/zbxlog/libzbxlog.a \
+	../libs/zbxsys/libzbxsys.a \
+	../libs/zbxnix/libzbxnix.a \
+	../libs/zbxnet/libzbxnet.a \
+	../libs/zbxconf/libzbxconf.a \
+	../libs/zbxcommon/libzbxcommon.a \
+	../libs/zbxcrypto/libzbxcrypto.a $(LDAP_LIBS)
+
+bin_PROGRAMS = \
+	zabbix_agent \
+	zabbix_agentd
+
+zabbix_agent_SOURCES = \
+	zabbix_agent.c zabbix_agent.h \
+	zbxconf.c zbxconf.h
+
+zabbix_agentd_SOURCES = \
+	active.c active.h \
+	stats.c stats.h \
+	cpustat.c cpustat.h \
+	diskdevices.c diskdevices.h \
+	interfaces.c interfaces.h \
+	logfiles.c logfiles.h \
+	zabbix_agentd.c \
+	zbxconf.c zbxconf.h \
+	listener.c listener.h \
+	eventlog.c eventlog.h
+
 zabbix_agentd_CPPFLAGS = -DZABBIX_DAEMON
-zabbix_agentd_LDFLAGS = @LDAP_LFLAGS@
-zabbix_agentd_LDADD = ../libs/zbxsysinfo/libzbxsysinfo.a ../libs/zbxsysinfo/@ARCH@/libzbxsysinfo2.a ../libs/zbxlog/libzbxlog.a \
-../libs/zbxnix/libzbxnix.a ../libs/zbxsys/libzbxsys.a ../libs/zbxnet/libzbxnet.a ../libs/zbxconf/libzbxconf.a \
-../libs/zbxcommon/libzbxcommon.a ../libs/zbxcrypto/libzbxcrypto.a @LDAP_LIBS@
diff --git a/src/zabbix_get/Makefile.am b/src/zabbix_get/Makefile.am
index e38248ff..b10905c0 100644
--- a/src/zabbix_get/Makefile.am
+++ b/src/zabbix_get/Makefile.am
@@ -1,4 +1,13 @@
-SUBDIRS =
+## Process this file with automake to produce Makefile.in
+
 bin_PROGRAMS = zabbix_get
+
 zabbix_get_SOURCES = zabbix_get.c
-zabbix_get_LDADD = ../libs/zbxcommon/libzbxcommon.a ../libs/zbxlog/libzbxlog.a ../libs/zbxcrypto/libzbxcrypto.a ../libs/zbxsys/libzbxsys.a ../libs/zbxconf/libzbxconf.a ../libs/zbxnet/libzbxnet.a
+
+zabbix_get_LDADD = \
+	../libs/zbxcommon/libzbxcommon.a \
+	../libs/zbxlog/libzbxlog.a \
+	../libs/zbxcrypto/libzbxcrypto.a \
+	../libs/zbxsys/libzbxsys.a \
+	../libs/zbxconf/libzbxconf.a \
+	../libs/zbxnet/libzbxnet.a
diff --git a/src/zabbix_sender/Makefile.am b/src/zabbix_sender/Makefile.am
index 0406c742..acfb90bf 100644
--- a/src/zabbix_sender/Makefile.am
+++ b/src/zabbix_sender/Makefile.am
@@ -1,4 +1,14 @@
-SUBDIRS =
+## Process this file with automake to produce Makefile.in
+
 bin_PROGRAMS = zabbix_sender
+
 zabbix_sender_SOURCES = zabbix_sender.c
-zabbix_sender_LDADD = ../libs/zbxcommon/libzbxcommon.a ../libs/zbxlog/libzbxlog.a ../libs/zbxsys/libzbxsys.a ../libs/zbxcrypto/libzbxcrypto.a ../libs/zbxconf/libzbxconf.a ../libs/zbxcomms/libzbxcomms.a ../libs/zbxnet/libzbxnet.a
+
+zabbix_sender_LDADD = \
+	../libs/zbxcommon/libzbxcommon.a \
+	../libs/zbxlog/libzbxlog.a \
+	../libs/zbxsys/libzbxsys.a \
+	../libs/zbxcrypto/libzbxcrypto.a \
+	../libs/zbxconf/libzbxconf.a \
+	../libs/zbxcomms/libzbxcomms.a \
+	../libs/zbxnet/libzbxnet.a
diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
index a2073797..01321679 100644
--- a/src/zabbix_server/Makefile.am
+++ b/src/zabbix_server/Makefile.am
@@ -1,14 +1,51 @@
-SUBDIRS = alerter housekeeper pinger poller httppoller timer trapper nodewatcher utils
-INCLUDES=-I@top_srcdir@/include @ORACLE_INCLUDE@ @SNMP_INCLUDE@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = \
+	alerter \
+	housekeeper \
+	pinger \
+	poller \
+	httppoller \
+	timer \
+	trapper \
+	nodewatcher \
+	utils
 
 bin_PROGRAMS = zabbix_server
-zabbix_server_SOURCES = evalfunc.c expression.c actions.c events.c zlog.c functions.c server.c
-zabbix_server_CPPFLAGS = -DZABBIX_DAEMON @MYSQL_CFLAGS@ @POSTGRESQL_CFLAGS@ @SQLITE3_CFLAGS@ @LIBCURL_CPPFLAGS@
-zabbix_server_LDADD = ../libs/zbxsysinfo/libzbxsysinfo.a ../libs/zbxsysinfo/@ARCH@/libzbxsysinfo2.a \
-../libs/zbxlog/libzbxlog.a ../libs/zbxnix/libzbxnix.a ../libs/zbxsys/libzbxsys.a ../libs/zbxconf/libzbxconf.a \
-../libs/zbxnet/libzbxnet.a pinger/libzbxpinger.a poller/libzbxpoller.a housekeeper/libzbxhousekeeper.a \
-alerter/libzbxalerter.a timer/libzbxtimer.a trapper/libzbxtrapper.a nodewatcher/libzbxnodewatcher.a \
-../libs/zbxemail/libzbxemail.a utils/libzbxutils.a  httppoller/libzbxhttppoller.a \
-../libs/zbxsms/libzbxsms.a ../libs/zbxdbhigh/libzbxdbhigh.a ../libs/zbxcommon/libzbxcommon.a \
-../libs/zbxcrypto/libzbxcrypto.a ../libs/zbxcomms/libzbxcomms.a @ORACLE_LIBS@ @LDAP_LIBS@ @SNMP_LIBS@ @LIBCURL@
-zabbix_server_LDFLAGS=@MYSQL_LDFLAGS@ @POSTGRESQL_LDFLAGS@ @ORACLE_LFLAGS@ @SQLITE3_LDFLAGS@ @LDAP_LFLAGS@ @SNMP_LFLAGS@
+
+zabbix_server_SOURCES = \
+	evalfunc.c evalfunc.h \
+	expression.c expression.h \
+	actions.c actions.h \
+	events.c events.h \
+	zlog.c \
+	functions.c functions.h \
+	server.c
+
+zabbix_server_CPPFLAGS = -DZABBIX_DAEMON $(DB_CPPFLAGS) $(SNMP_INCLUDE) $(LIBCURL_CPPFLAGS)
+
+zabbix_server_LDADD = \
+	alerter/libzbxalerter.a \
+	pinger/libzbxpinger.a \
+	poller/libzbxpoller.a \
+	housekeeper/libzbxhousekeeper.a \
+	timer/libzbxtimer.a \
+	trapper/libzbxtrapper.a \
+	nodewatcher/libzbxnodewatcher.a \
+	utils/libzbxutils.a \
+	httppoller/libzbxhttppoller.a \
+	../libs/zbxsysinfo/libzbxsysinfo.a \
+	../libs/zbxsysinfo/$(ARCH)/libzbxsysinfo2.a \
+	../libs/zbxlog/libzbxlog.a \
+	../libs/zbxnix/libzbxnix.a \
+	../libs/zbxsys/libzbxsys.a \
+	../libs/zbxconf/libzbxconf.a \
+	../libs/zbxemail/libzbxemail.a \
+	../libs/zbxnet/libzbxnet.a \
+	../libs/zbxsms/libzbxsms.a \
+	../libs/zbxdbhigh/libzbxdbhigh.a \
+	../libs/zbxcommon/libzbxcommon.a \
+	../libs/zbxcrypto/libzbxcrypto.a \
+	../libs/zbxcomms/libzbxcomms.a
+
+zabbix_server_LDFLAGS = $(DB_LDFLAGS) $(SNMP_LIBS) $(LDAP_LIBS) $(LIBCURL)
diff --git a/src/zabbix_server/alerter/Makefile.am b/src/zabbix_server/alerter/Makefile.am
index efc70d14..4b94062e 100644
--- a/src/zabbix_server/alerter/Makefile.am
+++ b/src/zabbix_server/alerter/Makefile.am
@@ -1,5 +1,7 @@
-SUBDIRS=
-INCLUDES=-I@top_srcdir@/include @MYSQL_CFLAGS@ @ORACLE_INCLUDE@ @POSTGRESQL_CFLAGS@
-lib_LIBRARIES=libzbxalerter.a
-libzbxalerter_a_SOURCES=alerter.c
-libzbxalerter_a_LIBADD = ../../libs/zbxemail/libzbxemail.a
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxalerter.a
+
+libzbxalerter_a_SOURCES = alerter.c alerter.h
+
+libzbxalerter_a_CPPFLAGS = $(DB_CPPFLAGS)
diff --git a/src/zabbix_server/alerter/alerter.c b/src/zabbix_server/alerter/alerter.c
index 27c555d4..a96ecc53 100644
--- a/src/zabbix_server/alerter/alerter.c
+++ b/src/zabbix_server/alerter/alerter.c
@@ -51,9 +51,9 @@
 #include "zlog.h"
 #include "email.h"
 #include "sms.h"
+#include "daemon.h"
 
 #include "alerter.h"
-#include "daemon.h"
 
 /******************************************************************************
  *                                                                            *
diff --git a/src/zabbix_server/functions.h b/src/zabbix_server/functions.h
index 3e0f11f1..f5983322 100644
--- a/src/zabbix_server/functions.h
+++ b/src/zabbix_server/functions.h
@@ -17,7 +17,6 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-
 #ifndef ZABBIX_FUNCTIONS_H
 #define ZABBIX_FUNCTIONS_H
 
diff --git a/src/zabbix_server/housekeeper/Makefile.am b/src/zabbix_server/housekeeper/Makefile.am
index 59a8cf3a..0e241556 100644
--- a/src/zabbix_server/housekeeper/Makefile.am
+++ b/src/zabbix_server/housekeeper/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS=
-INCLUDES=-I@top_srcdir@/include @MYSQL_CFLAGS@ @ORACLE_INCLUDE@ @POSTGRESQL_CFLAGS@
-lib_LIBRARIES=libzbxhousekeeper.a
-libzbxhousekeeper_a_SOURCES=housekeeper.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxhousekeeper.a
+
+libzbxhousekeeper_a_SOURCES = housekeeper.c housekeeper.h
+
+libzbxhousekeeper_a_CPPFLAGS = $(DB_CPPFLAGS)
diff --git a/src/zabbix_server/httppoller/Makefile.am b/src/zabbix_server/httppoller/Makefile.am
index 64f1029d..03d3b1f4 100644
--- a/src/zabbix_server/httppoller/Makefile.am
+++ b/src/zabbix_server/httppoller/Makefile.am
@@ -1,4 +1,10 @@
-SUBDIRS=
-INCLUDES=-I@top_srcdir@/include @MYSQL_CFLAGS@ @ORACLE_INCLUDE@ @POSTGRESQL_CFLAGS@ @SNMP_INCLUDE@
-lib_LIBRARIES=libzbxhttppoller.a
-libzbxhttppoller_a_SOURCES=httpmacro.c httptest.c httppoller.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxhttppoller.a
+
+libzbxhttppoller_a_SOURCES = \
+	httpmacro.c httpmacro.h \
+	httptest.c httptest.h \
+	httppoller.c httppoller.h
+
+libzbxhttppoller_a_CPPFLAGS = $(DB_CPPFLAGS) $(SNMP_INCLUDE)
diff --git a/src/zabbix_server/nodewatcher/Makefile.am b/src/zabbix_server/nodewatcher/Makefile.am
index 2440379b..cc6a6006 100644
--- a/src/zabbix_server/nodewatcher/Makefile.am
+++ b/src/zabbix_server/nodewatcher/Makefile.am
@@ -1,4 +1,12 @@
-SUBDIRS=
-INCLUDES=-I@top_srcdir@/include @MYSQL_CFLAGS@ @ORACLE_INCLUDE@ @POSTGRESQL_CFLAGS@
-lib_LIBRARIES=libzbxnodewatcher.a
-libzbxnodewatcher_a_SOURCES=nodewatcher.c nodesender.c nodecomms.c events.c history.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxnodewatcher.a
+
+libzbxnodewatcher_a_SOURCES = \
+	nodewatcher.c nodewatcher.h \
+	nodesender.c nodesender.h \
+	nodecomms.c nodecomms.h \
+	events.c events.h \
+	history.c history.h
+
+libzbxnodewatcher_a_CPPFLAGS = $(DB_CPPFLAGS)
diff --git a/src/zabbix_server/pinger/Makefile.am b/src/zabbix_server/pinger/Makefile.am
index fca06bd3..cd7d6561 100644
--- a/src/zabbix_server/pinger/Makefile.am
+++ b/src/zabbix_server/pinger/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS=
-INCLUDES=-I@top_srcdir@/include @MYSQL_CFLAGS@ @ORACLE_INCLUDE@ @POSTGRESQL_CFLAGS@ @SNMP_INCLUDE@
-lib_LIBRARIES=libzbxpinger.a
-libzbxpinger_a_SOURCES=pinger.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxpinger.a
+
+libzbxpinger_a_SOURCES = pinger.c pinger.h
+
+libzbxpinger_a_CPPFLAGS = $(DB_CPPFLAGS)
diff --git a/src/zabbix_server/poller/Makefile.am b/src/zabbix_server/poller/Makefile.am
index 669e9971..3a0261cb 100644
--- a/src/zabbix_server/poller/Makefile.am
+++ b/src/zabbix_server/poller/Makefile.am
@@ -1,4 +1,13 @@
-SUBDIRS=
-INCLUDES=-I@top_srcdir@/include @MYSQL_CFLAGS@ @ORACLE_INCLUDE@ @POSTGRESQL_CFLAGS@ @SNMP_INCLUDE@
-lib_LIBRARIES=libzbxpoller.a
-libzbxpoller_a_SOURCES=checks_agent.c checks_internal.c checks_simple.c checks_snmp.c checks_aggregate.c poller.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxpoller.a
+
+libzbxpoller_a_SOURCES = \
+	checks_agent.c checks_agent.h \
+	checks_internal.c checks_internal.h \
+	checks_simple.c checks_simple.h \
+	checks_snmp.c checks_snmp.h \
+	checks_aggregate.c checks_aggregate.h \
+	poller.c poller.h
+
+libzbxpoller_a_CPPFLAGS = $(DB_CPPFLAGS) $(SNMP_INCLUDE)
diff --git a/src/zabbix_server/timer/Makefile.am b/src/zabbix_server/timer/Makefile.am
index 338d5e3a..985bdb34 100644
--- a/src/zabbix_server/timer/Makefile.am
+++ b/src/zabbix_server/timer/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS=
-INCLUDES=-I@top_srcdir@/include @MYSQL_CFLAGS@ @ORACLE_INCLUDE@ @POSTGRESQL_CFLAGS@
-lib_LIBRARIES=libzbxtimer.a
-libzbxtimer_a_SOURCES=timer.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxtimer.a
+
+libzbxtimer_a_SOURCES = timer.c timer.h
+
+libzbxtimer_a_CPPFLAGS = $(DB_CPPFLAGS)
diff --git a/src/zabbix_server/trapper/Makefile.am b/src/zabbix_server/trapper/Makefile.am
index 78db2bae..f5d7255c 100644
--- a/src/zabbix_server/trapper/Makefile.am
+++ b/src/zabbix_server/trapper/Makefile.am
@@ -1,5 +1,13 @@
-SUBDIRS=
-INCLUDES=-I@top_srcdir@/include @MYSQL_CFLAGS@ @ORACLE_INCLUDE@ @POSTGRESQL_CFLAGS@
-lib_LIBRARIES=libzbxtrapper.a
-libzbxtrapper_a_SOURCES=active.c autoregister.h autoregister.c trapper.c nodesync.c nodeevents.c nodehistory.c
-#libzbxtrapper_a_LIBADD = ../../libs/zbxdbhigh/libzbxdbhigh.a
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxtrapper.a
+
+libzbxtrapper_a_SOURCES = \
+	active.c active.h \
+	autoregister.c autoregister.h \
+	trapper.c trapper.h \
+	nodesync.c nodesync.h \
+	nodeevents.c nodeevents.h \
+	nodehistory.c nodehistory.h
+
+libzbxtrapper_a_CPPFLAGS = $(DB_CPPFLAGS)
diff --git a/src/zabbix_server/utils/Makefile.am b/src/zabbix_server/utils/Makefile.am
index 472c6a85..251ded7c 100644
--- a/src/zabbix_server/utils/Makefile.am
+++ b/src/zabbix_server/utils/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS=
-INCLUDES=-I@top_srcdir@/include @MYSQL_CFLAGS@ @ORACLE_INCLUDE@ @POSTGRESQL_CFLAGS@
-lib_LIBRARIES=libzbxutils.a
-libzbxutils_a_SOURCES=nodechange.c
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libzbxutils.a
+
+libzbxutils_a_SOURCES = nodechange.c nodechange.h
+
+libzbxutils_a_CPPFLAGS = $(DB_CPPFLAGS)