diff options
author | Ton Voon <tonvoon@users.sourceforge.net> | 2003-03-08 01:59:31 +0000 |
---|---|---|
committer | Ton Voon <tonvoon@users.sourceforge.net> | 2003-03-08 01:59:31 +0000 |
commit | 8b6d3138337997b266720518c7b0dfd42462f482 (patch) | |
tree | 0701345fe1296e53a23693115d4461d8fae8972b | |
parent | 1f96af37e3c4396e10d39239928c689ea5d0a9a1 (diff) | |
download | monitoring-plugins-8b6d3138337997b266720518c7b0dfd42462f482.tar.gz |
Move snprintf into lib
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@382 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r-- | lib/Makefile.am | 2 | ||||
-rw-r--r-- | lib/snprintf.c (renamed from plugins/snprintf.c) | 0 | ||||
-rw-r--r-- | plugins/Makefile.am | 9 |
3 files changed, 2 insertions, 9 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 7826a286..846eeae9 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am | |||
@@ -4,7 +4,7 @@ noinst_LIBRARIES = libnagiosplug.a | |||
4 | 4 | ||
5 | noinst_HEADERS = getopt.h getaddrinfo.h gethostbyname.h | 5 | noinst_HEADERS = getopt.h getaddrinfo.h gethostbyname.h |
6 | 6 | ||
7 | libnagiosplug_a_SOURCES = getopt.c getopt1.c getloadavg.c | 7 | libnagiosplug_a_SOURCES = getopt.c getopt1.c getloadavg.c snprintf.c |
8 | 8 | ||
9 | INCLUDES = -I$(srcdir) | 9 | INCLUDES = -I$(srcdir) |
10 | 10 | ||
diff --git a/plugins/snprintf.c b/lib/snprintf.c index 3de2a96f..3de2a96f 100644 --- a/plugins/snprintf.c +++ b/lib/snprintf.c | |||
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 851745a7..bd5b5500 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am | |||
@@ -16,8 +16,7 @@ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \ | |||
16 | 16 | ||
17 | check_tcp_programs = check_ftp check_imap check_nntp check_pop | 17 | check_tcp_programs = check_ftp check_imap check_nntp check_pop |
18 | 18 | ||
19 | EXTRA_DIST = t utils.c netutils.c popen.c \ | 19 | EXTRA_DIST = t utils.c netutils.c popen.c |
20 | snprintf.c | ||
21 | 20 | ||
22 | PLUGINHDRS = common.h config.h | 21 | PLUGINHDRS = common.h config.h |
23 | 22 | ||
@@ -118,12 +117,6 @@ utils.o: utils.c utils.h $(PLUGINHDRS) | |||
118 | 117 | ||
119 | netutils.o: netutils.c netutils.h $(PLUGINHDRS) | 118 | netutils.o: netutils.c netutils.h $(PLUGINHDRS) |
120 | 119 | ||
121 | snprintf.o: snprintf.c | ||
122 | $(COMPILE) @NEED_VA_LIST@ -c $(srcdir)/snprintf.c -o $@ | ||
123 | |||
124 | libsnprintf.a: snprintf.o | ||
125 | $(AR) -r $@ snprintf.o | ||
126 | |||
127 | all-local: $(check_tcp_programs) | 120 | all-local: $(check_tcp_programs) |
128 | 121 | ||
129 | $(check_tcp_programs): check_tcp | 122 | $(check_tcp_programs): check_tcp |