--- uae/src/Makefile.in	2018/04/24 16:47:24	1.1.1.7
+++ uae/src/Makefile.in	2018/04/24 17:10:47	1.1.1.12
@@ -4,7 +4,7 @@
 
 @SET_MAKE@
 CC        = @CC@
-WRC       = @WRC@
+WRC       = @WRCPRG@
 CPP       = @CPP@
 LDFLAGS   = @LDFLAGS@
 CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@
@@ -29,17 +29,18 @@ VPATH = @top_srcdir@/src
 
 .SUFFIXES: .o .c .h .m .i .S .rc .res
 
-.SECONDARY: p2c.c p2c.h cpuemu.c cpustbl.c cputbl.h
+#.SECONDARY: cpuemu.c cpustbl.c cputbl.h
 
 INCLUDES=-I. -I@top_srcdir@/src/include/
 
 OBJS = main.o newcpu.o memory.o @CPUOBJS@ custom.o cia.o serial.o blitter.o \
        autoconf.o ersatz.o filesys.o hardfile.o keybuf.o expansion.o zfile.o \
        fpp.o readcpu.o cpudefs.o gfxutil.o gfxlib.o blitfunc.o blittable.o \
-       disk.o audio.o compiler.o uaelib.o drawing.o picasso96.o cpustbl.o \
+       disk.o audio.o uaelib.o drawing.o picasso96.o cpustbl.o \
        uaeexe.o bsdsocket.o missing.o sd-sound.o od-joy.o md-support.o \
-       fsusage.o cfgfile.o native2amiga.o fsdb.o fsdb_unix.o \
-       @P2C@ @ASMOBJS@ @GFXOBJS@ @DEBUGOBJS@ @SCSIOBJS@
+       fsusage.o cfgfile.o native2amiga.o @FSDBOBJS@ fsdb.o identify.o \
+       savestate.o writelog.o @ASMOBJS@ @GFXOBJS@ @DEBUGOBJS@ @SCSIOBJS@
+
 
 all: $(TARGET)
 
@@ -74,10 +75,11 @@ uae: $(OBJS)
 	$(CC) $(OBJS) -o uae $(GFXLDFLAGS) $(LDFLAGS) $(DEBUGFLAGS) $(LIBRARIES) $(MATHLIB)
 
 clean:
+	$(MAKE) -C tools clean
 	-rm -f $(OBJS) *.o uae readdisk
-	-rm -f gencpu genblitter blit.h genp2c cpudefs.c cpuopti
-	-rm -f cpuemu.c build68k cputmp.s cpufast*.s cpustbl.c cputbl.h
-	-rm -f blitfunc.c blitfunc.h blittable.c p2c.c p2c.h p2c_x86.S
+	-rm -f blit.h cpudefs.c
+	-rm -f cpuemu.c build68k cputmp.s cpustbl.c cputbl.h
+	-rm -f blitfunc.c blitfunc.h blittable.c
 
 halfclean:
 	-rm -f $(OBJS)
@@ -87,50 +89,37 @@ streifenfrei: clean
 	-rm -f od-joy.c md-X86.S sd-sound.c md-support.c
 	-rm -f machdep osdep threaddep sounddep target.h config.h
 
-blit.h: genblitter
-	./genblitter i >blit.h
-blitfunc.c: genblitter blitfunc.h
-	./genblitter f >blitfunc.c
-blitfunc.h: genblitter
-	./genblitter h >blitfunc.h
-blittable.c: genblitter blitfunc.h
-	./genblitter t >blittable.c
-
-genblitter: genblitter.o blitops.o
-	$(CC) $(LDFLAGS) -o genblitter genblitter.o blitops.o
-build68k: build68k.o
-	$(CC) $(LDFLAGS) -o build68k build68k.o
-cpuopti: cpuopti.o
-	$(CC) $(LDFLAGS) -o cpuopti cpuopti.o
-gencpu: gencpu.o readcpu.o cpudefs.o missing.o
-	$(CC) $(LDFLAGS) -o gencpu gencpu.o readcpu.o missing.o cpudefs.o
-genp2c: genp2c.o
-	$(CC) $(LDFLAGS) -o genp2c genp2c.o
-
-custom.o: blit.h p2c.h
-p2c.o: p2c.h
-
-p2c.h: genp2c
-	./genp2c H >p2c.h
-p2c.c: genp2c
-	./genp2c C >p2c.c
-p2c_x86.S: genp2c
-	./genp2c x86 >p2c_x86.S
+blit.h: tools/genblitter
+	./tools/genblitter i >blit.h
+blitfunc.c: tools/genblitter blitfunc.h
+	./tools/genblitter f >blitfunc.c
+blitfunc.h: tools/genblitter
+	./tools/genblitter h >blitfunc.h
+blittable.c: tools/genblitter blitfunc.h
+	./tools/genblitter t >blittable.c
+
+tools/genblitter:
+	$(MAKE) -C tools genblitter
+tools/build68k:
+	$(MAKE) -C tools build68kc
+tools/gencpu: 
+	$(MAKE) -C tools gencpu
+
+custom.o: blit.h
+drawing.o: linetoscr.c
 
