--- hatari/src/uae-cpu/Makefile	2019/04/01 07:11:36	1.1.1.5
+++ hatari/src/uae-cpu/Makefile	2019/04/01 07:13:47	1.1.1.8
@@ -4,10 +4,9 @@
 include ../../Makefile.cnf
 
 
-CFLAGS += -I. $(SDL_CFLAGS)
-QUIETCFLAGS = $(CFLAGS) -Wno-unused
-
-HOSTCFLAGS += $(SDL_CFLAGS)
+CFLAGS += -I. -I../.. $(CPPFLAGS) $(SDL_CFLAGS)
+# disable several warnings for the CPU emu code as it comes from elsewhere
+QUIETCFLAGS = $(CFLAGS) -Wno-unused -Wno-sign-compare -Wno-shadow
 
 
 CPUCSRCS = hatari-glue.c memory.c newcpu.c readcpu.c fpp.c cpustbl.c cpudefs.c
@@ -18,18 +17,17 @@ CPUEMUSRCS = cpuemu1.c cpuemu2.c cpuemu3
 CPU_OBS = $(CPUCSRCS:.c=.o) $(CPUEMUSRCS:.c=.o)
 
 
-all: $(CPU_OBS)
-
-
-clean:
-	rm -f *.o gencpu build68k cpudefs.c cpustbl.c cputbl.h cpuemu.c
+all: cpu68k.a
 
+cpu68k.a: $(CPU_OBS)
+	$(AR) cru $@ $^
+	$(RANLIB) $@
 
 build68k: build68k.c
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
 
-cpudefs.c: ./build68k ./table68k
-	./build68k <./table68k >cpudefs.c
+cpudefs.c: build68k table68k
+	./build68k <table68k >cpudefs.c
 
 cpudefs-host.o: cpudefs.c
 	$(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<
@@ -46,27 +44,36 @@ gencpu: gencpu.o readcpu-host.o cpudefs-
 cpuemu.c: gencpu
 	./gencpu
 
+
 cpustbl.c: cpuemu.c
 cputbl.h: cpuemu.c
 
 
 # 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 -c $(CPPFLAGS) $(QUIETCFLAGS) $< -o $@
+	$(CC) -DPART_1 -c $(QUIETCFLAGS) $< -o $@
 cpuemu2.o: cpuemu.c
-	$(CC) -DPART_2 -c $(CPPFLAGS) $(QUIETCFLAGS) $< -o $@
+	$(CC) -DPART_2 -c $(QUIETCFLAGS) $< -o $@
 cpuemu3.o: cpuemu.c
-	$(CC) -DPART_3 -c $(CPPFLAGS) $(QUIETCFLAGS) $< -o $@
+	$(CC) -DPART_3 -c $(QUIETCFLAGS) $< -o $@
 cpuemu4.o: cpuemu.c
-	$(CC) -DPART_4 -c $(CPPFLAGS) $(QUIETCFLAGS) $< -o $@
+	$(CC) -DPART_4 -c $(QUIETCFLAGS) $< -o $@
 cpuemu5.o: cpuemu.c
-	$(CC) -DPART_5 -c $(CPPFLAGS) $(QUIETCFLAGS) $< -o $@
+	$(CC) -DPART_5 -c $(QUIETCFLAGS) $< -o $@
 cpuemu6.o: cpuemu.c
-	$(CC) -DPART_6 -c $(CPPFLAGS) $(QUIETCFLAGS) $< -o $@
+	$(CC) -DPART_6 -c $(QUIETCFLAGS) $< -o $@
 cpuemu7.o: cpuemu.c
-	$(CC) -DPART_7 -c $(CPPFLAGS) $(QUIETCFLAGS) $< -o $@
+	$(CC) -DPART_7 -c $(QUIETCFLAGS) $< -o $@
 cpuemu8.o: cpuemu.c
-	$(CC) -DPART_8 -c $(CPPFLAGS) $(QUIETCFLAGS) $< -o $@
+	$(CC) -DPART_8 -c $(QUIETCFLAGS) $< -o $@
 
 
 newcpu.o: sysdeps.h hatari-glue.h maccess.h memory.h newcpu.h
+
+
+clean:
+	$(RM) *.o gencpu build68k cpu68k.a
+
+distclean:	clean
+	$(RM) cpudefs.c cpustbl.c cputbl.h cpuemu.c
+	$(RM) *~ *.bak *.orig