--- uae/src/Makefile.in	2018/04/24 16:38:39	1.1.1.1
+++ uae/src/Makefile.in	2018/04/24 16:40:53	1.1.1.4
@@ -5,13 +5,17 @@
 @SET_MAKE@
 CC        = @CC@
 CPP       = @CPP@
-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@
+LDFLAGS   = @LDFLAGS@
+CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@ $(AFINCLUDE) \
+            -DSTATFS_NO_ARGS=@STATFS_NO_ARGS@ \
+            -DSTATBUF_BAVAIL=@STATBUF_BAVAIL@ 
+X_CFLAGS  = @X_CFLAGS@ @GTK_CFLAGS@ -DSHM_SUPPORT_LINKS=@SHM_SUPPORT_LINKS@
 TARGET    = @TARGET@
-LIBRARIES = @LIBRARIES@ @LIBS@
-GFXOBJS   = @GFXOBJS@
-ASMOBJS   = @ASMOBJS@
-CPUOBJS   = @CPUOBJS@
+LIBRARIES = @LIBRARIES@ @LIBS@ @GTK_LIBS@
+MATHLIB   = @MATHLIB@
+
+NO_SCHED_CFLAGS = @NO_SCHED_CFLAGS@
+
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA    = @INSTALL_DATA@
@@ -21,7 +25,11 @@ bindir          = @bindir@
 libdir          = @libdir@
 sysconfdir      = @sysconfdir@
 
-.SUFFIXES: .o .c .h .m
+VPATH = @top_srcdir@/src
+
+.SUFFIXES: .o .c .h .m .i .S
+
+.SECONDARY: p2c.c p2c.h cpuemu.c cpustbl.c cputbl.h
 
 # If you want to use the AF System to play sound, set theese to the
 # correct paths. If not, leave them commented out.
@@ -29,20 +37,30 @@ sysconfdir      = @sysconfdir@
 #AFINCLUDE=-I/usr/local/vol/AudioFile/include
 #AFLDFLAGS=-L/usr/local/vol/AudioFile/lib -lAF
 
-INCLUDES=-Iinclude
+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 picasso96.o p2c.o cpustbl.o \
+       uaeexe.o missing.o sounddep/sound.o osdep/joystick.o machdep/support.o \
+       @ASMOBJS@ @GFXOBJS@ @DEBUGOBJS@
 
-OBJS = main.o newcpu.o memory.o debug.o custom.o cia.o disk.o blitter.o $(GFXOBJS) \
-       autoconf.o os.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 $(ASMOBJS) \
-       compiler.o serial.o uaelib.o execlib.o $(CPUOBJS) cpustbl.o
-       
 all: $(TARGET)
 
 x11: progs
 
 svgalib: progs
 
-be: progs
+ggilib: progs
+
+asciiart: progs
+
+amigaos: progs
+
+p_os: progs
+
+beos: progs
 
 next: progs
 	cp uae ../Uae.app/Uae
@@ -51,24 +69,24 @@ 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) -lm
+	$(CC) $(OBJS) -o uae $(GFXLDFLAGS) $(AFLDFLAGS) $(LDFLAGS) $(DEBUGFLAGS) $(LIBRARIES) $(MATHLIB)
 
 clean:
-	-rm -f *.o uae readdisk
-	-rm -f gencpu genblitter build68k cpudefs.c cpuopti
-	-rm -f cpu?.c blit.h
-	-rm -f cputbl.h cpustbl.c cpu_fast?.s
-	-rm -f blitfunc.c blitfunc.h blittable.c config.h
+	-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
 
 halfclean:
-	-rm -f $(OBJS) $(GFXOBJS)
+	-rm -f $(OBJS)
 
 streifenfrei: clean
-	-rm -f Makefile config.cache config.log config.status include/sysconfig.h
+	-rm -f Makefile config.cache config.log config.status sysconfig.h
+	-rm -f machdep osdep threaddep sounddep target.h config.h
 
 blit.h: genblitter
 	./genblitter i >blit.h
@@ -79,223 +97,74 @@ blitfunc.h: genblitter
 blittable.c: genblitter blitfunc.h
 	./genblitter t >blittable.c
 
-genblitter: genblitter.o
-	$(CC) $(LDFLAGS) -o genblitter genblitter.o
+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
-
-custom.o: blit.h
-
-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_fast0.o: cpu_fast0.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast1.o: cpu_fast1.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast2.o: cpu_fast2.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast3.o: cpu_fast3.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast4.o: cpu_fast4.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast5.o: cpu_fast5.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast6.o: cpu_fast6.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast7.o: cpu_fast7.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast8.o: cpu_fast8.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fast9.o: cpu_fast9.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fastA.o: cpu_fastA.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fastB.o: cpu_fastB.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fastC.o: cpu_fastC.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fastD.o: cpu_fastD.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fastE.o: cpu_fastE.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-cpu_fastF.o: cpu_fastF.s cputbl.h
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $*.s
-
-cpu_fast0.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_fast1.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_fast2.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_fast3.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_fast4.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_fast5.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_fast6.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_fast7.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_fast8.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_fast9.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_fastA.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_fastB.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_fastC.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_fastD.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_fastE.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_fastF.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
-
-bebox.o: bebox.cpp
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) bebox.cpp
+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
+
+cpudefs.c: build68k @top_srcdir@/src/table68k
+	./build68k <@top_srcdir@/src/table68k >cpudefs.c
+
+cpuemu.c: gencpu
+	./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
+	
+osdep/beos.o: osdep/beos.cpp
+	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) osdep/beos.cpp -o osdep/beos.o
 
 .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
+	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -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) $(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) $< -o $@
 
 # Saves recompiling...
 touch:
-	touch *.o; touch build68k; touch cpudefs.c; touch cpudefs.o; touch gencpu genblitter; touch cpu?.c cpu*tbl.[ch]; touch cpu?.o cpu*tbl.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 cpuopti.o cpuopti cpuemu.o cpufast.s cpufast.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
 fpp.o: config.h
@@ -303,8 +172,5 @@ 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