--- uae/src/Makefile.in	2018/04/24 16:39:05	1.1.1.2
+++ uae/src/Makefile.in	2018/04/24 17:10:47	1.1.1.12
@@ -4,18 +4,17 @@
 
 @SET_MAKE@
 CC        = @CC@
+WRC       = @WRCPRG@
 CPP       = @CPP@
 LDFLAGS   = @LDFLAGS@
-CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@ -DSTATFS_NO_ARGS=@STATFS_NO_ARGS@ -DSTATBUF_BAVAIL=@STATBUF_BAVAIL@ -DBROKEN_JOYSTICK_H=@BROKEN_JOYSTICK_H@ $(AFINCLUDE)
-X_CFLAGS  = @X_CFLAGS@ -DFORMS_H_VARIANT=@FORMS_H_VARIANT@
+CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@
+X_CFLAGS  = @X_CFLAGS@ @GTK_CFLAGS@ -DSHM_SUPPORT_LINKS=@SHM_SUPPORT_LINKS@
 TARGET    = @TARGET@
-LIBRARIES = @LIBRARIES@ @LIBS@
-GFXOBJS   = @GFXOBJS@
-ASMOBJS   = @ASMOBJS@
-CPUOBJS   = @CPUOBJS@
-CPUOBJS1  = @CPUOBJS1@
-DEBUGOBJS = @DEBUGOBJS@
+LIBRARIES = @LIBRARIES@ @LIBS@ @GTK_LIBS@
 MATHLIB   = @MATHLIB@
+RESOBJS   = @RESOBJS@
+
+NO_SCHED_CFLAGS = @NO_SCHED_CFLAGS@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -26,21 +25,22 @@ bindir          = @bindir@
 libdir          = @libdir@
 sysconfdir      = @sysconfdir@
 
-.SUFFIXES: .o .c .h .m .i
+VPATH = @top_srcdir@/src
+
+.SUFFIXES: .o .c .h .m .i .S .rc .res
 
-# If you want to use the AF System to play sound, set theese to the
-# correct paths. If not, leave them commented out.
-# (Don't forget to define AF_SOUND in config.h)
-#AFINCLUDE=-I/usr/local/vol/AudioFile/include
-#AFLDFLAGS=-L/usr/local/vol/AudioFile/lib -lAF
+#.SECONDARY: cpuemu.c cpustbl.c cputbl.h
 
-INCLUDES=-I@top_srcdir@/src/include/ -I@top_srcdir@/src/
+INCLUDES=-I. -I@top_srcdir@/src/include/
 
-OBJS = main.o newcpu.o memory.o custom.o cia.o serial.o disk.o blitter.o os.o \
+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 \
-       compiler.o uaelib.o execlib.o timerdev.o machdep/support.o cpustbl.o \
-       $(ASMOBJS) $(CPUOBJS) $(CPUOBJS1) $(GFXOBJS) $(DEBUGOBJS) cpustbl_d.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 @FSDBOBJS@ fsdb.o identify.o \
+       savestate.o writelog.o @ASMOBJS@ @GFXOBJS@ @DEBUGOBJS@ @SCSIOBJS@
+
 
 all: $(TARGET)
 
@@ -48,9 +48,18 @@ x11: progs
 
 svgalib: progs
 
+win32: progs $(RESOBJS)
+	$(WRC) $(RESOBJS) uae.exe
+
+ggilib: progs
+
+asciiart: progs
+
 amigaos: progs
 
-be: progs
+p_os: progs
+
+beos: progs
 
 next: progs
 	cp uae ../Uae.app/Uae
@@ -59,332 +68,117 @@ progs: uae readdisk
 
 install:
 
-readdisk: readdisk.o
-	$(CC) readdisk.o -o readdisk $(LDFLAGS) $(DEBUGFLAGS)
+readdisk: readdisk.o missing.o
+	$(CC) readdisk.o missing.o -o readdisk $(LDFLAGS) $(DEBUGFLAGS)
 
 uae: $(OBJS)
