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

[Karl DeBisschop]

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

Modified Files:
	Makefile.am 
Log Message:
need to define SOURCES for check_tcp to also build as check_ftp,check_imap,check_nntp,check_pop

Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am	21 Oct 2002 04:04:20 -0000	1.3
--- Makefile.am	21 Oct 2002 04:36:46 -0000	1.4
***************
*** 5,14 ****
  INCLUDES = @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ 
  
! 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@
  
--- 5,13 ----
  INCLUDES = @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ 
  
! libexec_PROGRAMS = 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_ftp check_imap check_nntp check_pop \
  	@EXTRAS@
  
***************
*** 30,34 ****
  
  test:
! perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
  
  AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
--- 29,33 ----
  
  test:
! 	perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
  
  AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
***************
*** 37,40 ****
--- 36,44 ----
  # the actual targets
  
+ check_ftp_SOURCES = check_tcp.c
+ check_imap_SOURCES = check_tcp.c
+ check_nntp_SOURCES = check_tcp.c
+ check_pop_SOURCES = check_tcp.c
+ 
  check_dig_LDADD = $(BASEOBJS) popen.o
  check_disk_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
--- 46,52 ----
***************
*** 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)
--- 55,58 ----
***************
*** 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)
--- 60,63 ----
***************
*** 76,79 ****
--- 76,83 ----
  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)
***************
*** 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)
--- 86,92 ----
***************
*** 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)
--- 95,98 ----
***************
*** 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)
--- 100,103 ----
***************
*** 116,119 ****
--- 116,123 ----
  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)
  
  ##############################################################################
***************
*** 127,143 ****
  
  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:
--- 131,147 ----
  
  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: