Move src/asmotor.h to top-level include/

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

src/asm/Makefile

@@ -20,7 +20,7 @@ rgbasm: $(obj)
 	gcc -Wall -o $@ $^ -lm
 
 .c.o:
-	gcc -Wall -DGAMEBOY -I. -I.. -I../../include -Igameboy -g -c -o $@ $<
+	gcc -Wall -DGAMEBOY -I../../include -Igameboy -g -c -o $@ $<
 
 .y.c:
 	bison -d -o $@ $^

src/asm/gameboy/locallex.c

@@ -1,7 +1,8 @@
 #include "asm/symbol.h"
 #include "asm/lexer.h"
 #include "asm/rpn.h"
-#include "asm/asmy.h"
+
+#include "../asmy.h"
 
 struct sLexInitString localstrings[] = {
 	{ "adc", T_Z80_ADC },

src/asm/globlex.c

@@ -1,11 +1,12 @@
 #include "asm/asm.h"
 #include "asm/symbol.h"
 #include "asm/rpn.h"
-#include "asm/asmy.h"
 #include "asm/symbol.h"
 #include "asm/main.h"
 #include "asm/lexer.h"
 
+#include "asmy.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>

src/asm/lexer.c

@@ -3,9 +3,10 @@
 #include "asm/types.h"
 #include "asm/main.h"
 #include "asm/rpn.h"
-#include "asm/asmy.h"
 #include "asm/fstack.h"
 
+#include "asmy.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/asmotor.h

@@ -1,25 +0,0 @@
-/*	asmotor.h
- *
- *	Contains defines for every program in the ASMotor package
- *
- *	Copyright 1997 Carsten Sorensen
- *
- */
-
-#ifndef	ASMOTOR_H
-#define	ASMOTOR_H
-
-#define	ASMOTOR
-
-#define	ASMOTOR_VERSION	"1.10"
-
-#define	ASM_VERSION		"1.08c"
-#define	LINK_VERSION	"1.06c"
-#define	RGBFIX_VERSION	"1.02"
-#define	LIB_VERSION		"1.00"
-
-#ifdef	__GNUC__
-#define	strnicmp strncasecmp
-#endif
-
-#endif				//      ASMOTOR_H

src/lib/Makefile

@@ -9,4 +9,4 @@ xlib: $(obj)
 	gcc -Wall -o $@ $^
 
 .c.o:
-	gcc -Wall -I. -I.. -I../../include -g -c -o $@ $<
+	gcc -Wall -I../../include -g -c -o $@ $<

src/link/Makefile

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

src/rgbfix/Makefile

@@ -10,4 +10,4 @@ rgbfix: $(obj)
 	gcc -Wall -o $@ $^
 
 .c.o:
-	gcc -Wall -I. -I.. -Iinclude -g -c -o $@ $<
+	gcc -Wall -I../../include -g -c -o $@ $<