X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=makefile;h=c7c4ed5fa98de367891c42b7267593c8d39b8132;hp=5e377d3fd4d6d77ad7d6d4d2ea08cfe2834061b8;hb=5f23454f7155f0c77ea1bede3f9e60b39da99fa8;hpb=adc2f2df316f46cc70f8939f30c5f39ce6470a20

diff --git a/makefile b/makefile
index 5e377d3..c7c4ed5 100644
--- a/makefile
+++ b/makefile
@@ -1,28 +1,48 @@
 #
 # RMAC - Reboot's Macro Assembler for the Atari Jaguar
 # Copyright (C) 199x Landon Dyer, 2011 Reboot & Friends
-# MAKEFILE for Non-Windows Compilation
-# Currently tested against Cygwin under Windows XP Pro
+# MAKEFILE for *nix
 #
 
-rm = /bin/rm -f 
+STD := c99
+
+# Detect old, shitty platforms that aren't C99/POSIX compliant
+OSTYPE := $(shell uname -a)
+
+# Should catch MinGW
+ifeq "$(findstring MINGW, $(OSTYPE))" "MINGW"
+STD := gnu99
+endif
+
+# If we're cross compiling using MXE, we're still fooooooooooked
+ifneq "$(CROSS)" ""
+STD := gnu99
+endif
+
+
+rm = /bin/rm -f
 CC = $(CROSS)gcc
 HOSTCC = gcc
 
-CFLAGS = -g -D__GCCUNIX__ -I. -O2
+#CFLAGS = -std=$(STD) -D_DEFAULT_SOURCE -g -D__GCCUNIX__ -I. -O2 -MMD
+CFLAGS = -std=$(STD) -D_DEFAULT_SOURCE -g -D__GCCUNIX__ -I. -O2
 
-SRCS = amode.c debug.c direct.c eagen.c error.c expr.c listing.c mach.c macro.c mark.c object.c procln.c risca.c rmac.c sect.c symbol.c token.c 
+SRCS = 6502.c amode.c debug.c direct.c eagen.c error.c expr.c listing.c mach.c macro.c mark.c object.c procln.c riscasm.c rmac.c sect.c symbol.c token.c
 
-OBJS = amode.o debug.o direct.o eagen.o error.o expr.o listing.o mach.o macro.o mark.o object.o procln.o risca.o rmac.o sect.o symbol.o token.o
+OBJS = 6502.o amode.o debug.o direct.o eagen.o error.o expr.o listing.o mach.o macro.o mark.o object.o procln.o riscasm.o rmac.o sect.o symbol.o token.o
 
 #
 # Build everything
 #
 
-all : mntab.h 68ktab.h kwtab.h risckw.h rmac
+all : mntab.h 68ktab.h kwtab.h risckw.h 6502kw.h rmac
+	@echo
+	@echo "Don't forget to bump the version number before commiting!"
+	@echo
 
 #
-# Generated Sources for State Machines and Keyword, Directive and Mnemonic Definitions
+# Generated sources for state machines and keyword, directive and mnemonic
+# definitions
 #
 
 mntab.h : mntab 68kmn kwgen
@@ -31,14 +51,18 @@ mntab.h : mntab 68kmn kwgen
 68ktab.h 68kmn : 68ktab 68ktab 68kgen
 	./68kgen 68kmn <68ktab >68ktab.h
 
+
 kwtab.h : kwtab kwgen
 	./kwgen kw <kwtab >kwtab.h
 
+6502kw.h : 6502.tbl kwgen
+	./kwgen mp <6502.tbl >6502kw.h
+
 risckw.h : kwtab kwgen
 	./kwgen mr <risctab >risckw.h
 
 #
-# Build Tools
+# Build tools
 #
 
 kwgen.o : kwgen.c
@@ -48,73 +72,119 @@ kwgen : kwgen.o
 	$(HOSTCC) $(CFLAGS) -o kwgen kwgen.o
 
 68kgen.o : 68kgen.c
-	$(HOSTCC) $(CFLAGS) -c 68kgen.c 
+	$(HOSTCC) $(CFLAGS) -c 68kgen.c
 
 68kgen : 68kgen.o
 	$(HOSTCC) $(CFLAGS) -o 68kgen 68kgen.o
 
 #
-# Build RMAC Executable
+# Build RMAC executable
 #
 
-amode.o : amode.c
+6502.o : 6502.c 6502.h
+	$(CC) $(CFLAGS) -c 6502.c
+
+amode.o : amode.c amode.h
 	$(CC) $(CFLAGS) -c amode.c
 
-debug.o : debug.c
+debug.o : debug.c debug.h
 	$(CC) $(CFLAGS) -c debug.c
 
-direct.o : direct.c
+direct.o : direct.c direct.h
 	$(CC) $(CFLAGS) -c direct.c
 
-eagen.o : eagen.c
+eagen.o : eagen.c eagen.h eagen0.c
 	$(CC) $(CFLAGS) -c eagen.c
 
-error.o : error.c
+error.o : error.c error.h
 	$(CC) $(CFLAGS) -c error.c
 
