X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2FMakefile.am;h=d983192b6657535072acdfc3e6d289df21b0d05a;hb=45b373ebdad0c82296342f4ad774db2ff643e511;hp=eb67e458e2446f9da6363ecfac4d128267afa5b1;hpb=7d25147c1e1cadd11b6ffba18c6d6ba4bb334a7b;p=nagiosplug.git

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index eb67e45..d983192 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -8,12 +8,12 @@ INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl \
 datadir = @datadir@
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-LIBS = @LIBINTL@ @LIBS@
+LIBS = @LIBINTL@ @LIBS@ @SSLINCLUDE@
 
 libexec_PROGRAMS = check_dhcp check_disk check_dummy check_http check_load \
 	check_mrtg check_mrtgtraf check_nwstat check_overcr check_ping \
 	check_real check_smtp check_ssh check_tcp check_time \
-	check_udp check_ups check_users negate urlize check_icmp \
+	check_udp check_ups check_users negate urlize check_icmp\
 	@EXTRAS@
 
 check_tcp_programs = check_ftp check_imap check_nntp check_pop check_udp2 \
@@ -21,14 +21,15 @@ check_tcp_programs = check_ftp check_imap check_nntp check_pop check_udp2 \
 
 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_ide_smart check_procs
+	check_nagios check_by_ssh check_dns check_nt check_ide_smart	\
+	check_procs
 
 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
 
 PLUGINHDRS = common.h
 
-BASEOBJS = utils.o ../lib/libnagiosplug.a
+BASEOBJS = utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a
 NETOBJS = netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
 
@@ -44,7 +45,7 @@ AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
 ##############################################################################
 # the actual targets
 
-check_dhcp_LDADD = $(BASEOBJS)
+check_dhcp_LDADD = $(NETLIBS)
 check_dig_LDADD = $(NETLIBS) popen.o 
 check_disk_LDADD = $(BASEOBJS) popen.o
 check_dns_LDADD = $(NETLIBS) popen.o
@@ -53,6 +54,7 @@ check_fping_LDADD = $(NETLIBS) popen.o
 check_game_LDADD = $(BASEOBJS) popen.o
 check_http_LDADD = $(NETLIBS) $(SSLLIBS)
 check_hpjd_LDADD = $(NETLIBS) popen.o
+check_icmp_LDADD = $(SOCKETLIBS)
 check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
 check_load_LDADD = $(BASEOBJS) popen.o
 check_mrtg_LDADD = $(BASEOBJS)
@@ -68,7 +70,7 @@ check_procs_LDADD = $(BASEOBJS) popen.o
 check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS)
 check_real_LDADD = $(NETLIBS)
 check_snmp_LDADD = $(BASEOBJS) popen.o
-check_smtp_LDADD = $(NETLIBS)
+check_smtp_LDADD = $(NETLIBS) $(SSLLIBS)
 check_ssh_LDADD = $(NETLIBS)
 check_swap_LDADD = $(BASEOBJS) popen.o
 check_tcp_LDADD = $(NETLIBS) $(SSLLIBS)
@@ -81,7 +83,7 @@ check_ide_smart_LDADD = $(BASEOBJS)
 negate_LDADD = $(BASEOBJS) popen.o
 urlize_LDADD = $(BASEOBJS) popen.o
 
-check_dhcp_DEPENDENCIES = check_dhcp.c $(BASEOBJS) $(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 $(NETOBJS) popen.o $(DEPLIBS)
@@ -90,7 +92,7 @@ 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 $(NETOBJS) popen.o $(DEPLIBS)
-check_icmp_DEPENDENCIES = check_icmp.c $(DEPLIBS)
+check_icmp_DEPENDENCIES = check_icmp.c
 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)
@@ -140,8 +142,9 @@ $(check_tcp_programs): check_tcp
 
 install-exec-hook:
 	cd $(DESTDIR)$(libexecdir) && \
-	for i in $(check_tcp_programs) ; do rm -f $$i; ln -s 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)