--- uae/src/Makefile.Be	2018/04/24 16:38:39	1.1.1.1
+++ uae/src/Makefile.Be	2018/04/24 16:39:16	1.1.1.2
@@ -3,42 +3,37 @@
 # Copyright 1995,1996 Bernd Schmidt
 # Copyright 1996 Ed Hanway
 
-.SUFFIXES: .o .c .h .m
+CC			= mwcc
+CPP			= mwcc -E
+CFLAGS		= -O7 -D__unix -DUSE_ZFILE
+GFXOBJS		= bebox.o
+ASMOBJS		=
+CPUOBJS		= cpu0.o cpu1.o cpu2.o cpu3.o cpu4.o cpu5.o cpu6.o cpu7.o cpu8.o cpu9.o cpuA.o cpuB.o cpuC.o cpuD.o cpuE.o cpuF.o
+
+.SUFFIXES: .o .c .h .m .i
+
+INCLUDES	= -I. -Iinclude
+
+OBJS = main.o newcpu.o memory.o debug.o custom.o cia.o disk.o blitter.o os.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 serial.o uaelib.o execlib.o machdep/support.o \
+       $(ASMOBJS) $(CPUOBJS) $(GFXOBJS) cpustbl.o
 
-INCLUDES=-Iinclude
+all: machdep include/sysconfig.h uae readdisk
 
-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 $(ASSEMBLYOBJS) \
-       cpu0.o cpu1.o cpu2.o cpu3.o cpu4.o cpu5.o cpu6.o cpu7.o \
-       cpu8.o cpu9.o cpuA.o cpuB.o cpuC.o cpuD.o cpuE.o cpuF.o cpustbl.o
+machdep:
+	cp -r md-ppc machdep
 
-all: sysconfig.h bebox
-
-sysconfig.h: sysconfig.h.Be
-	cp sysconfig.h.Be sysconfig.h
-
-#		ASSEMBLYOBJS='PPC.o' \
-
-bebox:
-	$(MAKE) -fMakefile.Be \
-		CC='mwcc' \
-		DEBUGFLAGS='-g' \
-		GFXOBJS='bebox.o' \
-		CFLAGS='-O7 -DPPC603=1 -D__unix -D__bebox__' \
-		LDFLAGS='' \
-		INCPATH='-I$(BEINCLUDES)' \
-		progs
-
-progs: uae readdisk
-
-install:
+include/sysconfig.h: include/sysconfig.h.Be
+	cp include/sysconfig.h.Be include/sysconfig.h
 
 readdisk: readdisk.o
-	$(CC) readdisk.o -o readdisk $(LDFLAGS) $(DEBUGFLAGS)
+	$(CC) readdisk.o -o readdisk
 
 uae: $(OBJS)
-	$(CC) $(OBJS) -o uae $(GFXLDFLAGS) $(AFLDFLAGS) $(LDFLAGS) $(DEBUGFLAGS)
+	$(CC) $(OBJS) -o uae
+	cp uae ..
 
 clean:
 	-rm -f *.o uae readdisk
@@ -59,12 +54,12 @@ blitfunc.h: genblitter
 blittable.c: genblitter blitfunc.h
 	./genblitter t >blittable.c
 
-genblitter: genblitter.o
-	$(CC) $(LDFLAGS) -o $@ $?
+genblitter: genblitter.o blitops.o
+	$(CC) -o genblitter genblitter.o blitops.o
 build68k: build68k.o
-	$(CC) $(LDFLAGS) -o $@ $?
+	$(CC) -o build68k build68k.o
 gencpu: gencpu.o readcpu.o cpudefs.o
-	$(CC) $(LDFLAGS) -o $@ gencpu.o readcpu.o cpudefs.o
+	$(CC) -o gencpu gencpu.o readcpu.o cpudefs.o
 
 custom.o: blit.h
 
