summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-08-04 22:13:23 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-08-04 22:13:23 +0000
commit07d14ad1c38707dac6bb0bc312415867c19138ee (patch)
tree5f53080686b6de73f515cc47343c3b0fba35712f /src
parent614b63acda89a7155a01cee91270c7e7ef93c672 (diff)
downloadzabbix-07d14ad1c38707dac6bb0bc312415867c19138ee.tar.gz
zabbix-07d14ad1c38707dac6bb0bc312415867c19138ee.tar.xz
zabbix-07d14ad1c38707dac6bb0bc312415867c19138ee.zip
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@1939 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
-rw-r--r--src/libs/zbxcommon/Makefile.am2
-rw-r--r--src/libs/zbxconf/Makefile.am2
-rw-r--r--src/libs/zbxcrypto/Makefile.am2
-rw-r--r--src/libs/zbxdbhigh/Makefile.am2
-rw-r--r--src/libs/zbxemail/Makefile.am2
-rw-r--r--src/libs/zbxlog/Makefile.am2
-rw-r--r--src/libs/zbxnet/Makefile.am2
-rw-r--r--src/libs/zbxpid/Makefile.am2
-rw-r--r--src/libs/zbxsysinfo/Makefile.am2
-rw-r--r--src/zabbix_agent/Makefile.am2
-rw-r--r--src/zabbix_get/Makefile.am2
-rw-r--r--src/zabbix_sender/Makefile.am2
-rw-r--r--src/zabbix_server/Makefile.am2
-rw-r--r--src/zabbix_server/alerter/Makefile.am2
-rw-r--r--src/zabbix_server/escalator/Makefile.am2
-rw-r--r--src/zabbix_server/housekeeper/Makefile.am2
-rw-r--r--src/zabbix_server/pinger/Makefile.am2
-rw-r--r--src/zabbix_server/poller/Makefile.am2
-rw-r--r--src/zabbix_server/timer/Makefile.am2
-rw-r--r--src/zabbix_server/trapper/Makefile.am2
20 files changed, 20 insertions, 20 deletions
diff --git a/src/libs/zbxcommon/Makefile.am b/src/libs/zbxcommon/Makefile.am
index bc4333cc..58952585 100644
--- a/src/libs/zbxcommon/Makefile.am
+++ b/src/libs/zbxcommon/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=.
+SUBDIRS=
lib_LIBRARIES=libzbxcommon.a
libzbxcommon_a_SOURCES=base64.c xml.c comms.c
diff --git a/src/libs/zbxconf/Makefile.am b/src/libs/zbxconf/Makefile.am
index c51925eb..a299ad7e 100644
--- a/src/libs/zbxconf/Makefile.am
+++ b/src/libs/zbxconf/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=.
+SUBDIRS=
lib_LIBRARIES=libzbxconf.a
libzbxconf_a_SOURCES=cfg.c
diff --git a/src/libs/zbxcrypto/Makefile.am b/src/libs/zbxcrypto/Makefile.am
index 9a3b7965..e9981ea9 100644
--- a/src/libs/zbxcrypto/Makefile.am
+++ b/src/libs/zbxcrypto/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=.
+SUBDIRS=
lib_LIBRARIES=libzbxcrypto.a
libzbxcrypto_a_SOURCES=md5.c
diff --git a/src/libs/zbxdbhigh/Makefile.am b/src/libs/zbxdbhigh/Makefile.am
index 6e0cf935..0dea1cdd 100644
--- a/src/libs/zbxdbhigh/Makefile.am
+++ b/src/libs/zbxdbhigh/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=.
+SUBDIRS=
INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@ @PGSQL_INCLUDE@
lib_LIBRARIES=libzbxdbhigh.a
libzbxdbhigh_a_SOURCES=db.c
diff --git a/src/libs/zbxemail/Makefile.am b/src/libs/zbxemail/Makefile.am
index eb8f53b5..37ed0cf6 100644
--- a/src/libs/zbxemail/Makefile.am
+++ b/src/libs/zbxemail/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=.
+SUBDIRS=
lib_LIBRARIES=libzbxemail.a
libzbxemail_a_SOURCES=email.c
diff --git a/src/libs/zbxlog/Makefile.am b/src/libs/zbxlog/Makefile.am
index 0d02fa69..73f21e39 100644
--- a/src/libs/zbxlog/Makefile.am
+++ b/src/libs/zbxlog/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=.
+SUBDIRS=
lib_LIBRARIES=libzbxlog.a
libzbxlog_a_SOURCES=log.c
diff --git a/src/libs/zbxnet/Makefile.am b/src/libs/zbxnet/Makefile.am
index 7e4c0cd2..f2a00f45 100644
--- a/src/libs/zbxnet/Makefile.am
+++ b/src/libs/zbxnet/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=.
+SUBDIRS=
lib_LIBRARIES=libzbxnet.a
libzbxnet_a_SOURCES=security.c
diff --git a/src/libs/zbxpid/Makefile.am b/src/libs/zbxpid/Makefile.am
index e1e2d137..8115f264 100644
--- a/src/libs/zbxpid/Makefile.am
+++ b/src/libs/zbxpid/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=.
+SUBDIRS=
lib_LIBRARIES=libzbxpid.a
libzbxpid_a_SOURCES=pid.c
diff --git a/src/libs/zbxsysinfo/Makefile.am b/src/libs/zbxsysinfo/Makefile.am
index 67a64e14..d4ee27ca 100644
--- a/src/libs/zbxsysinfo/Makefile.am
+++ b/src/libs/zbxsysinfo/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=.
+SUBDIRS=
lib_LIBRARIES=libzbxsysinfo.a
libzbxsysinfo_a_SOURCES=cpu.c diskio.c diskspace.c file.c inodes.c memory.c sensors.c swap.c uptime.c sysinfo.c
libzbxsysinfo_a_LIBADD = ../zbxcrypto/libzbxcrypto.a
diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am
index 7ff5a5e5..fdb032e5 100644
--- a/src/zabbix_agent/Makefile.am
+++ b/src/zabbix_agent/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = .
+SUBDIRS =
bin_PROGRAMS = zabbix_agent zabbix_agentd
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 \
diff --git a/src/zabbix_get/Makefile.am b/src/zabbix_get/Makefile.am
index 82d397b1..685cae28 100644
--- a/src/zabbix_get/Makefile.am
+++ b/src/zabbix_get/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = .
+SUBDIRS =
bin_PROGRAMS = zabbix_get
zabbix_get_SOURCES = zabbix_get.c
diff --git a/src/zabbix_sender/Makefile.am b/src/zabbix_sender/Makefile.am
index 61ba68c6..9a868152 100644
--- a/src/zabbix_sender/Makefile.am
+++ b/src/zabbix_sender/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = .
+SUBDIRS =
bin_PROGRAMS = zabbix_sender
zabbix_sender_SOURCES = zabbix_sender.c
zabbix_sender_LDADD = ../libs/zbxcommon/libzbxcommon.a
diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
index c6252fdd..0fd05525 100644
--- a/src/zabbix_server/Makefile.am
+++ b/src/zabbix_server/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = alerter escalator housekeeper pinger poller timer trapper .
+SUBDIRS = alerter escalator housekeeper pinger poller timer trapper
INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@ @SNMP_INCLUDE@
bin_PROGRAMS = zabbix_server
diff --git a/src/zabbix_server/alerter/Makefile.am b/src/zabbix_server/alerter/Makefile.am
index df1fd715..a3b44d51 100644
--- a/src/zabbix_server/alerter/Makefile.am
+++ b/src/zabbix_server/alerter/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=.
+SUBDIRS=
INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@
lib_LIBRARIES=libzbxalerter.a
libzbxalerter_a_SOURCES=alerter.c
diff --git a/src/zabbix_server/escalator/Makefile.am b/src/zabbix_server/escalator/Makefile.am
index 4008e4dc..5071f2c2 100644
--- a/src/zabbix_server/escalator/Makefile.am
+++ b/src/zabbix_server/escalator/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=.
+SUBDIRS=
INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@
lib_LIBRARIES=libzbxescalator.a
libzbxescalator_a_SOURCES=escalator.c
diff --git a/src/zabbix_server/housekeeper/Makefile.am b/src/zabbix_server/housekeeper/Makefile.am
index 2723f333..2769399a 100644
--- a/src/zabbix_server/housekeeper/Makefile.am
+++ b/src/zabbix_server/housekeeper/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=.
+SUBDIRS=
INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@
lib_LIBRARIES=libzbxhousekeeper.a
libzbxhousekeeper_a_SOURCES=housekeeper.c
diff --git a/src/zabbix_server/pinger/Makefile.am b/src/zabbix_server/pinger/Makefile.am
index 5f528b9e..090491ba 100644
--- a/src/zabbix_server/pinger/Makefile.am
+++ b/src/zabbix_server/pinger/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=.
+SUBDIRS=
INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@
lib_LIBRARIES=libzbxpinger.a
libzbxpinger_a_SOURCES=pinger.c
diff --git a/src/zabbix_server/poller/Makefile.am b/src/zabbix_server/poller/Makefile.am
index 3b342616..c81a4f24 100644
--- a/src/zabbix_server/poller/Makefile.am
+++ b/src/zabbix_server/poller/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=.
+SUBDIRS=
INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@
lib_LIBRARIES=libzbxpoller.a
libzbxpoller_a_SOURCES=checks_agent.c checks_internal.c checks_simple.c checks_snmp.c poller.c
diff --git a/src/zabbix_server/timer/Makefile.am b/src/zabbix_server/timer/Makefile.am
index a1746574..ed86b9b3 100644
--- a/src/zabbix_server/timer/Makefile.am
+++ b/src/zabbix_server/timer/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=.
+SUBDIRS=
INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@
lib_LIBRARIES=libzbxtimer.a
libzbxtimer_a_SOURCES=timer.c
diff --git a/src/zabbix_server/trapper/Makefile.am b/src/zabbix_server/trapper/Makefile.am
index 2579e000..c108b777 100644
--- a/src/zabbix_server/trapper/Makefile.am
+++ b/src/zabbix_server/trapper/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=.
+SUBDIRS=
INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@
lib_LIBRARIES=libzbxtrapper.a
libzbxtrapper_a_SOURCES=active.c trapper.c