[Nagiosplug-checkins] CVS: nagiosplug/plugins Makefile.am,1.2,1.3

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv1446

Modified Files:
	Makefile.am 
Log Message:
roll check_ftp, check_imap, check_pop, and check_nntp into check_tcp

Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am	12 Sep 2002 02:43:50 -0000	1.2
--- Makefile.am	21 Oct 2002 04:04:20 -0000	1.3
***************
*** 6,19 ****
  
  libexec_PROGRAMS = check_disk check_dummy check_ftp check_http \
! 		check_imap check_load check_mrtg check_mrtgtraf \
! 		check_nntp check_nwstat check_overcr \
! 		check_ping check_pop check_procs check_real \
! 		check_smtp check_ssh check_tcp check_time check_udp \
! 		check_ups check_users check_vsz negate urlize \
! 		@EXTRAS@
  
  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
  
  EXTRA_DIST = t utils.c netutils.c popen.c getopt.h getopt.c getopt1.c snprintf.c
--- 6,19 ----
  
  libexec_PROGRAMS = check_disk check_dummy check_ftp check_http \
! 	check_imap check_load check_mrtg check_mrtgtraf \
! 	check_nntp check_nwstat check_overcr \
! 	check_ping check_pop check_procs check_real \
! 	check_smtp check_ssh check_tcp check_time check_udp \
! 	check_ups check_users check_vsz negate urlize \
! 	@EXTRAS@
  
  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
  
  EXTRA_DIST = t utils.c netutils.c popen.c getopt.h getopt.c getopt1.c snprintf.c
***************
*** 30,34 ****
  
  test:
! 	perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
  
  AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
--- 30,34 ----
  
  test:
! perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
  
  AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
***************
*** 42,50 ****
  check_dummy_LDADD = $(BASEOBJS)
  check_fping_LDADD = $(BASEOBJS) popen.o
! check_ftp_LDADD = $(NETLIBS)
  check_game_LDADD = $(BASEOBJS)
  check_http_LDADD = $(NETLIBS) $(SSLLIBS)
  check_hpjd_LDADD = $(BASEOBJS) popen.o
! check_imap_LDADD = $(NETLIBS)
  check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
  check_load_LDADD = $(BASEOBJS) popen.o
--- 42,50 ----
  check_dummy_LDADD = $(BASEOBJS)
  check_fping_LDADD = $(BASEOBJS) popen.o
! #check_ftp_LDADD = $(NETLIBS)
  check_game_LDADD = $(BASEOBJS)
  check_http_LDADD = $(NETLIBS) $(SSLLIBS)
  check_hpjd_LDADD = $(BASEOBJS) popen.o
! #check_imap_LDADD = $(NETLIBS)
  check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
  check_load_LDADD = $(BASEOBJS) popen.o
***************
*** 53,57 ****
  check_mysql_LDADD = $(BASEOBJS) $(MYSQLLIBS)
  check_nagios_LDADD = $(BASEOBJS) popen.o
! check_nntp_LDADD = $(NETLIBS)
  check_nt_LDADD = $(NETLIBS)
  check_nwstat_LDADD = $(NETLIBS)
--- 53,57 ----
  check_mysql_LDADD = $(BASEOBJS) $(MYSQLLIBS)
  check_nagios_LDADD = $(BASEOBJS) popen.o
! #check_nntp_LDADD = $(NETLIBS)
  check_nt_LDADD = $(NETLIBS)
  check_nwstat_LDADD = $(NETLIBS)
***************
*** 59,63 ****
  check_pgsql_LDADD = $(BASEOBJS) $(PGLIBS)
  check_ping_LDADD = $(BASEOBJS) popen.o
! check_pop_LDADD = $(NETLIBS)
  check_procs_LDADD = $(BASEOBJS) popen.o
  check_radius_LDADD = $(BASEOBJS) $(RADIUSLIBS)
--- 59,63 ----
  check_pgsql_LDADD = $(BASEOBJS) $(PGLIBS)
  check_ping_LDADD = $(BASEOBJS) popen.o
! #check_pop_LDADD = $(NETLIBS)
  check_procs_LDADD = $(BASEOBJS) popen.o
  check_radius_LDADD = $(BASEOBJS) $(RADIUSLIBS)
