From 0d07caba60b5d082a22cbbb4eb78cfefabb0ea64 Mon Sep 17 00:00:00 2001
From: "Anthony J. Bentley" <anthony@cathet.us>
Date: Thu, 25 Sep 2014 20:56:15 -0600
Subject: [PATCH] Remove inconsistent version numbering.

---
 include/asm/asm.h  |  2 --
 include/asmotor.h  | 21 ---------------------
 src/asm/main.c     |  2 --
 src/asm/symbol.c   |  1 -
 src/link/main.c    |  4 ----
 src/link/mapfile.c |  4 +---
 6 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 include/asmotor.h

diff --git a/include/asm/asm.h b/include/asm/asm.h
index bde48eb3..548a412e 100644
--- a/include/asm/asm.h
+++ b/include/asm/asm.h
@@ -17,8 +17,6 @@
 
 #include "localasm.h"
 
-#include "asmotor.h"
-
 extern SLONG nLineNo;
 extern ULONG nTotalLines;
 extern ULONG nPC;
diff --git a/include/asmotor.h b/include/asmotor.h
deleted file mode 100644
index d9fa856c..00000000
--- a/include/asmotor.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*	asmotor.h
- *
- *	Contains defines for every program in the ASMotor package
- *
- *	Copyright 1997 Carsten Sorensen
- *
- */
-
-#ifndef	ASMOTOR_ASMOTOR_H
-#define	ASMOTOR_ASMOTOR_H
-
-#define	ASMOTOR
-
-#define	ASMOTOR_VERSION	"1.10-linux"
-
-#define	ASM_VERSION		"1.08c"
-#define	LINK_VERSION	"1.06c"
-#define	RGBFIX_VERSION	"1.02"
-#define	LIB_VERSION		"1.00"
-
-#endif
diff --git a/src/asm/main.c b/src/asm/main.c
index 822f96b0..cca7d954 100644
--- a/src/asm/main.c
+++ b/src/asm/main.c
@@ -242,8 +242,6 @@ fatalerror(const char *fmt, ...)
 void 
 PrintUsage(void)
 {
-	printf("RGBAsm v" ASM_VERSION " (part of ASMotor " ASMOTOR_VERSION
-	    ")\n\n");
 	printf("Usage: rgbasm [-v] [-h] [-b chars] [-g chars] [-i path] [-o outfile] [-p pad_value]\n"
 	    "              file\n");
 	exit(1);
diff --git a/src/asm/symbol.c b/src/asm/symbol.c
index e63b3d5e..1d9f556d 100644
--- a/src/asm/symbol.c
+++ b/src/asm/symbol.c
@@ -873,7 +873,6 @@ sym_Init(void)
 	p_NARGSymbol = findsymbol("_NARG", NULL);
 	p_NARGSymbol->Callback = Callback_NARG;
 
-	sym_AddEqu("__ASM__", (SLONG) (atof(ASM_VERSION) * 65536));
 	sym_AddSet("_RS", 0);
 
 	if (time(&tod) != -1) {
diff --git a/src/link/main.c b/src/link/main.c
index 16465558..f81f85d8 100644
--- a/src/link/main.c
+++ b/src/link/main.c
@@ -4,8 +4,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "asmotor.h"
-
 #include "extern/err.h"
 #include "link/object.h"
 #include "link/output.h"
@@ -35,8 +33,6 @@ char smartlinkstartsymbol[256];
 static void 
 usage(void)
 {
-	printf("RGBLink v" LINK_VERSION " (part of ASMotor " ASMOTOR_VERSION
-	    ")\n\n");
 	printf("usage: rgblink [-t] [-m mapfile] [-n symfile] [-o outfile]\n");
 	printf("\t    [-s symbol] [-z pad_value] objectfile [...]\n");
 
diff --git a/src/link/mapfile.c b/src/link/mapfile.c
index fce261f8..1264d7c3 100644
--- a/src/link/mapfile.c
+++ b/src/link/mapfile.c
@@ -3,8 +3,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "asmotor.h"
-
 #include "extern/err.h"
 #include "link/main.h"
 #include "link/mylink.h"
@@ -34,7 +32,7 @@ SetSymfileName(char *name)
 		err(1, "Cannot open symfile '%s'", name);
 	}
 
-	fprintf(sf, ";File generated by xLink v" LINK_VERSION "\n\n");
+	fprintf(sf, ";File generated by rgblink\n\n");
 }
 
 void