-expr.o : expr.c
+expr.o : expr.c expr.h
 	$(CC) $(CFLAGS) -c expr.c
 
-listing.o : listing.c
+listing.o : listing.c listing.h
 	$(CC) $(CFLAGS) -c listing.c
 
-mach.o : mach.c
+mach.o : mach.c mach.h
 	$(CC) $(CFLAGS) -c mach.c
 
-macro.o : macro.c
+macro.o : macro.c macro.h
 	$(CC) $(CFLAGS) -c macro.c
 
-mark.o : mark.c
+mark.o : mark.c mark.h
 	$(CC) $(CFLAGS) -c mark.c
 
-object.o : object.c
+object.o : object.c object.h
 	$(CC) $(CFLAGS) -c object.c
 
-procln.o : procln.c
+procln.o : procln.c procln.h
 	$(CC) $(CFLAGS) -c procln.c
 
-risca.o : risca.c
-	$(CC) $(CFLAGS) -c risca.c
+riscasm.o : riscasm.c riscasm.h
+	$(CC) $(CFLAGS) -c riscasm.c
 
-rmac.o : rmac.c
+rmac.o : rmac.c rmac.h
 	$(CC) $(CFLAGS) -c rmac.c
 
-sect.o : sect.c
+sect.o : sect.c sect.h
 	$(CC) $(CFLAGS) -c sect.c
 
-symbol.o : symbol.c
+symbol.o : symbol.c symbol.h
 	$(CC) $(CFLAGS) -c symbol.c
 
-token.o : token.c
-	$(CC) $(CFLAGS) -c token.c 
+token.o : token.c token.h
+	$(CC) $(CFLAGS) -c token.c
 
-rmac : $(OBJS) 
+rmac : $(OBJS)
 	$(CC) $(CFLAGS) -o rmac $(OBJS)
 
 #
-# Clean Build Environment
+# Clean build environment
 #
 
-clean: 
-	$(rm) $(OBJS) kwgen.o 68kgen.o rmac kwgen 68kgen kwtab.h 68ktab.h mntab.h risckw.h
+clean:
+	$(rm) $(OBJS) kwgen.o 68kgen.o rmac kwgen 68kgen kwtab.h 68ktab.h mntab.h risckw.h 6502kw.h
+
+#
+# Dependencies
+#
+6502.o: 6502.c direct.h rmac.h symbol.h expr.h error.h mach.h procln.h \
+ token.h riscasm.h sect.h
+68kgen.o: 68kgen.c
+amode.o: amode.c amode.h rmac.h symbol.h error.h expr.h mach.h procln.h \
+ token.h sect.h kwtab.h mntab.h parmode.h
+debug.o: debug.c debug.h rmac.h symbol.h amode.h direct.h mark.h sect.h \
+ token.h
+direct.o: direct.c direct.h rmac.h symbol.h 6502.h amode.h error.h expr.h \
+ listing.h mach.h macro.h mark.h procln.h token.h riscasm.h sect.h \
+ kwtab.h
+eagen.o: eagen.c eagen.h rmac.h symbol.h amode.h sect.h mark.h error.h \
+ mach.h riscasm.h eagen0.c
+error.o: error.c error.h rmac.h symbol.h token.h listing.h
+expr.o: expr.c expr.h rmac.h symbol.h direct.h error.h listing.h mach.h \
+ procln.h token.h riscasm.h sect.h kwtab.h
+kwgen.o: kwgen.c
+listing.o: listing.c listing.h rmac.h symbol.h error.h procln.h token.h \
+ sect.h version.h
+mach.o: mach.c mach.h rmac.h symbol.h amode.h direct.h eagen.h error.h \
+ procln.h token.h riscasm.h sect.h kwtab.h 68ktab.h
+macro.o: macro.c macro.h rmac.h symbol.h debug.h direct.h error.h expr.h \
+ listing.h procln.h token.h
+mark.o: mark.c mark.h rmac.h symbol.h error.h object.h riscasm.h sect.h
+object.o: object.c object.h rmac.h symbol.h 6502.h error.h mark.h \
+ riscasm.h sect.h
+procln.o: procln.c procln.h rmac.h symbol.h token.h 6502.h amode.h \
+ direct.h error.h expr.h listing.h mach.h macro.h riscasm.h sect.h \
+ kwtab.h mntab.h risckw.h 6502kw.h
+riscasm.o: riscasm.c riscasm.h rmac.h symbol.h amode.h direct.h error.h \
+ expr.h mark.h procln.h token.h sect.h risckw.h kwtab.h
+rmac.o: rmac.c rmac.h symbol.h 6502.h debug.h direct.h error.h expr.h \
+ listing.h mark.h macro.h object.h procln.h token.h riscasm.h sect.h \
+ version.h
+sect.o: sect.c sect.h rmac.h symbol.h 6502.h direct.h error.h expr.h \
+ listing.h mach.h mark.h riscasm.h token.h
+symbol.o: symbol.c symbol.h error.h rmac.h listing.h object.h procln.h \
+ token.h
+token.o: token.c token.h rmac.h symbol.h direct.h error.h macro.h \
+ procln.h sect.h kwtab.h