--- hatari/src/gui-sdl/Makefile	2019/04/01 07:13:14	1.1.1.4
+++ hatari/src/gui-sdl/Makefile	2019/04/09 08:48:50	1.1.1.7
@@ -4,22 +4,25 @@
 include ../../Makefile.cnf
 
 # Additional include directories:
-INCFLAGS = -I../includes
+INCFLAGS = -I../.. -I../debug -I../includes $(CPPFLAGS)
 
+CFLAGS += $(INCFLAGS) $(SDL_CFLAGS) -Wno-write-strings
 
-CFLAGS += -DDATADIR=\"$(DATADIR)\" $(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) $@
+
 
 font5x8.h: font5x8.bmp
 	convert font5x8.bmp xbm:font5x8.h
@@ -29,14 +32,14 @@ font10x16.h: font10x16.bmp
 
 
 clean:
-	$(RM) *.o
+	$(RM) *.o gui-sdl.a
 
 distclean: clean
 	$(RM) Makefile.dep *~ *.bak *.orig
 
 
 # Use "make depend" to generate file dependencies:
-Makefile.dep: Makefile
+Makefile.dep: Makefile ../Makefile
 	$(CC) -MM $(CFLAGS) $(DLGSRCS) > Makefile.dep
 
 depend: Makefile.dep