--- hatari/tests/debugger/makefile	2019/04/09 08:49:07	1.1
+++ hatari/tests/debugger/makefile	2019/04/09 08:53:52	1.1.1.3
@@ -15,6 +15,10 @@
 # Set the C compiler (e.g. gcc)
 CC = gcc
 
+# Directory given for 'cmake' i.e. where CMake created the config.h.
+# Could also be simply "../.." or "../../build".
+CONFIGDIR := $(shell find ../.. -name config.h | head -1 | sed 's%/[^/]*$$%%')
+
 # SDL-Library configuration (compiler flags and linker options) - you normally
 # don't have to change this if you have correctly installed the SDL library!
 SDL_CFLAGS := $(shell sdl-config --cflags)
@@ -23,8 +27,8 @@ SDL_CFLAGS := $(shell sdl-config --cflag
 WARNFLAGS = -Wmissing-prototypes -Wstrict-prototypes -Wsign-compare \
   -Wbad-function-cast -Wcast-qual  -Wpointer-arith -Wwrite-strings -Wall
 
-# Hatari include directories:
-INCFLAGS = -I../.. -I../../src/includes -I../../src/uae-cpu \
+# Hatari source include directories:
+INCFLAGS = -I$(CONFIGDIR) -I../../src/includes -I../../src/uae-cpu \
   -I../../src/debug -I../../src/falcon
 
 # Set extra flags passed to the compiler
@@ -36,8 +40,10 @@ ifneq ($(MUDFLAP),)
 # - stack protection
 # - checking of pointer accesses (AFAIK works only on x86)
 #
-# Before build, install "libmudflap<version>-<gcc-version>-dev"
-# package (libmudflap0-4.3-dev in Debian Lenny).
+# Before build, install mudflap library development package,
+# typically it's named either "libmudflap<version>-<gcc-version>-dev"
+# (e.g. libmudflap0-4.4-dev in Debian Squeeze) or "libmudflap-devel"
+# (e.g. in Fedora).
 #
 # To build, use:
 #	make clean; make MUDFLAP=1
@@ -91,9 +97,9 @@ test: $(TESTS)
 
 # all the real & dummy deps
 SOURCEDEPS = test-dummies.c ../../src/debug/breakcond.c \
-	../../src/debug/debugcpu.c ../../src/falcon/dsp.c \
-	../../src/debug/evaluate.c ../../src/debug/profile.c \
-	../../src/debug/symbols.c ../../src/str.c
+	../../src/debug/debugcpu.c ../../src/debug/history.c \
+	../../src/debug/evaluate.c ../../src/debug/symbols.c \
+	../../src/str.c
 
 test-symbols: test-symbols.c $(SOURCEDEPS)
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)