ref: a216855093a414766ea5e5901a05ea344b2291ab
parent: afe33e116299979632123892f7fe0564a884ee91
author: Vegard Nossum <[email protected]>
date: Thu Jun 11 05:28:24 EDT 2009
Move src/asmotor.h to top-level include/ Signed-off-by: Vegard Nossum <[email protected]>
--- /dev/null
+++ b/include/asmotor.h
@@ -1,0 +1,25 @@
+/* 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"
+
+#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
--- a/src/asm/Makefile
+++ b/src/asm/Makefile
@@ -20,7 +20,7 @@
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 $@ $^
--- 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 },--- a/src/asm/globlex.c
+++ b/src/asm/globlex.c
@@ -1,10 +1,11 @@
#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>
--- a/src/asm/lexer.c
+++ b/src/asm/lexer.c
@@ -3,8 +3,9 @@
#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>
--- a/src/asmotor.h
+++ /dev/null
@@ -1,25 +1,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
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -9,4 +9,4 @@
gcc -Wall -o $@ $^
.c.o:
- gcc -Wall -I. -I.. -I../../include -g -c -o $@ $<
+ gcc -Wall -I../../include -g -c -o $@ $<
--- a/src/link/Makefile
+++ b/src/link/Makefile
@@ -17,5 +17,5 @@
gcc -Wall -o $@ $^
.c.o:
- gcc -Wall -I. -I.. -I../../include -g -c -o $@ $<
+ gcc -Wall -I../../include -g -c -o $@ $<
--- a/src/rgbfix/Makefile
+++ b/src/rgbfix/Makefile
@@ -10,4 +10,4 @@
gcc -Wall -o $@ $^
.c.o:
- gcc -Wall -I. -I.. -Iinclude -g -c -o $@ $<
+ gcc -Wall -I../../include -g -c -o $@ $<