Minor changes.

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

6 files changed, 15 insertions, 10 deletions

diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
index 9dd121dc..32f874e0 100644
--- a/src/zabbix_server/Makefile.am
+++ b/src/zabbix_server/Makefile.am
@@ -2,6 +2,6 @@ SUBDIRS = pinger .
 INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@
 
 bin_PROGRAMS = zabbix_server
-zabbix_server_SOURCES = alerter.c housekeeper.c checks_simple.c checks_snmp.c checks_agent.c checks_internal.c trapper.c escalator.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
+zabbix_server_SOURCES = alerter.c housekeeper.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
 zabbix_server_LDFLAGS=@MYSQL_LFLAGS@ @PGSQL_LFLAGS@
diff --git a/src/zabbix_server/Makefile.in b/src/zabbix_server/Makefile.in
index eb8b93ff..5f42e132 100644
--- a/src/zabbix_server/Makefile.in
+++ b/src/zabbix_server/Makefile.in
@@ -80,8 +80,8 @@ SUBDIRS = pinger .
 INCLUDES = -I@top_srcdir@/include @MYSQL_INCLUDE@
 
 bin_PROGRAMS = zabbix_server
-zabbix_server_SOURCES = alerter.c housekeeper.c checks_simple.c checks_snmp.c checks_agent.c checks_internal.c trapper.c escalator.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
+zabbix_server_SOURCES = alerter.c housekeeper.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
 zabbix_server_LDFLAGS = @MYSQL_LFLAGS@ @PGSQL_LFLAGS@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../include/config.h
@@ -94,13 +94,14 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 zabbix_server_OBJECTS =  alerter.o housekeeper.o checks_simple.o \
-checks_snmp.o checks_agent.o checks_internal.o trapper.o escalator.o \
-expression.o actions.o zlog.o functions.o server.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
+../libs/zbxnet/libzbxnet.a pinger/libzbxpinger.a \
+escalator/libzbxescalator.a
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -114,8 +115,8 @@ TAR = tar
 GZIP_ENV = --best
 DEP_FILES =  .deps/actions.P .deps/alerter.P .deps/checks_agent.P \
 .deps/checks_internal.P .deps/checks_simple.P .deps/checks_snmp.P \
-.deps/escalator.P .deps/expression.P .deps/functions.P \
-.deps/housekeeper.P .deps/server.P .deps/trapper.P .deps/zlog.P
+.deps/expression.P .deps/functions.P .deps/housekeeper.P .deps/server.P \
+.deps/trapper.P .deps/zlog.P
 SOURCES = $(zabbix_server_SOURCES)
 OBJECTS = $(zabbix_server_OBJECTS)
 
diff --git a/src/zabbix_server/escalator/Makefile.am b/src/zabbix_server/escalator/Makefile.am
new file mode 100644
index 00000000..4008e4dc
--- /dev/null
+++ b/src/zabbix_server/escalator/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS=.
+INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@
+lib_LIBRARIES=libzbxescalator.a
+libzbxescalator_a_SOURCES=escalator.c
diff --git a/src/zabbix_server/escalator.c b/src/zabbix_server/escalator/escalator.c
index 3b778841..3b778841 100644
--- a/src/zabbix_server/escalator.c
+++ b/src/zabbix_server/escalator/escalator.c
diff --git a/src/zabbix_server/escalator.h b/src/zabbix_server/escalator/escalator.h
index 54c7f079..54c7f079 100644
--- a/src/zabbix_server/escalator.h
+++ b/src/zabbix_server/escalator/escalator.h
diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c
index 86bf4a1a..aff32a3f 100644
--- a/src/zabbix_server/server.c
+++ b/src/zabbix_server/server.c
@@ -47,7 +47,7 @@
 #include "expression.h"
 
 #include "alerter.h"
-#include "escalator.h"
+#include "escalator/escalator.h"
 #include "pinger/pinger.h"
 #include "housekeeper.h"
 #include "trapper.h"