[Nagiosplug-checkins] CVS: nagiosplug/plugins Makefile.am,1.18,1.19

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv22253

Modified Files:
	Makefile.am 
Log Message:
Remove unnecessary getopt references and link in lib directory


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** Makefile.am	3 Feb 2003 21:33:54 -0000	1.18
--- Makefile.am	10 Feb 2003 23:27:31 -0000	1.19
***************
*** 1,7 ****
  ## Process this file with automake to produce Makefile.in
  
! VPATH = $(top_srcdir) $(top_srcdir)/plugins $(top_srcdir)/plugins/t
  
! INCLUDES = @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ 
  
  libexec_PROGRAMS = check_disk check_dummy check_http check_load \
--- 1,7 ----
  ## Process this file with automake to produce Makefile.in
  
! VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 
  
! INCLUDES = -I.. -I$(top_srcdir)/lib @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ 
  
  libexec_PROGRAMS = check_disk check_dummy check_http check_load \
***************
*** 17,26 ****
  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 \
  	snprintf.c getloadavg.c
  
  PLUGINHDRS = common.h config.h
  
! BASEOBJS = utils.o
  NETOBJS = netutils.o $(BASEOBJS)
  NETLIBS = $(NETOBJS) $(SOCKETLIBS)
--- 17,26 ----
  check_tcp_programs = check_ftp check_imap check_nntp check_pop
  
! EXTRA_DIST = t utils.c netutils.c popen.c \
  	snprintf.c getloadavg.c
  
  PLUGINHDRS = common.h config.h
  
! BASEOBJS = utils.o ../lib/libnagiosplug.a
  NETOBJS = netutils.o $(BASEOBJS)
  NETLIBS = $(NETOBJS) $(SOCKETLIBS)
***************
*** 119,134 ****
  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
- 	$(RANLIB) $@
  
  libsnprintf.a: snprintf.o
--- 119,124 ----