--- uae/src/Makefile.in	2018/04/24 17:16:33	1.1.1.15
+++ uae/src/Makefile.in	2018/04/24 17:18:24	1.1.1.16
@@ -7,7 +7,9 @@ CC        = @CC@
 WRC       = @WRCPRG@
 CPP       = @CPP@
 LDFLAGS   = @LDFLAGS@
-CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@
+CFLAGS    = @CFLAGS@ -D__inline__=@ac_cv_c_inline@ \
+		-DSYSTEM_ROMDIR=\"$(datadir)/uae/roms\" \
+		-DSYSTEM_CFGDIR=\"$(datadir)/uae/configs\"
 X_CFLAGS  = @X_CFLAGS@ @GTK_CFLAGS@ -DSHM_SUPPORT_LINKS=@SHM_SUPPORT_LINKS@
 TARGET    = @TARGET@
 LIBRARIES = @LIBRARIES@ @LIBS@ @GTK_LIBS@
@@ -20,6 +22,8 @@ INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA    = @INSTALL_DATA@
 prefix          = @prefix@
+datarootdir     = @datarootdir@
+datadir         = @datadir@
 exec_prefix     = @exec_prefix@
 bindir          = @bindir@
 libdir          = @libdir@
@@ -33,15 +37,18 @@ VPATH = @top_srcdir@/src
 
 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 traps.o gfxlib.o blitfunc.o blittable.o \
-       disk.o audio.o uaelib.o drawing.o picasso96.o cpustbl.o inputdevice.o \
-       uaeexe.o bsdsocket.o missing.o sd-sound.o od-joy.o md-support.o \
-       fsusage.o cfgfile.o native2amiga.o fsdb.o identify.o timemgr.o crc32.o \
-       savestate.o writelog.o hotkeys.o keymap/keymap.o keymap/x11pc_rawkeys.o \
-       sinctable.o \
-       @ASMOBJS@ @GFXOBJS@ @DEBUGOBJS@ @SCSIOBJS@ @FSDBOBJS@
+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 traps.o blitfunc.o blittable.o \
+	gayle.o rommgr.o disk.o audio.o drawing.o cpustbl.o inputdevice.o \
+	uaelib.o picasso96.o uaeexe.o bsdsocket.o bsdsocket-posix-new.o \
+	missing.o \
+	sd-sound.o od-joy.o md-support.o \
+	fsusage.o cfgfile.o native2amiga.o fsdb.o identify.o timemgr.o crc32.o \
+	savestate.o writelog.o \
+	hotkeys.o keymap/keymap.o keymap/x11pc_rawkeys.o \
+	sinctable.o \
+	@ASMOBJS@ @GFXOBJS@ @GUIOBJS@ @DEBUGOBJS@ @SCSIOBJS@ @FSDBOBJS@
 
 
 all: $(TARGET)
@@ -87,9 +94,11 @@ halfclean:
 	-rm -f $(OBJS)
 
 streifenfrei: clean
+	$(MAKE) -C tools streifenfrei
 	-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
+	-rm -f md-fpp.h
 
 blit.h: tools/genblitter
 	./tools/genblitter i >blit.h