--- hatari/src/gui-sdl/Makefile	2019/04/01 07:11:56	1.1.1.2
+++ hatari/src/gui-sdl/Makefile	2019/04/09 08:47:25	1.1.1.6
@@ -4,25 +4,26 @@
 include ../../Makefile.cnf
 
 # Additional include directories:
-INCFLAGS = -I../includes
+INCFLAGS = -I../.. -I../includes $(CPPFLAGS)
 
 
-CFLAGS += -DDATADIR=\"$(DATADIR)\" $(INCFLAGS) $(SDL_CFLAGS)
+CFLAGS += $(INCFLAGS) $(SDL_CFLAGS) -Wno-write-strings
 
 
-
-DLGSRCS = dlgAbout.c dlgAlert.c dlgDevice.c dlgDisc.c dlgJoystick.c \
-  dlgKeyboard.c dlgMain.c dlgMemory.c dlgNewDisc.c dlgRom.c \
+DLGSRCS = dlgAbout.c dlgAlert.c dlgDevice.c dlgFloppy.c dlgHardDisk.c \
+  dlgJoystick.c dlgKeyboard.c dlgMain.c dlgMemory.c dlgNewDisk.c dlgRom.c \
   dlgScreen.c dlgSound.c dlgSystem.c dlgFileSelect.c sdlgui.c
 
 
 DLGOBJS = $(DLGSRCS:.c=.o)
 
 
-all: $(DLGOBJS)
+all: gui-sdl.a
+
+gui-sdl.a: $(DLGOBJS)
+	$(AR) cru $@ $^
+	$(RANLIB) $@
 
-clean:
-	rm -f *.o
 
 font5x8.h: font5x8.bmp
 	convert font5x8.bmp xbm:font5x8.h
@@ -30,10 +31,18 @@ font5x8.h: font5x8.bmp
 font10x16.h: font10x16.bmp
 	convert font10x16.bmp xbm:font10x16.h
 
+
+clean:
+	$(RM) *.o
+
+distclean: clean
+	$(RM) Makefile.dep *~ *.bak *.orig
+
+
 # Use "make depend" to generate file dependencies:
-depend: $(DLGSRCS)
+Makefile.dep: Makefile
 	$(CC) -MM $(CFLAGS) $(DLGSRCS) > Makefile.dep
 
-ifneq (,$(wildcard Makefile.dep))
-include Makefile.dep
-endif
+depend: Makefile.dep
+
+-include Makefile.dep