-cpudefs.c: build68k @top_srcdir@/src/table68k
-	./build68k <@top_srcdir@/src/table68k >cpudefs.c
+cpudefs.c: tools/build68k @top_srcdir@/src/table68k
+	./tools/build68k <@top_srcdir@/src/table68k >cpudefs.c
 
-cpuemu.c: gencpu
-	./gencpu
+cpuemu.c: tools/gencpu
+	./tools/gencpu
 
 # gencpu also creates cpustbl.c and cputbl.h
 cpustbl.c: cpuemu.c
 cputbl.h: cpuemu.c
 
-cpufast.s: cpuemu.c cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp.s
-	./cpuopti <cputmp.s >$@
-	rm cputmp.s
+console_missing.o: missing.c
+	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@
 
 osdep/beos.o: osdep/beos.cpp
 	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) osdep/beos.cpp -o osdep/beos.o
@@ -140,7 +129,7 @@ osdep/beos.o: osdep/beos.cpp
 .m.o:
 	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $<
 .c.o:
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@
 .c.s:
 	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
 .c.i:
@@ -152,7 +141,7 @@ osdep/beos.o: osdep/beos.cpp
 
 # Saves recompiling...
 touch:
-	touch *.o; touch build68k; touch cpudefs.c; touch cpudefs.o; touch gencpu; touch cpuemu.c; touch cpuopti.o cpuopti cpuemu.o cpufast.s cpufast.o
+	touch *.o; touch build68k; touch cpudefs.c; touch cpudefs.o; touch gencpu; touch cpuemu.c; touch cpuemu.o
 
 build68k.o: include/readcpu.h
 readcpu.o: include/readcpu.h
@@ -168,6 +157,7 @@ svga.o: config.h
 audio.o: config.h include/events.h
 memory.o: config.h
 debug.o: config.h
+identify.o: config.h
 fpp.o: config.h
 ersatz.o: config.h
 filesys.o: config.h
@@ -176,39 +166,6 @@ disk.o: config.h include/events.h
 blitter.o: config.h include/events.h blit.h
 
 # sam: this is for people with low memory. (is there a way do do this with a single rule ?)
-cpufast1.s: cpuemu.c cpuopti
-	$(CC) -DPART_1 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp1.s
-	./cpuopti <cputmp1.s >$@
-	rm cputmp1.s
-cpufast2.s: cpuemu.c cpuopti
-	$(CC) -DPART_2 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp2.s
-	./cpuopti <cputmp2.s >$@
-	rm cputmp2.s
-cpufast3.s: cpuemu.c cpuopti
-	$(CC) -DPART_3 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp3.s
-	./cpuopti <cputmp3.s >$@
-	rm cputmp3.s
-cpufast4.s: cpuemu.c cpuopti
-	$(CC) -DPART_4 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp4.s
-	./cpuopti <cputmp4.s >$@
-	rm cputmp4.s
-cpufast5.s: cpuemu.c cpuopti
-	$(CC) -DPART_5 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp5.s
-	./cpuopti <cputmp5.s >$@
-	rm cputmp5.s
-cpufast6.s: cpuemu.c cpuopti
-	$(CC) -DPART_6 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp6.s
-	./cpuopti <cputmp6.s >$@
-	rm cputmp6.s
-cpufast7.s: cpuemu.c cpuopti
-	$(CC) -DPART_7 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp7.s
-	./cpuopti <cputmp7.s >$@
-	rm cputmp7.s
-cpufast8.s: cpuemu.c cpuopti
-	$(CC) -DPART_8 $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp8.s
-	./cpuopti <cputmp8.s >$@
-	rm cputmp8.s
-
 cpuemu1.o: cpuemu.c
 	$(CC) -DPART_1 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
 cpuemu2.o: cpuemu.c