***************
*** 82,90 ****
  check_dummy_DEPENDENCIES = check_dummy.c  $(DEPLIBS)
  check_fping_DEPENDENCIES = check_fping.c $(BASEOBJS) popen.o $(DEPLIBS)
! check_ftp_DEPENDENCIES = check_ftp.c $(NETOBJS) $(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_imap_DEPENDENCIES = check_imap.c $(NETOBJS) $(DEPLIBS)
  check_ldap_DEPENDENCIES = check_ldap.c $(NETOBJS) $(DEPLIBS)
  check_load_DEPENDENCIES = check_load.c $(BASEOBJS) popen.o $(DEPLIBS)
--- 82,90 ----
  check_dummy_DEPENDENCIES = check_dummy.c  $(DEPLIBS)
  check_fping_DEPENDENCIES = check_fping.c $(BASEOBJS) popen.o $(DEPLIBS)
! #check_ftp_DEPENDENCIES = check_ftp.c $(NETOBJS) $(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_imap_DEPENDENCIES = check_imap.c $(NETOBJS) $(DEPLIBS)
  check_ldap_DEPENDENCIES = check_ldap.c $(NETOBJS) $(DEPLIBS)
  check_load_DEPENDENCIES = check_load.c $(BASEOBJS) popen.o $(DEPLIBS)
***************
*** 93,97 ****
  check_mysql_DEPENDENCIES = check_mysql.c  $(DEPLIBS)
  check_nagios_DEPENDENCIES = check_nagios.c $(BASEOBJS) popen.o $(DEPLIBS)
! check_nntp_DEPENDENCIES = check_nntp.c $(NETOBJS) $(DEPLIBS)
  check_nt_DEPENDENCIES = check_nt.c $(NETOBJS) $(DEPLIBS)
  check_nwstat_DEPENDENCIES = check_nwstat.c $(NETOBJS) $(DEPLIBS)
--- 93,97 ----
  check_mysql_DEPENDENCIES = check_mysql.c  $(DEPLIBS)
  check_nagios_DEPENDENCIES = check_nagios.c $(BASEOBJS) popen.o $(DEPLIBS)
! #check_nntp_DEPENDENCIES = check_nntp.c $(NETOBJS) $(DEPLIBS)
  check_nt_DEPENDENCIES = check_nt.c $(NETOBJS) $(DEPLIBS)
  check_nwstat_DEPENDENCIES = check_nwstat.c $(NETOBJS) $(DEPLIBS)
***************
*** 99,103 ****
  check_pgsql_DEPENDENCIES = check_pgsql.c  $(DEPLIBS)
  check_ping_DEPENDENCIES = check_ping.c $(BASEOBJS) popen.o $(DEPLIBS)
! check_pop_DEPENDENCIES = check_pop.c $(NETOBJS) $(DEPLIBS)
  check_procs_DEPENDENCIES = check_procs.c $(BASEOBJS) popen.o $(DEPLIBS)
  check_radius_DEPENDENCIES = check_radius.c  $(DEPLIBS)
--- 99,103 ----
  check_pgsql_DEPENDENCIES = check_pgsql.c  $(DEPLIBS)
  check_ping_DEPENDENCIES = check_ping.c $(BASEOBJS) popen.o $(DEPLIBS)
! #check_pop_DEPENDENCIES = check_pop.c $(NETOBJS) $(DEPLIBS)
  check_procs_DEPENDENCIES = check_procs.c $(BASEOBJS) popen.o $(DEPLIBS)
  check_radius_DEPENDENCIES = check_radius.c  $(DEPLIBS)
***************
*** 127,141 ****
  
  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 $? -o $@
  
  libgetopt.a: getopt.o getopt1.o
! 	$(AR) -r $@ getopt.o getopt1.o
  
  libsnprintf.a: snprintf.o
! 	$(AR) -r $@ snprintf.o
--- 127,144 ----
  
  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 $? -o $@
  
  libgetopt.a: getopt.o getopt1.o
! $(AR) -r $@ getopt.o getopt1.o
  
  libsnprintf.a: snprintf.o
! $(AR) -r $@ snprintf.o
! 
! check_ftp check_imap check_nntp check_pop:
! 	ln -sf check_tcp $@