From a216855093a414766ea5e5901a05ea344b2291ab Mon Sep 17 00:00:00 2001
From: Vegard Nossum <vegard.nossum@gmail.com>
Date: Thu, 11 Jun 2009 09:28:24 +0200
Subject: [PATCH] Move src/asmotor.h to top-level include/

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
---
 {src => include}/asmotor.h | 6 +++---
 src/asm/Makefile           | 2 +-
 src/asm/gameboy/locallex.c | 3 ++-
 src/asm/globlex.c          | 3 ++-
 src/asm/lexer.c            | 3 ++-
 src/lib/Makefile           | 2 +-
 src/link/Makefile          | 2 +-
 src/rgbfix/Makefile        | 2 +-
 8 files changed, 13 insertions(+), 10 deletions(-)
 rename {src => include}/asmotor.h (84%)

diff --git a/src/asmotor.h b/include/asmotor.h
similarity index 84%
rename from src/asmotor.h
rename to include/asmotor.h
index cca5581e..2a0a5e20 100644
--- a/src/asmotor.h
+++ b/include/asmotor.h
@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef	ASMOTOR_H
-#define	ASMOTOR_H
+#ifndef	ASMOTOR_ASMOTOR_H
+#define	ASMOTOR_ASMOTOR_H
 
 #define	ASMOTOR
 
@@ -22,4 +22,4 @@
 #define	strnicmp strncasecmp
 #endif
 
-#endif				//      ASMOTOR_H
+#endif
diff --git a/src/asm/Makefile b/src/asm/Makefile
index d286124d..4b921328 100644
--- a/src/asm/Makefile
+++ b/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 $@ $^
diff --git a/src/asm/gameboy/locallex.c b/src/asm/gameboy/locallex.c
index 57e0f682..db996505 100644
--- a/src/asm/gameboy/locallex.c
+++ b/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 },
diff --git a/src/asm/globlex.c b/src/asm/globlex.c
index 243837bf..04eeeef9 100644
--- a/src/asm/globlex.c
+++ b/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>
diff --git a/src/asm/lexer.c b/src/asm/lexer.c
index 72422a92..a8a7777a 100644
--- a/src/asm/lexer.c
+++ b/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>
diff --git a/src/lib/Makefile b/src/lib/Makefile
index e5eedace..a741f377 100644
--- a/src/lib/Makefile
+++ b/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 $@ $<
diff --git a/src/link/Makefile b/src/link/Makefile
index 46b0d2a8..6e9e56f3 100644
--- a/src/link/Makefile
+++ b/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 $@ $<
 
diff --git a/src/rgbfix/Makefile b/src/rgbfix/Makefile
index 9ab03a6f..aa9362bb 100644
--- a/src/rgbfix/Makefile
+++ b/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 $@ $<