From 8854e46a50a0272578599d2fcd8d1fb363e19c38 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 23 Jan 2017 11:03:56 +0100
Subject: Add a git suffix to the version number used by all programs.

This uses a setlocalversion script derived from the kernel's
scripts/setlocalversion.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
 ax25/ax25d.c             | 3 ++-
 ax25/axctl.c             | 3 ++-
 ax25/axgetput/axgetput.c | 3 ++-
 ax25/axparms.c           | 3 ++-
 ax25/beacon.c            | 4 +++-
 ax25/bpqparms.c          | 5 +++--
 ax25/mheard.c            | 3 ++-
 ax25/mheardd.c           | 3 ++-
 ax25/rxecho.c            | 3 ++-
 9 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'ax25')

diff --git a/ax25/ax25d.c b/ax25/ax25d.c
index 8140b4f..8da0038 100644
--- a/ax25/ax25d.c
+++ b/ax25/ax25d.c
@@ -138,6 +138,7 @@
 #include <netax25/rsconfig.h>
 #include <netax25/daemon.h>
 
+#include <scm-version.h>
 
 #include "../pathnames.h"
 
@@ -277,7 +278,7 @@ int main(int argc, char *argv[])
 			break;
 
 		case 'v':
-			printf("ax25d: %s\n", VERSION);
+			printf("ax25d: %s\n", FULL_VER);
 			return 1;
 
 		default:
diff --git a/ax25/axctl.c b/ax25/axctl.c
index f1116a7..c27bcdf 100644
--- a/ax25/axctl.c
+++ b/ax25/axctl.c
@@ -6,6 +6,7 @@
 #include <pwd.h>
 
 #include <config.h>
+#include <scm-version.h>
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -25,7 +26,7 @@ int main(int argc, char **argv)
 	int s;
 
 	if (argc == 2 && strncmp(argv[1], "-v", 2) == 0) {
-		printf("axctl: %s\n", VERSION);
+		printf("axctl: %s\n", FULL_VER);
 		return 0;
 	}
 
diff --git a/ax25/axgetput/axgetput.c b/ax25/axgetput/axgetput.c
index de21bc5..8620c72 100644
--- a/ax25/axgetput/axgetput.c
+++ b/ax25/axgetput/axgetput.c
@@ -17,6 +17,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <scm-version.h>
 
 #include "includes.h"
 
@@ -144,7 +145,7 @@ static void signal_handler(int sig)
 
 void do_version(void)
 {
-        fprintf(stderr, MYNAME " " VERSION "\n");
+        fprintf(stderr, MYNAME " " FULL_VER "\n");
 	fprintf(stderr, "  (c) 2002 Thomas Osterried <thomas@x-berg.in-berlin.de>\n");
 	fprintf(stderr, "  License: GPL. See http://www.fsf.org/\n");
 	fprintf(stderr, "  Sources: http://x-berg.in-berlin.de/cgi-bin/viewcvs.cgi/ampr/axgetput/\n");
diff --git a/ax25/axparms.c b/ax25/axparms.c
index 5c49e58..7f09b06 100644
--- a/ax25/axparms.c
+++ b/ax25/axparms.c
@@ -7,6 +7,7 @@
 #include <pwd.h>
 
 #include <config.h>
+#include <scm-version.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -352,7 +353,7 @@ int main(int argc, char **argv)
 	}
 
 	if (strncmp(argv[1], "--v", 3) == 0 || strncmp(argv[1], "-v", 2) == 0) {
-		printf("axparms: %s\n", VERSION);
+		printf("axparms: %s\n", FULL_VER);
 		return 0;
 	}
 
diff --git a/ax25/beacon.c b/ax25/beacon.c
index 18ccc93..f8f8d68 100644
--- a/ax25/beacon.c
+++ b/ax25/beacon.c
@@ -17,6 +17,8 @@
 #include <netax25/axconfig.h>
 #include <netax25/daemon.h>
 
+#include <scm-version.h>
+
 static int logging = FALSE;
 static int mail = FALSE;
 static int single = FALSE;
@@ -75,7 +77,7 @@ int main(int argc, char *argv[])
 			}
 			break;
 		case 'v':
-			printf("beacon: %s\n", VERSION);
+			printf("beacon: %s\n", FULL_VER);
 			return 0;
 		case '?':
 		case ':':
diff --git a/ax25/bpqparms.c b/ax25/bpqparms.c
index 83734a8..27007dc 100644
--- a/ax25/bpqparms.c
+++ b/ax25/bpqparms.c
@@ -36,6 +36,7 @@
 #include <linux/bpqether.h> /* xlz - dammit, we need this again */
 
 #include <config.h>
+#include <scm-version.h>
 
 void usage(void)
 {
@@ -96,7 +97,7 @@ int main(int argc, char **argv)
 			break;
 
 		case 'V':
-			printf("bpqparms version " VERSION "\n");
+			printf("bpqparms version " FULL_VER "\n");
 			printf("Copyright 1996, Jörg Reuter (jreuter@poboxes.com)\n");
 			printf("This program is free software; you can redistribute it and/or modify\n");
 			printf("it under the terms of the GNU General Public License as published by\n");
@@ -108,7 +109,7 @@ int main(int argc, char **argv)
 			return 0;
 
 		case 'v':
-			printf("bpqparms: %s\n", VERSION);
+			printf("bpqparms: %s\n", FULL_VER);
 			return 0;
 
 		case 'h':
diff --git a/ax25/mheard.c b/ax25/mheard.c
index cba5e11..8156ab5 100644
--- a/ax25/mheard.c
+++ b/ax25/mheard.c
@@ -7,6 +7,7 @@
 #include <sys/socket.h>
 
 #include <config.h>
+#include <scm-version.h>
 
 #include <netax25/ax25.h>
 #include <netrose/rose.h>
@@ -423,7 +424,7 @@ int main(int argc, char *argv[])
 			}
 			break;
 		case 'v':
-			printf("mheard: %s\n", VERSION);
+			printf("mheard: %s\n", FULL_VER);
 			return 0;
 		case '?':
 		case ':':
diff --git a/ax25/mheardd.c b/ax25/mheardd.c
index 3f61f86..cbe5e26 100644
--- a/ax25/mheardd.c
+++ b/ax25/mheardd.c
@@ -33,6 +33,7 @@
 #include <netax25/mheard.h>
 
 #include <config.h>
+#include <scm-version.h>
 
 #include "../pathnames.h"
 
@@ -149,7 +150,7 @@ int main(int argc, char **argv)
 			}
 			break;
 		case 'v':
-			printf("mheardd: %s\n", VERSION);
+			printf("mheardd: %s\n", FULL_VER);
 			return 0;
 		case ':':
 			fprintf(stderr, "mheardd: option -n needs an argument\n");
diff --git a/ax25/rxecho.c b/ax25/rxecho.c
index c67b95e..597e6cb 100644
--- a/ax25/rxecho.c
+++ b/ax25/rxecho.c
@@ -64,6 +64,7 @@
 #include <sys/types.h>
 
 #include <config.h>
+#include <scm-version.h>
 
 #include <sys/socket.h>
 
@@ -386,7 +387,7 @@ int main(int argc, char **argv)
 			logging = TRUE;
 			break;
 		case 'v':
-			printf("rxecho: %s\n", VERSION);
+			printf("rxecho: %s\n", FULL_VER);
 			return 0;
 		default:
 			fprintf(stderr, "usage: rxecho [-l] [-v]\n");
-- 
cgit v1.2.3