Minor changes.

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

6 files changed, 21 insertions, 15 deletions

diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
index 10332715..d92b753d 100644
--- a/src/zabbix_server/Makefile.am
+++ b/src/zabbix_server/Makefile.am
@@ -1,7 +1,7 @@
-SUBDIRS = escalator housekeeper pinger .
+SUBDIRS = alerter escalator housekeeper pinger .
 INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@
 
 bin_PROGRAMS = zabbix_server
-zabbix_server_SOURCES = alerter.c checks_simple.c checks_snmp.c checks_agent.c checks_internal.c trapper.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/zbxdbhigh/libzbxdbhigh.a ../libs/zbxemail/libzbxemail.a ../libs/zbxcrypto/libzbxcrypto.a ../libs/zbxnet/libzbxnet.a pinger/libzbxpinger.a escalator/libzbxescalator.a housekeeper/libzbxhousekeeper.a
+zabbix_server_SOURCES = checks_simple.c checks_snmp.c checks_agent.c checks_internal.c trapper.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/zbxdbhigh/libzbxdbhigh.a ../libs/zbxcrypto/libzbxcrypto.a ../libs/zbxnet/libzbxnet.a pinger/libzbxpinger.a escalator/libzbxescalator.a housekeeper/libzbxhousekeeper.a alerter/libzbxalerter.a ../libs/zbxemail/libzbxemail.a
 zabbix_server_LDFLAGS=@MYSQL_LFLAGS@ @PGSQL_LFLAGS@
diff --git a/src/zabbix_server/Makefile.in b/src/zabbix_server/Makefile.in
index 93e176ef..59bff3bc 100644
--- a/src/zabbix_server/Makefile.in
+++ b/src/zabbix_server/Makefile.in
@@ -76,12 +76,12 @@ SNMP_INCLUDE = @SNMP_INCLUDE@
 SNMP_LFLAGS = @SNMP_LFLAGS@
 VERSION = @VERSION@
 
-SUBDIRS = escalator housekeeper pinger .
+SUBDIRS = alerter escalator housekeeper pinger .
 INCLUDES = -I@top_srcdir@/include @MYSQL_INCLUDE@
 
 bin_PROGRAMS = zabbix_server
-zabbix_server_SOURCES = alerter.c checks_simple.c checks_snmp.c checks_agent.c checks_internal.c trapper.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/zbxdbhigh/libzbxdbhigh.a ../libs/zbxemail/libzbxemail.a ../libs/zbxcrypto/libzbxcrypto.a ../libs/zbxnet/libzbxnet.a pinger/libzbxpinger.a escalator/libzbxescalator.a housekeeper/libzbxhousekeeper.a
+zabbix_server_SOURCES = checks_simple.c checks_snmp.c checks_agent.c checks_internal.c trapper.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/zbxdbhigh/libzbxdbhigh.a ../libs/zbxcrypto/libzbxcrypto.a ../libs/zbxnet/libzbxnet.a pinger/libzbxpinger.a escalator/libzbxescalator.a housekeeper/libzbxhousekeeper.a alerter/libzbxalerter.a ../libs/zbxemail/libzbxemail.a
 zabbix_server_LDFLAGS = @MYSQL_LFLAGS@ @PGSQL_LFLAGS@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../include/config.h
@@ -93,15 +93,16 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-zabbix_server_OBJECTS =  alerter.o checks_simple.o checks_snmp.o \
-checks_agent.o checks_internal.o trapper.o expression.o actions.o \
-zlog.o functions.o server.o
+zabbix_server_OBJECTS =  checks_simple.o checks_snmp.o checks_agent.o \
+checks_internal.o trapper.o expression.o actions.o zlog.o functions.o \
+server.o
 zabbix_server_DEPENDENCIES =  ../libs/zbxsysinfo/libzbxsysinfo.a \
 ../libs/zbxlog/libzbxlog.a ../libs/zbxpid/libzbxpid.a \
 ../libs/zbxconf/libzbxconf.a ../libs/zbxdbhigh/libzbxdbhigh.a \
-../libs/zbxemail/libzbxemail.a ../libs/zbxcrypto/libzbxcrypto.a \
-../libs/zbxnet/libzbxnet.a pinger/libzbxpinger.a \
-escalator/libzbxescalator.a housekeeper/libzbxhousekeeper.a
+../libs/zbxcrypto/libzbxcrypto.a ../libs/zbxnet/libzbxnet.a \
+pinger/libzbxpinger.a escalator/libzbxescalator.a \
+housekeeper/libzbxhousekeeper.a alerter/libzbxalerter.a \
+../libs/zbxemail/libzbxemail.a
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -113,7 +114,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
-DEP_FILES =  .deps/actions.P .deps/alerter.P .deps/checks_agent.P \
+DEP_FILES =  .deps/actions.P .deps/checks_agent.P \
 .deps/checks_internal.P .deps/checks_simple.P .deps/checks_snmp.P \
 .deps/expression.P .deps/functions.P .deps/server.P .deps/trapper.P \
 .deps/zlog.P
diff --git a/src/zabbix_server/alerter/Makefile.am b/src/zabbix_server/alerter/Makefile.am
new file mode 100644
index 00000000..df1fd715
--- /dev/null
+++ b/src/zabbix_server/alerter/Makefile.am
@@ -0,0 +1,5 @@
+SUBDIRS=.
+INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@
+lib_LIBRARIES=libzbxalerter.a
+libzbxalerter_a_SOURCES=alerter.c
+libzbxalerter_a_LIBADD = ../../libs/zbxemail/libzbxemail.a
diff --git a/src/zabbix_server/alerter.c b/src/zabbix_server/alerter/alerter.c
index cbaab56d..07b50181 100644
--- a/src/zabbix_server/alerter.c
+++ b/src/zabbix_server/alerter/alerter.c
@@ -46,7 +46,7 @@
 #include "common.h"
 #include "cfg.h"
 #include "db.h"
-#include "functions.h"
+#include "../functions.h"
 #include "log.h"
 #include "zlog.h"
 #include "email.h"
diff --git a/src/zabbix_server/alerter.h b/src/zabbix_server/alerter/alerter.h
index 5fba1229..5fba1229 100644
--- a/src/zabbix_server/alerter.h
+++ b/src/zabbix_server/alerter/alerter.h
diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c
index ac7d1975..fdcfdf3b 100644
--- a/src/zabbix_server/server.c
+++ b/src/zabbix_server/server.c
@@ -46,7 +46,7 @@
 #include "functions.h"
 #include "expression.h"
 
-#include "alerter.h"
+#include "alerter/alerter.h"
 #include "escalator/escalator.h"
 #include "pinger/pinger.h"
 #include "housekeeper/housekeeper.h"