link: move includes to include/link/

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>

include/link/assign.h

@@ -1,7 +1,7 @@
-#ifndef ASSIGN_H
-#define ASSIGN_H
+#ifndef ASMOTOR_LINK_ASSIGN_H
+#define ASMOTOR_LINK_ASSIGN_H
 
-#include "types.h"
+#include "link/types.h"
 
 enum eBankDefine {
 	BANK_HOME = 0,

include/link/library.h

@@ -0,0 +1,6 @@
+#ifndef	ASMOTOR_LINK_LIBRARY_H
+#define	ASMOTOR_LINK_LIBRARY_H
+
+extern void AddNeededModules(void);
+
+#endif

include/link/main.h

@@ -1,7 +1,7 @@
-#ifndef MAIN_H
-#define MAIN_H
+#ifndef ASMOTOR_LINK_MAIN_H
+#define ASMOTOR_LINK_MAIN_H
 
-#include "types.h"
+#include "link/types.h"
 
 extern void PrintUsage(void);
 extern void fatalerror(char *s);

include/link/mapfile.h

@@ -1,5 +1,5 @@
-#ifndef	MAPFILE_H
-#define	MAPFILE_H
+#ifndef	ASMOTOR_LINK_MAPFILE_H
+#define	ASMOTOR_LINK_MAPFILE_H
 
 extern void SetMapfileName(char *name);
 extern void SetSymfileName(char *name);

include/link/mylink.h

@@ -1,11 +1,11 @@
-#ifndef LINK_H
-#define LINK_H 1
+#ifndef ASMOTOR_LINK_LINK_H
+#define ASMOTOR_LINK_LINK_H
 
 #if defined(AMIGA) || defined(__GNUC__)
 #define _MAX_PATH	512
 #endif
 
-#include "types.h"
+#include "link/types.h"
 
 extern SLONG options;
 #define OPT_SMALL	0x01

include/link/object.h

@@ -1,5 +1,5 @@
-#ifndef	OBJECT_H
-#define	OBJECT_H
+#ifndef	ASMOTOR_LINK_OBJECT_H
+#define	ASMOTOR_LINK_OBJECT_H
 
 extern void obj_Readfile(char *tzObjectfile);
 extern void lib_Readfile(char *tzLibfile);

include/link/output.h

@@ -1,5 +1,5 @@
-#ifndef	OUTPUT_H
-#define	OUTPUT_H
+#ifndef	ASMOTOR_LINK_OUTPUT_H
+#define	ASMOTOR_LINK_OUTPUT_H
 
 void out_Setname(char *tzOutputfile);
 void Output(void);

include/link/patch.h

@@ -0,0 +1,9 @@
+#ifndef ASMOTOR_LINK_PATCH_H
+#define ASMOTOR_LINK_PATCH_H
+
+#include "link/types.h"
+
+void Patch(void);
+extern SLONG nPC;
+
+#endif

include/link/symbol.h

@@ -1,7 +1,7 @@
-#ifndef SYMBOL_H
-#define SYMBOL_H
+#ifndef ASMOTOR_LINK_SYMBOL_H
+#define ASMOTOR_LINK_SYMBOL_H
 
-#include "types.h"
+#include "link/types.h"
 
 void sym_Init(void);
 void sym_CreateSymbol(char *tzName, SLONG nValue, SBYTE nBank);

include/link/types.h

@@ -1,7 +1,7 @@
-#ifndef TYPES_H
-#define TYPES_H 1
+#ifndef ASMOTOR_LINK_TYPES_H
+#define ASMOTOR_LINK_TYPES_H
 
-#if	defined(AMIGA) || defined(__GNUC__)
+#if defined(AMIGA) || defined(__GNUC__)
 #define	_MAX_PATH	512
 #endif
 

src/link/Makefile

@@ -17,5 +17,5 @@ xlink: $(obj)
 	gcc -Wall -o $@ $^
 
 .c.o:
-	gcc -Wall -I. -I.. -Iinclude -g -c -o $@ $<
+	gcc -Wall -I. -I.. -I../../include -g -c -o $@ $<
 

src/link/assign.c

@@ -1,9 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "mylink.h"
-#include "main.h"
-#include "symbol.h"
-#include "assign.h"
+
+#include "link/mylink.h"
+#include "link/main.h"
+#include "link/symbol.h"
+#include "link/assign.h"
 
 struct sFreeArea {
 	SLONG nOrg;

src/link/include/library.h

@@ -1,6 +0,0 @@
-#ifndef	LIBRARY_H
-#define	LIBRARY_H
-
-extern void AddNeededModules(void);
-
-#endif

src/link/include/patch.h

@@ -1,9 +0,0 @@
-#ifndef PATCH_H
-#define PATCH_H
-
-#include "types.h"
-
-void Patch(void);
-extern SLONG nPC;
-
-#endif

src/link/library.c

@@ -1,9 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "types.h"
-#include "mylink.h"
-#include "main.h"
+
+#include "link/types.h"
+#include "link/mylink.h"
+#include "link/main.h"
 
 static BBOOL symboldefined(char *name)
 {

src/link/main.c

@@ -2,15 +2,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "object.h"
-#include "output.h"
-#include "assign.h"
-#include "patch.h"
 #include "asmotor.h"
-#include "mylink.h"
-#include "mapfile.h"
-#include "main.h"
-#include "library.h"
+
+#include "link/object.h"
+#include "link/output.h"
+#include "link/assign.h"
+#include "link/patch.h"
+#include "link/mylink.h"
+#include "link/mapfile.h"
+#include "link/main.h"
+#include "link/library.h"
 
 //      Quick and dirty...but it works
 #ifdef __GNUC__

src/link/mapfile.c

@@ -3,9 +3,10 @@
 #include <string.h>
 
 #include "asmotor.h"
-#include "main.h"
-#include "mylink.h"
-#include "assign.h"
+
+#include "link/main.h"
+#include "link/mylink.h"
+#include "link/assign.h"
 
 FILE *mf = NULL;
 FILE *sf = NULL;

src/link/object.c

@@ -7,8 +7,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mylink.h"
-#include "main.h"
+#include "link/mylink.h"
+#include "link/main.h"
 
 struct sSymbol **tSymbols;
 struct sSection *pSections = NULL;

src/link/output.c

@@ -2,10 +2,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mylink.h"
-#include "mapfile.h"
-#include "main.h"
-#include "assign.h"
+#include "link/mylink.h"
+#include "link/mapfile.h"
+#include "link/main.h"
+#include "link/assign.h"
 
 char tzOutname[_MAX_PATH];
 BBOOL oOutput = 0;

src/link/patch.c

@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mylink.h"
-#include "symbol.h"
-#include "main.h"
+#include "link/mylink.h"
+#include "link/symbol.h"
+#include "link/main.h"
 
 struct sSection *pCurrentSection;
 SLONG rpnstack[256];

src/link/symbol.c

@@ -1,9 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "main.h"
-#include "patch.h"
-#include "types.h"
+
+#include "link/main.h"
+#include "link/patch.h"
+#include "link/types.h"
 
 #define HASHSIZE 73