@@ -110,79 +105,64 @@ cpuE.c: gencpu
 cpuF.c: gencpu
 	./gencpu f 15 >cpuF.c
 
-cpu0.o: cpu0.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpu1.o: cpu1.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpu2.o: cpu2.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpu3.o: cpu3.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpu4.o: cpu4.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpu5.o: cpu5.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpu6.o: cpu6.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpu7.o: cpu7.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpu8.o: cpu8.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpu9.o: cpu9.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpuA.o: cpuA.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpuB.o: cpuB.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpuC.o: cpuC.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpuD.o: cpuD.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpuE.o: cpuE.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
-cpuF.o: cpuF.c
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $*.c
+cpu0.o: cpu0.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpu1.o: cpu1.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpu2.o: cpu2.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpu3.o: cpu3.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpu4.o: cpu4.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpu5.o: cpu5.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpu6.o: cpu6.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpu7.o: cpu7.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpu8.o: cpu8.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpu9.o: cpu9.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpuA.o: cpuA.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpuB.o: cpuB.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpuC.o: cpuC.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpuD.o: cpuD.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpuE.o: cpuE.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
+cpuF.o: cpuF.c cputbl.h
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c
 
 bebox.o: bebox.cpp
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(DEBUGFLAGS) bebox.cpp
-#beaudio.o: beaudio.cpp
-#	$(CC) $(INCLUDES) -c $(INCDIRD) $(CFLAGS) $(DEBUGFALGS) beaudio.cpp
-
-X86.o: X86.S
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(DEBUGFLAGS) $(ASSEMBLYCFLAGS) X86.S
-#PPC.o: PPC.cpp
-#	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(DEBUGFLAGS) $(ASSEMBLYCFLAGS) PPC.cpp
+	$(CC) $(INCLUDES) -c $(CFLAGS) bebox.cpp
 
 .m.o:
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(DEBUGFLAGS) $*.m
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.m
 .c.o:
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(DEBUGFLAGS) $(ASSEMBLYCFLAGS) $*.c
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.c -o $@
 .c.s:
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $*.c
+	$(CC) $(INCLUDES) -S $(CFLAGS) $*.c
+.c.i:
+	$(CC) $(INCLUDES) -E $(CFLAGS) $*.c > $@
 .S.o:
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(DEBUGFLAGS) $(ASSEMBLYCFLAGS) $*.S
+	$(CC) $(INCLUDES) -c $(CFLAGS) $*.S
 
 # Saves recompiling...
 touch:
-	touch *.o; touch build68k; touch cpudefs.c; touch cpudefs.o; touch gencpu; touch genblitter; touch cpu*.c; touch cpu*.h; touch cpu*.o
+	touch *.o
+	touch build68k
+	touch cpudefs.c
+	touch cpudefs.o
+	touch gencpu
+	touch genblitter
+	touch cpu*.*
 
 # Some more dependencies...
-cpu0.o: cputbl.h
-cpu1.o: cputbl.h
-cpu2.o: cputbl.h
-cpu3.o: cputbl.h
-cpu4.o: cputbl.h
-cpu5.o: cputbl.h
-cpu6.o: cputbl.h
-cpu7.o: cputbl.h
-cpu8.o: cputbl.h
-cpu9.o: cputbl.h
-cpuA.o: cputbl.h
-cpuB.o: cputbl.h
-cpuC.o: cputbl.h
-cpuD.o: cputbl.h
-cpuE.o: cputbl.h
-cpuF.o: cputbl.h
 cpustbl.o: cputbl.h
 cputbl.o: cputbl.h
 
@@ -197,12 +177,16 @@ autoconf.o: config.h
 expansion.o: config.h
 xwin.o: config.h
 svga.o: config.h
-bebox.o: config.h bebox.h
-#beaudio.o: config.h
+bebox.o: config.h include/bebox.h
 os.o: config.h
 memory.o: config.h
 debug.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
+	cp ../config.h config.h