-	$(CC) $(OBJS) -o uae $(GFXLDFLAGS) $(AFLDFLAGS) $(LDFLAGS) $(DEBUGFLAGS) $(LIBRARIES) $(MATHLIB)
+	$(CC) $(OBJS) -o uae $(GFXLDFLAGS) $(LDFLAGS) $(DEBUGFLAGS) $(LIBRARIES) $(MATHLIB)
 
 clean:
+	$(MAKE) -C tools clean
 	-rm -f $(OBJS) *.o uae readdisk
-	-rm -f gencpu genblitter build68k cpudefs.c cpuopti
-	-rm -f cpu?.c blit.h
-	-rm -f cputbl.h cpustbl.c cpu_f?.s cpu_f_d?.s
-	-rm -f blitfunc.c blitfunc.h blittable.c config.h
+	-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)
 
 streifenfrei: clean
-	-rm -f Makefile config.cache config.log config.status include/sysconfig.h machdep
-
-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
-	$(CC) $(LDFLAGS) -o gencpu gencpu.o readcpu.o cpudefs.o
+	-rm -f Makefile sysconfig.h
+	-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: 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: tools/build68k @top_srcdir@/src/table68k
+	./tools/build68k <@top_srcdir@/src/table68k >cpudefs.c
+
+cpuemu.c: tools/gencpu
+	./tools/gencpu
 
-cpudefs.c: build68k table68k
-	./build68k >cpudefs.c
-cpustbl.c: gencpu
-	./gencpu s >cpustbl.c
-cputbl.c: gencpu
-	./gencpu t >cputbl.c
-cputbl.h: gencpu
-	./gencpu h >cputbl.h
-
-cpu0.c: gencpu
-	./gencpu f 0 >cpu0.c
-cpu1.c: gencpu
-	./gencpu f 1 >cpu1.c
-cpu2.c: gencpu
-	./gencpu f 2 >cpu2.c
-cpu3.c: gencpu
-	./gencpu f 3 >cpu3.c
-cpu4.c: gencpu
-	./gencpu f 4 >cpu4.c
-cpu5.c: gencpu
-	./gencpu f 5 >cpu5.c
-cpu6.c: gencpu
-	./gencpu f 6 >cpu6.c
-cpu7.c: gencpu
-	./gencpu f 7 >cpu7.c
-cpu8.c: gencpu
-	./gencpu f 8 >cpu8.c
-cpu9.c: gencpu
-	./gencpu f 9 >cpu9.c
-cpuA.c: gencpu
-	./gencpu f 10 >cpuA.c
-cpuB.c: gencpu
-	./gencpu f 11 >cpuB.c
-cpuC.c: gencpu
-	./gencpu f 12 >cpuC.c
-cpuD.c: gencpu
-	./gencpu f 13 >cpuD.c
-cpuE.c: gencpu
-	./gencpu f 14 >cpuE.c
-cpuF.c: gencpu
-	./gencpu f 15 >cpuF.c
-
-cpu0.o: cpu0.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpu1.o: cpu1.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpu2.o: cpu2.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpu3.o: cpu3.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpu4.o: cpu4.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpu5.o: cpu5.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpu6.o: cpu6.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpu7.o: cpu7.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpu8.o: cpu8.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpu9.o: cpu9.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpuA.o: cpuA.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpuB.o: cpuB.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpuC.o: cpuC.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpuD.o: cpuD.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpuE.o: cpuE.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-cpuF.o: cpuF.c cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
-       
-cpu_d0.o: cpu0.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu0.c -o $@
-cpu_d1.o: cpu1.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu1.c -o $@
-cpu_d2.o: cpu2.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu2.c -o $@
-cpu_d3.o: cpu3.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu3.c -o $@
-cpu_d4.o: cpu4.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu4.c -o $@
-cpu_d5.o: cpu5.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu5.c -o $@
-cpu_d6.o: cpu6.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu6.c -o $@
-cpu_d7.o: cpu7.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu7.c -o $@
-cpu_d8.o: cpu8.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu8.c -o $@
-cpu_d9.o: cpu9.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpu9.c -o $@
-cpu_dA.o: cpuA.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpuA.c -o $@
-cpu_dB.o: cpuB.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpuB.c -o $@
-cpu_dC.o: cpuC.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpuC.c -o $@
-cpu_dD.o: cpuD.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpuD.c -o $@
-cpu_dE.o: cpuE.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpuE.c -o $@
-cpu_dF.o: cpuF.c cputbl.h
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpuF.c -o $@
-       
-cpu_f0.s: cpu0.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f1.s: cpu1.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f2.s: cpu2.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f3.s: cpu3.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f4.s: cpu4.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f5.s: cpu5.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f6.s: cpu6.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f7.s: cpu7.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f8.s: cpu8.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f9.s: cpu9.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_fA.s: cpuA.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_fB.s: cpuB.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_fC.s: cpuC.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_fD.s: cpuD.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_fE.s: cpuE.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_fF.s: cpuF.c cputbl.h cpuopti
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-
-cpu_f_d0.s: cpu0.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_d1.s: cpu1.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_d2.s: cpu2.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_d3.s: cpu3.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_d4.s: cpu4.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_d5.s: cpu5.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_d6.s: cpu6.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_d7.s: cpu7.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_d8.s: cpu8.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_d9.s: cpu9.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_dA.s: cpuA.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_dB.s: cpuB.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_dC.s: cpuC.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_dD.s: cpuD.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_dE.s: cpuE.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED  $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-cpu_f_dF.s: cpuF.c cputbl.h cpuopti
-	$(CC) -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $< -o cpu-tmp.s
-	./cpuopti <cpu-tmp.s >$@
-	rm cpu-tmp.s
-	
-cpustbl_d.o: cpustbl.c cputbl.h
-	$(CC) -c -DMEMFUNCS_DIRECT_REQUESTED $(INCLUDES) $(INCDIRS) $(CFLAGS) $(X_CFLAGS) cpustbl.c -o $@
+# gencpu also creates cpustbl.c and cputbl.h
+cpustbl.c: cpuemu.c
+cputbl.h: cpuemu.c
 
