Remove unnecessary getopt references and link in lib directory

[nagiosplug.git] / plugins / Makefile.am

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 3e2d907869b49481fa988702457d381b1caf02d3..664ac5226cb25f060a7b18c51d0fb50ea131230a 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-VPATH = $(top_srcdir) $(top_srcdir)/plugins $(top_srcdir)/plugins/t
+VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 
 
-INCLUDES = @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ 
+INCLUDES = -I.. -I$(top_srcdir)/lib @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ 
 
 libexec_PROGRAMS = check_disk check_dummy check_http check_load \
        check_mrtg check_mrtgtraf check_nwstat check_overcr check_ping \
@@ -12,16 +12,16 @@ libexec_PROGRAMS = check_disk check_dummy check_http check_load \
 
 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_nagios check_by_ssh check_dns check_nt
 
 check_tcp_programs = check_ftp check_imap check_nntp check_pop
 
-EXTRA_DIST = t utils.c netutils.c popen.c getopt.h getopt.c getopt1.c \
+EXTRA_DIST = t utils.c netutils.c popen.c \
        snprintf.c getloadavg.c
 
 PLUGINHDRS = common.h config.h
 
-BASEOBJS = utils.o
+BASEOBJS = utils.o ../lib/libnagiosplug.a
 NETOBJS = netutils.o $(BASEOBJS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
 
@@ -51,6 +51,7 @@ check_mrtg_LDADD = $(BASEOBJS)
 check_mrtgtraf_LDADD = $(BASEOBJS)
 check_mysql_LDADD = $(BASEOBJS) $(MYSQLLIBS)
 check_nagios_LDADD = $(BASEOBJS) popen.o
+check_nt_LDADD = $(NETLIBS) 
 check_nwstat_LDADD = $(NETLIBS)
 check_overcr_LDADD = $(NETLIBS)
 check_pgsql_LDADD = $(BASEOBJS) $(PGLIBS)
@@ -72,11 +73,6 @@ check_by_ssh_LDADD = $(BASEOBJS) popen.o
 negate_LDADD = $(BASEOBJS) popen.o
 urlize_LDADD = $(BASEOBJS) popen.o
 
-#check_ftp_LDADD = $(NETLIBS) $(SSLLIBS)
-#check_imap_LDADD = $(NETLIBS) $(SSLLIBS)
-#check_nntp_LDADD = $(NETLIBS) $(SSLLIBS)
-#check_pop_LDADD = $(NETLIBS) $(SSLLIBS)
-
 check_dig_DEPENDENCIES = check_dig.c $(BASEOBJS) popen.o $(DEPLIBS)
 check_disk_DEPENDENCIES = check_disk.c $(BASEOBJS) popen.o $(DEPLIBS)
 check_dns_DEPENDENCIES = check_dns.c $(BASEOBJS) popen.o $(DEPLIBS)
@@ -91,6 +87,7 @@ check_mrtg_DEPENDENCIES = check_mrtg.c  $(DEPLIBS)
 check_mrtgtraf_DEPENDENCIES = check_mrtgtraf.c  $(DEPLIBS)
 check_mysql_DEPENDENCIES = check_mysql.c  $(DEPLIBS)
 check_nagios_DEPENDENCIES = check_nagios.c $(BASEOBJS) popen.o $(DEPLIBS)
+check_nt_DEPENDENCIES = check_nt.c $(BASEOBJS) $(DEPLIBS)
 check_nwstat_DEPENDENCIES = check_nwstat.c $(NETOBJS) $(DEPLIBS)
 check_overcr_DEPENDENCIES = check_overcr.c $(NETOBJS) $(DEPLIBS)
 check_pgsql_DEPENDENCIES = check_pgsql.c  $(DEPLIBS)
@@ -112,11 +109,6 @@ check_by_ssh_DEPENDENCIES = check_by_ssh.c $(BASEOBJS) popen.o $(DEPLIBS)
 negate_DEPENDENCIES = negate.c $(BASEOBJS) popen.o $(DEPLIBS)
 urlize_DEPENDENCIES = urlize.c $(BASEOBJS) popen.o $(DEPLIBS)
 
-#check_ftp_DEPENDENCIES = check_tcp.c $(NETOBJS) $(DEPLIBS)
-#check_imap_DEPENDENCIES = check_tcp.c $(NETOBJS) $(DEPLIBS)
-#check_nntp_DEPENDENCIES = check_tcp.c $(NETOBJS) $(DEPLIBS)
-#check_pop_DEPENDENCIES = check_tcp.c $(NETOBJS) $(DEPLIBS)
-
 ##############################################################################
 # secondary dependencies
 
@@ -126,18 +118,9 @@ utils.o: utils.c utils.h $(PLUGINHDRS)
 
 netutils.o: netutils.c netutils.h $(PLUGINHDRS)
 
-getopt.o: getopt.c getopt.h
-       $(COMPILE) -c $(srcdir)/getopt.c -o $@
-
-getopt1.o: getopt1.c getopt.h
-       $(COMPILE) -c $(srcdir)/getopt1.c -o $@
-
 snprintf.o: snprintf.c
        $(COMPILE) @NEED_VA_LIST@ -c $(srcdir)/snprintf.c -o $@
 
-libgetopt.a: getopt.o getopt1.o
-       $(AR) -r $@ getopt.o getopt1.o
-
 libsnprintf.a: snprintf.o
        $(AR) -r $@ snprintf.o
 
@@ -147,9 +130,8 @@ $(check_tcp_programs): check_tcp
        ln -sf check_tcp $@
 
 install-exec-hook:
-       for i in $(check_tcp_programs) ; do \
-               ln -sf $(DESTDIR)$(libexecdir)/check_tcp $$i; \
-       done
+       cd $(DESTDIR)$(libexecdir) && \
+       for i in $(check_tcp_programs) ; do rm -f $$i; ln -sf check_tcp $$i ; done
 
 clean-local:
        rm -f $(check_tcp_programs)