summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2003-02-10 23:27:31 (GMT)
committerTon Voon <tonvoon@users.sourceforge.net>2003-02-10 23:27:31 (GMT)
commit07a08052081b59d26add4adf0ae4519fbacb8a36 (patch)
treee1e81bfa5e0ffb304c02548aeb5d760b4d41c840
parentfb6811f9be0d85f5fceedb3ba7458e56386fc3a0 (diff)
downloadmonitoring-plugins-07a08052081b59d26add4adf0ae4519fbacb8a36.tar.gz
Remove unnecessary getopt references and link in lib directory
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@310 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--plugins/Makefile.am18
1 files changed, 4 insertions, 14 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index d21a20d..664ac52 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,8 +1,8 @@
1## Process this file with automake to produce Makefile.in 1## Process this file with automake to produce Makefile.in
2 2
3VPATH = $(top_srcdir) $(top_srcdir)/plugins $(top_srcdir)/plugins/t 3VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
4 4
5INCLUDES = @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ 5INCLUDES = -I.. -I$(top_srcdir)/lib @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
6 6
7libexec_PROGRAMS = check_disk check_dummy check_http check_load \ 7libexec_PROGRAMS = check_disk check_dummy check_http check_load \
8 check_mrtg check_mrtgtraf check_nwstat check_overcr check_ping \ 8 check_mrtg check_mrtgtraf check_nwstat check_overcr check_ping \
@@ -16,12 +16,12 @@ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
16 16
17check_tcp_programs = check_ftp check_imap check_nntp check_pop 17check_tcp_programs = check_ftp check_imap check_nntp check_pop
18 18
19EXTRA_DIST = t utils.c netutils.c popen.c getopt.h getopt.c getopt1.c \ 19EXTRA_DIST = t utils.c netutils.c popen.c \
20 snprintf.c getloadavg.c 20 snprintf.c getloadavg.c
21 21
22PLUGINHDRS = common.h config.h 22PLUGINHDRS = common.h config.h
23 23
24BASEOBJS = utils.o 24BASEOBJS = utils.o ../lib/libnagiosplug.a
25NETOBJS = netutils.o $(BASEOBJS) 25NETOBJS = netutils.o $(BASEOBJS)
26NETLIBS = $(NETOBJS) $(SOCKETLIBS) 26NETLIBS = $(NETOBJS) $(SOCKETLIBS)
27 27
@@ -118,19 +118,9 @@ utils.o: utils.c utils.h $(PLUGINHDRS)
118 118
119netutils.o: netutils.c netutils.h $(PLUGINHDRS) 119netutils.o: netutils.c netutils.h $(PLUGINHDRS)
120 120
121getopt.o: getopt.c getopt.h
122 $(COMPILE) -c $(srcdir)/getopt.c -o $@
123
124getopt1.o: getopt1.c getopt.h
125 $(COMPILE) -c $(srcdir)/getopt1.c -o $@
126
127snprintf.o: snprintf.c 121snprintf.o: snprintf.c
128 $(COMPILE) @NEED_VA_LIST@ -c $(srcdir)/snprintf.c -o $@ 122 $(COMPILE) @NEED_VA_LIST@ -c $(srcdir)/snprintf.c -o $@
129 123
130libgetopt.a: getopt.o getopt1.o
131 $(AR) -r $@ getopt.o getopt1.o
132 $(RANLIB) $@
133
134libsnprintf.a: snprintf.o 124libsnprintf.a: snprintf.o
135 $(AR) -r $@ snprintf.o 125 $(AR) -r $@ snprintf.o
136 126