-bebox.o: bebox.cpp
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) bebox.cpp
+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
+
+.rc.res:
+	$(WRC) $(INCLUDES) $<
 .m.o:
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $*.m
+	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $<
 .c.o:
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $*.c -o $@
+	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@
 .c.s:
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c
+	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
 .c.i:
-	$(CC) $(INCLUDES) -E $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.c > $@
+	$(CC) $(INCLUDES) -E $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< > $@
 .S.o:
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $*.S
+	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
 .s.o:
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $*.s
+	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
 
 # Saves recompiling...
 touch:
-	touch *.o; touch build68k; touch cpudefs.c; touch cpudefs.o; touch gencpu; touch cpu?.c cpu*tbl.[ch]; touch cpuopti.o cpuopti cpu?.o cpu_f?.s cpu_f?.o cpu_f_d?.s cpu_f_d?.o cpu*tbl.o cpustbl_d.o
-
-# Some more dependencies...
-cpustbl.o: cputbl.h
-cputbl.o: cputbl.h
+	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
 
 main.o: config.h
 cia.o: config.h include/events.h
-custom.o: config.h include/events.h
+custom.o: config.h include/events.h blit.h
 newcpu.o: config.h include/events.h
 autoconf.o: config.h
 expansion.o: config.h
 xwin.o: config.h
 svga.o: config.h
-bebox.o: config.h
-os.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
 execlib.o: config.h
 disk.o: config.h include/events.h
-blitter.o: config.h include/events.h
-
-config.h: ../config.h
-	ln -s ../config.h config.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 ?)
+cpuemu1.o: cpuemu.c
+	$(CC) -DPART_1 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu2.o: cpuemu.c
+	$(CC) -DPART_2 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu3.o: cpuemu.c
+	$(CC) -DPART_3 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu4.o: cpuemu.c
+	$(CC) -DPART_4 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu5.o: cpuemu.c
+	$(CC) -DPART_5 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu6.o: cpuemu.c
+	$(CC) -DPART_6 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu7.o: cpuemu.c
+	$(CC) -DPART_7 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+cpuemu8.o: cpuemu.c
+	$(CC) -DPART_8 $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@