From 6fbd14fea5c111a23d9074d25499991cbfa58f79 Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Sun, 23 Nov 2008 05:38:47 +0000 Subject: Removing CVS/SVN tags and replacing with git-based versioning For contrib/, full tags have been imported from subversion git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2091 f882894a-f735-0410-b71e-b25c423dba1c --- plugins-root/Makefile.am | 13 +++++++++++++ plugins-root/check_dhcp.c | 8 ++------ plugins-root/check_icmp.c | 8 ++------ plugins-root/t/check_icmp.t | 2 -- 4 files changed, 17 insertions(+), 14 deletions(-) (limited to 'plugins-root') diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index 107d9933..de8813ff 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in +NP-VERSION-FILE: .FORCE-NP-VERSION-FILE + @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN +-include NP-VERSION-FILE + +AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"' + VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir) INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@ @@ -74,3 +80,10 @@ pst3_LDFLAGS = @PST3CFLAGS@ check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS) + +all-local: .FORCE-NP-VERSION-FILE + +clean-local: + rm -f NP-VERSION-FILE + +.PHONY: .FORCE-NP-VERSION-FILE diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c index 35874a93..bdd348f2 100644 --- a/plugins-root/check_dhcp.c +++ b/plugins-root/check_dhcp.c @@ -6,8 +6,6 @@ * Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org) * Copyright (c) 2001-2007 Nagios Plugin Development Team * -* Last Modified: $Date$ -* * Description: * * This file contains the check_dhcp plugin @@ -32,12 +30,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * -* $Id$ * *****************************************************************************/ const char *progname = "check_dhcp"; -const char *revision = "$Revision$"; const char *copyright = "2001-2007"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -1168,7 +1164,7 @@ int call_getopt(int argc, char **argv){ break; case 'V': /* version */ - print_revision(progname,revision); + print_revision(progname, NP_VERSION); exit(STATE_OK); case 'h': /* help */ @@ -1385,7 +1381,7 @@ void print_hardware_address(const unsigned char *address){ /* print usage help */ void print_help(void){ - print_revision(progname,revision); + print_revision(progname, NP_VERSION); printf("Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)\n"); printf (COPYRIGHT, copyright, email); diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c index cc3f3d59..bbdfae75 100644 --- a/plugins-root/check_icmp.c +++ b/plugins-root/check_icmp.c @@ -6,8 +6,6 @@ * Copyright (c) 2005-2008 Nagios Plugins Development Team * Original Author : Andreas Ericsson * -* Last Modified: $Date$ -* * Description: * * This file contains the check_icmp plugin @@ -35,14 +33,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * -* $Id$ * *****************************************************************************/ /* progname may change */ /* char *progname = "check_icmp"; */ char *progname; -const char *revision = "$Revision$"; const char *copyright = "2005-2008"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; @@ -516,7 +512,7 @@ main(int argc, char **argv) set_source_ip(optarg); break; case 'V': /* version */ - /*print_revision (progname, revision);*/ /* FIXME: Why? */ + print_revision (progname, NP_VERSION); exit (STATE_OK); case 'h': /* help */ print_help (); @@ -1272,7 +1268,7 @@ void print_help(void) { - /*print_revision (progname, revision);*/ /* FIXME: Why? */ + /*print_revision (progname);*/ /* FIXME: Why? */ printf ("Copyright (c) 2005 Andreas Ericsson \n"); printf (COPYRIGHT, copyright, email); diff --git a/plugins-root/t/check_icmp.t b/plugins-root/t/check_icmp.t index 11535ea6..78bfd638 100644 --- a/plugins-root/t/check_icmp.t +++ b/plugins-root/t/check_icmp.t @@ -2,8 +2,6 @@ # # Ping Response Tests via check_icmp # -# $Id$ -# use strict; use Test::More; -- cgit v1.2.3