add x48_ to files mainly used for (G)UI

Makefile

@@ -41,7 +41,7 @@ dump2rom: src/tools/dump2rom.o
 checkrom: src/tools/checkrom.o src/romio.o
 	$(CC) $(CFLAGS) $(LIBS) $^ -o $@
 
-x48ng: src/main.o src/hp48emu_actions.o src/debugger.o src/hp48_device.o src/debugger_disasm.o src/hp48_emulate.o src/errors.o src/hp48_init.o src/hp48emu_memory.o src/hp48emu_register.o src/resources.o src/romio.o src/debugger_rpl.o src/hp48_serial.o src/timer.o src/x48.o src/resources.o
+x48ng: src/main.o src/hp48emu_actions.o src/x48_debugger.o src/hp48_device.o src/x48_debugger_disasm.o src/hp48_emulate.o src/x48_errors.o src/hp48_init.o src/hp48emu_memory.o src/hp48emu_register.o src/x48_resources.o src/romio.o src/x48_debugger_rpl.o src/hp48_serial.o src/timer.o src/x48.o
 	$(CC) $(CFLAGS) $(LIBS) $^ -o $@
 
 # Cleaning

src/hp48_emulate.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "debugger.h"
+#include "x48_debugger.h"
 #include "hp48.h"
 #include "hp48emu.h"
 #include "timer.h"

src/hp48_init.c

@@ -9,7 +9,7 @@
 
 #include "hp48.h"
 #include "hp48emu.h"
-#include "resources.h"
+#include "x48_resources.h"
 #include "romio.h"
 
 #define X48_MAGIC 0x48503438

src/hp48_serial.c

@@ -9,7 +9,7 @@
 
 #include "hp48.h"
 #include "hp48emu.h"
-#include "resources.h"
+#include "x48_resources.h"
 #include "x48.h"
 
 static int wire_fd;

src/hp48emu_actions.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "debugger.h"
+#include "x48_debugger.h"
 #include "hp48.h"
 #include "hp48emu.h"
 #include "romio.h"

src/hp48emu_memory.c

@@ -6,7 +6,7 @@
 
 #include "hp48.h"
 #include "hp48emu.h"
-#include "resources.h"
+#include "x48_resources.h"
 #include "romio.h"
 #include "x48.h"
 

src/main.c

@@ -9,10 +9,10 @@
 #include <langinfo.h>
 #include <locale.h>
 
-#include "debugger.h"
 #include "hp48.h"
-#include "resources.h"
 #include "x48.h"
+#include "x48_debugger.h"
+#include "x48_resources.h"
 
 #if defined( GUI_IS_X11 )
 char* progname;

src/timer.c

@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <assert.h>
 
-#include "debugger.h"
+#include "x48_debugger.h"       /* used for in_debugger */
 #include "romio.h"
 #include "timer.h"
 

src/x48.c

@@ -10,9 +10,9 @@
 #include <sys/utsname.h>
 
 #include "x48.h"
-#include "errors.h"
+#include "x48_errors.h"
 #include "hp48.h"
-#include "resources.h"
+#include "x48_resources.h"
 #include "romio.h"
 
 #if defined( GUI_IS_X11 )

src/x48_debugger.c

@@ -8,11 +8,11 @@
 #include <unistd.h>
 #include <X11/Xlib.h>
 
-#include "debugger.h"
-#include "debugger_disasm.h"
-#include "debugger_rpl.h"
+#include "x48_debugger.h"
+#include "x48_debugger_disasm.h"
+#include "x48_debugger_rpl.h"
 #include "hp48.h"
-#include "resources.h"
+#include "x48_resources.h"
 #include "romio.h"
 #include "timer.h"
 #include "x48.h" /* for exit_x48() */

src/x48_debugger_disasm.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "debugger_disasm.h"
+#include "x48_debugger_disasm.h"
 #include "hp48.h"
 
 #define TAB_SKIP 8

src/x48_debugger_rpl.c

@@ -3,12 +3,12 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "debugger.h"
-#include "debugger_disasm.h"
 #include "hp48.h"
 #include "hp48emu.h"
 #include "romio.h"
-#include "debugger_rpl.h"
+#include "x48_debugger.h"
+#include "x48_debugger_disasm.h"
+#include "x48_debugger_rpl.h"
 
 /* #ifndef _HP48CHAR_H */
 /* #define _HP48CHAR_H 1 */

src/x48_resources.c

@@ -4,9 +4,9 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include "resources.h"
-#include "debugger_disasm.h" /* `disassembler_mode` & `CLASS_MNEMONICS` */
-#include "errors.h"
+#include "x48_resources.h"
+#include "x48_debugger_disasm.h" /* `disassembler_mode` & `CLASS_MNEMONICS` */
+#include "x48_errors.h"
 
 int verbose;
 int useTerminal;