![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 851745a7d32d91160e1d5ad082440585c8581310..13bca701e011db0faa0882ac305c98ad793765ba 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
-INCLUDES = -I.. -I$(top_srcdir)/lib @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
+INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl \
+@LDAPINCLUDE@ @PGINCLUDE@
-libexec_PROGRAMS = check_disk check_dummy check_http check_load \
+datadir = @datadir@
+localedir = $(datadir)/locale
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+LIBS = @LIBINTL@ @LIBS@
+
+libexec_PROGRAMS = check_dhcp check_disk check_dummy check_http check_load \
check_mrtg check_mrtgtraf check_nwstat check_overcr check_ping \
- check_procs check_real check_smtp check_ssh check_tcp check_time \
- check_udp check_ups check_users check_vsz negate urlize \
+ check_real check_smtp check_ssh check_tcp check_time \
+ check_udp check_ups check_users negate urlize check_icmp \
@EXTRAS@
+check_tcp_programs = check_ftp check_imap check_nntp check_pop check_udp2 \
+ @check_tcp_ssl@
+
EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
check_swap check_fping check_ldap check_game check_dig \
- check_nagios check_by_ssh check_dns check_nt
+ check_nagios check_by_ssh check_dns check_nt check_ide_smart check_procs
-check_tcp_programs = check_ftp check_imap check_nntp check_pop
+EXTRA_DIST = t utils.c netutils.c popen.c utils.h netutils.h popen.h common.h \
+ getaddrinfo.c getaddrinfo.h gethostbyname.c gethostbyname.h
-EXTRA_DIST = t utils.c netutils.c popen.c \
- snprintf.c
+PLUGINHDRS = common.h
-PLUGINHDRS = common.h config.h
-
-BASEOBJS = utils.o ../lib/libnagiosplug.a
-NETOBJS = netutils.o $(BASEOBJS)
+BASEOBJS = utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a
+NETOBJS = netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
NETLIBS = $(NETOBJS) $(SOCKETLIBS)
TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)
##############################################################################
# the actual targets
-check_dig_LDADD = $(BASEOBJS) popen.o
+check_dhcp_LDADD = $(NETLIBS)
+check_dig_LDADD = $(NETLIBS) popen.o
check_disk_LDADD = $(BASEOBJS) popen.o
-check_dns_LDADD = $(BASEOBJS) popen.o
+check_dns_LDADD = $(NETLIBS) popen.o
check_dummy_LDADD = $(BASEOBJS)
-check_fping_LDADD = $(BASEOBJS) popen.o
-check_game_LDADD = $(BASEOBJS)
+check_fping_LDADD = $(NETLIBS) popen.o
+check_game_LDADD = $(BASEOBJS) popen.o
check_http_LDADD = $(NETLIBS) $(SSLLIBS)
-check_hpjd_LDADD = $(BASEOBJS) popen.o
+check_hpjd_LDADD = $(NETLIBS) popen.o
check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
check_load_LDADD = $(BASEOBJS) popen.o
check_mrtg_LDADD = $(BASEOBJS)
check_mrtgtraf_LDADD = $(BASEOBJS)
-check_mysql_LDADD = $(BASEOBJS) $(MYSQLLIBS)
+check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS)
check_nagios_LDADD = $(BASEOBJS) popen.o
check_nt_LDADD = $(NETLIBS)
check_nwstat_LDADD = $(NETLIBS)
check_overcr_LDADD = $(NETLIBS)
-check_pgsql_LDADD = $(BASEOBJS) $(PGLIBS)
-check_ping_LDADD = $(BASEOBJS) popen.o
+check_pgsql_LDADD = $(NETLIBS) $(PGLIBS)
+check_ping_LDADD = $(NETLIBS) popen.o
check_procs_LDADD = $(BASEOBJS) popen.o
-check_radius_LDADD = $(BASEOBJS) $(RADIUSLIBS)
+check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS)
check_real_LDADD = $(NETLIBS)
check_snmp_LDADD = $(BASEOBJS) popen.o
check_smtp_LDADD = $(NETLIBS)
check_udp_LDADD = $(NETLIBS)
check_ups_LDADD = $(NETLIBS)
check_users_LDADD = $(BASEOBJS) popen.o
-check_vsz_LDADD = $(BASEOBJS) popen.o
-check_by_ssh_LDADD = $(BASEOBJS) popen.o
+check_by_ssh_LDADD = $(NETLIBS) popen.o
+check_ide_smart_LDADD = $(BASEOBJS)
negate_LDADD = $(BASEOBJS) popen.o
urlize_LDADD = $(BASEOBJS) popen.o
-check_dig_DEPENDENCIES = check_dig.c $(BASEOBJS) popen.o $(DEPLIBS)
+check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS)
+check_dig_DEPENDENCIES = check_dig.c $(NETOBJS) popen.o $(DEPLIBS)
check_disk_DEPENDENCIES = check_disk.c $(BASEOBJS) popen.o $(DEPLIBS)
-check_dns_DEPENDENCIES = check_dns.c $(BASEOBJS) popen.o $(DEPLIBS)
-check_dummy_DEPENDENCIES = check_dummy.c $(DEPLIBS)
-check_fping_DEPENDENCIES = check_fping.c $(BASEOBJS) popen.o $(DEPLIBS)
+check_dns_DEPENDENCIES = check_dns.c $(NETOBJS) popen.o $(DEPLIBS)
+check_dummy_DEPENDENCIES = check_dummy.c $(DEPLIBS)
+check_fping_DEPENDENCIES = check_fping.c $(NETOBJS) popen.o $(DEPLIBS)
check_game_DEPENDENCIES = check_game.c $(DEPLIBS)
check_http_DEPENDENCIES = check_http.c $(NETOBJS) $(DEPLIBS)
-check_hpjd_DEPENDENCIES = check_hpjd.c $(BASEOBJS) popen.o $(DEPLIBS)
+check_hpjd_DEPENDENCIES = check_hpjd.c $(NETOBJS) popen.o $(DEPLIBS)
+check_icmp_DEPENDENCIES = check_icmp.c $(DEPLIBS)
+check_ide_smart_DEPENDENCIES = check_ide_smart.c $(BASEOBJS) $(DEPLIBS)
check_ldap_DEPENDENCIES = check_ldap.c $(NETOBJS) $(DEPLIBS)
check_load_DEPENDENCIES = check_load.c $(BASEOBJS) popen.o $(DEPLIBS)
-check_mrtg_DEPENDENCIES = check_mrtg.c $(DEPLIBS)
-check_mrtgtraf_DEPENDENCIES = check_mrtgtraf.c $(DEPLIBS)
-check_mysql_DEPENDENCIES = check_mysql.c $(DEPLIBS)
+check_mrtg_DEPENDENCIES = check_mrtg.c $(DEPLIBS)
+check_mrtgtraf_DEPENDENCIES = check_mrtgtraf.c $(DEPLIBS)
+check_mysql_DEPENDENCIES = check_mysql.c $(NETOBJS) $(DEPLIBS)
check_nagios_DEPENDENCIES = check_nagios.c $(BASEOBJS) popen.o $(DEPLIBS)
check_nt_DEPENDENCIES = check_nt.c $(NETOBJS) $(DEPLIBS)
check_nwstat_DEPENDENCIES = check_nwstat.c $(NETOBJS) $(DEPLIBS)
check_overcr_DEPENDENCIES = check_overcr.c $(NETOBJS) $(DEPLIBS)
-check_pgsql_DEPENDENCIES = check_pgsql.c $(DEPLIBS)
-check_ping_DEPENDENCIES = check_ping.c $(BASEOBJS) popen.o $(DEPLIBS)
+check_pgsql_DEPENDENCIES = check_pgsql.c $(NETOBJS) $(DEPLIBS)
+check_ping_DEPENDENCIES = check_ping.c $(NETOBJS) popen.o $(DEPLIBS)
check_procs_DEPENDENCIES = check_procs.c $(BASEOBJS) popen.o $(DEPLIBS)
-check_radius_DEPENDENCIES = check_radius.c $(DEPLIBS)
+check_radius_DEPENDENCIES = check_radius.c $(NETOBJS) $(DEPLIBS)
check_real_DEPENDENCIES = check_real.c $(NETOBJS) $(DEPLIBS)
check_snmp_DEPENDENCIES = check_snmp.c $(BASEOBJS) popen.o $(DEPLIBS)
check_smtp_DEPENDENCIES = check_smtp.c $(NETOBJS) $(DEPLIBS)
check_udp_DEPENDENCIES = check_udp.c $(NETOBJS) $(DEPLIBS)
check_ups_DEPENDENCIES = check_ups.c $(NETOBJS) $(DEPLIBS)
check_users_DEPENDENCIES = check_users.c $(BASEOBJS) popen.o $(DEPLIBS)
-check_vsz_DEPENDENCIES = check_vsz.c $(BASEOBJS) popen.o $(DEPLIBS)
-check_by_ssh_DEPENDENCIES = check_by_ssh.c $(BASEOBJS) popen.o $(DEPLIBS)
+check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) popen.o $(DEPLIBS)
negate_DEPENDENCIES = negate.c $(BASEOBJS) popen.o $(DEPLIBS)
urlize_DEPENDENCIES = urlize.c $(BASEOBJS) popen.o $(DEPLIBS)
netutils.o: netutils.c netutils.h $(PLUGINHDRS)
-snprintf.o: snprintf.c
- $(COMPILE) @NEED_VA_LIST@ -c $(srcdir)/snprintf.c -o $@
+getaddrinfo.o: getaddrinfo.h $(PLUGINHDRS)
-libsnprintf.a: snprintf.o
- $(AR) -r $@ snprintf.o
+gethostbyname.o: gethostbyname.h $(PLUGINHDRS)
all-local: $(check_tcp_programs)
$(check_tcp_programs): check_tcp
- ln -sf check_tcp $@
+ rm -f $@
+ ln -s check_tcp $@
install-exec-hook:
cd $(DESTDIR)$(libexecdir) && \
- for i in $(check_tcp_programs) ; do rm -f $$i; ln -sf check_tcp $$i ; done
-
+ for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
+ rm -f check_ldaps ; ln -s -f check_ldap check_ldaps
+
clean-local:
rm -f $(check_tcp_programs)