From a6b244b12efa63e8f6afd8bf4b933482e4270116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ni=C3=B1o=20D=C3=ADaz?= <antonio_nd@outlook.com>
Date: Sun, 28 Jan 2018 13:07:21 +0000
Subject: [PATCH] Move version files out of extern folder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The folder extern is reserved for external contributions, not common
files.

Signed-off-by: Antonio Niño Díaz <antonio_nd@outlook.com>
---
 Makefile                       | 8 ++++----
 include/{extern => }/version.h | 0
 src/asm/main.c                 | 3 ++-
 src/asm/symbol.c               | 3 ++-
 src/fix/main.c                 | 3 ++-
 src/gfx/main.c                 | 4 ++--
 src/link/main.c                | 3 ++-
 src/{extern => }/version.c     | 2 +-
 8 files changed, 15 insertions(+), 11 deletions(-)
 rename include/{extern => }/version.h (100%)
 rename src/{extern => }/version.c (95%)

diff --git a/Makefile b/Makefile
index 611b1ec8..eccd97c7 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ rgbasm_obj := \
 	src/asm/symbol.o \
 	src/extern/err.o \
 	src/extern/utf8decoder.o \
-	src/extern/version.o
+	src/version.o
 
 src/asm/asmy.h: src/asm/asmy.c
 src/asm/locallex.o src/asm/globlex.o src/asm/lexer.o: src/asm/asmy.h
@@ -76,7 +76,7 @@ rgblink_obj := \
 	src/link/script.o \
 	src/link/symbol.o \
 	src/extern/err.o \
-	src/extern/version.o
+	src/version.o
 
 src/link/parser.h: src/link/parser.c
 src/link/lexer.o: src/link/parser.h
@@ -84,14 +84,14 @@ src/link/lexer.o: src/link/parser.h
 rgbfix_obj := \
 	src/fix/main.o \
 	src/extern/err.o \
-	src/extern/version.o
+	src/version.o
 
 rgbgfx_obj := \
 	src/gfx/gb.o \
 	src/gfx/main.o \
 	src/gfx/makepng.o \
 	src/extern/err.o \
-	src/extern/version.o
+	src/version.o
 
 rgbasm: ${rgbasm_obj}
 	$Q${CC} ${REALCFLAGS} -o $@ ${rgbasm_obj} -lm
diff --git a/include/extern/version.h b/include/version.h
similarity index 100%
rename from include/extern/version.h
rename to include/version.h
diff --git a/src/asm/main.c b/src/asm/main.c
index 1c2a18cd..16dcd3e9 100644
--- a/src/asm/main.c
+++ b/src/asm/main.c
@@ -22,7 +22,8 @@
 #include "asm/main.h"
 
 #include "extern/err.h"
-#include "extern/version.h"
+
+#include "version.h"
 
 extern int yyparse(void);
 
diff --git a/src/asm/symbol.c b/src/asm/symbol.c
index d56ee9b8..e3c25309 100644
--- a/src/asm/symbol.c
+++ b/src/asm/symbol.c
@@ -24,7 +24,8 @@
 #include "asm/output.h"
 
 #include "extern/err.h"
-#include "extern/version.h"
+
+#include "version.h"
 
 struct sSymbol *tHashedSymbols[HASHSIZE];
 static struct sSymbol *pScope; /* Current section symbol scope */
diff --git a/src/fix/main.c b/src/fix/main.c
index 484332ac..bb89b9ef 100644
--- a/src/fix/main.c
+++ b/src/fix/main.c
@@ -14,7 +14,8 @@
 #include <unistd.h>
 
 #include "extern/err.h"
-#include "extern/version.h"
+
+#include "version.h"
 
 static void print_usage(void)
 {
diff --git a/src/gfx/main.c b/src/gfx/main.c
index 6c35463e..fee96126 100644
--- a/src/gfx/main.c
+++ b/src/gfx/main.c
@@ -10,10 +10,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "extern/version.h"
-
 #include "gfx/main.h"
 
+#include "version.h"
+
 static void print_usage(void)
 {
 	printf(
diff --git a/src/link/main.c b/src/link/main.c
index 0f4fd890..37668850 100644
--- a/src/link/main.c
+++ b/src/link/main.c
@@ -13,7 +13,6 @@
 #include <unistd.h>
 
 #include "extern/err.h"
-#include "extern/version.h"
 
 #include "link/object.h"
 #include "link/output.h"
@@ -24,6 +23,8 @@
 #include "link/main.h"
 #include "link/library.h"
 
+#include "version.h"
+
 enum eBlockType {
 	BLOCK_COMMENT,
 	BLOCK_OBJECTS,
diff --git a/src/extern/version.c b/src/version.c
similarity index 95%
rename from src/extern/version.c
rename to src/version.c
index 254c5caa..77868e99 100644
--- a/src/extern/version.c
+++ b/src/version.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "extern/version.h"
+#include "version.h"
 
 const char *get_package_version_string(void)
 {