move libChf under src/

Makefile

@@ -23,10 +23,10 @@ override CFLAGS := -O$(OPTIM) \
 	-DVERSION_MINOR=$(VERSION_MINOR) \
 	-DPATCHLEVEL=$(PATCHLEVEL) \
 	-I./src/ \
-	-I./libChf/src/ \
+	-I./src/libChf/src/ \
 	$(CFLAGS)
 
-LIBS = -L./libChf -lChf
+LIBS = -L./src/libChf -lChf
 
 SDLCFLAGS = $(shell pkg-config --cflags sdl2)
 SDLLIBS = $(shell pkg-config --libs sdl2)
@@ -106,33 +106,33 @@ override CPPFLAGS := -I./src/ -D_GNU_SOURCE=1 \
 
 .PHONY: all clean clean-all pretty-code install mrproper get-roms install
 
-all: libChf/libChf.a dist/$(NAME) docs
+all: src/libChf/libChf.a dist/$(NAME) docs
 
 # Building
-libChf/libChf.a:
+src/libChf/libChf.a:
-	make -C libChf
+	make -C src/libChf
 
-dist/$(NAME): $(DOTOS) $(DOTOS_UI4x) libChf/libChf.a
+dist/$(NAME): $(DOTOS) $(DOTOS_UI4x) src/libChf/libChf.a
 	$(CC) $^ -o $@ $(CFLAGS) $(LIBS) $(SDLLIBS) $(NCURSESLIBS)
 
-dist/pack: src/pack.o src/disk_io.o src/debug.o libChf/libChf.a
+dist/pack: src/pack.o src/disk_io.o src/debug.o src/libChf/libChf.a
 	# UNUSED
 	$(CC) $^ -o $@ $(CFLAGS) $(LIBS)
 
 doc:
 	make -C docs
-	make -C libChf doc
+	make -C src/libChf doc
 
 # Cleaning
 clean:
 	rm -f src/*.o
-	make -C libChf clean
+	make -C src/libChf clean
 	make -C docs clean
 
 mrproper: clean
 	rm -f dist/$(NAME) dist/pack
 	make -C dist/ROMs mrproper
-	make -C libChf mrproper
+	make -C src/libChf mrproper
 	make -C docs mrproper
 
 clean-all: mrproper
@@ -140,7 +140,7 @@ clean-all: mrproper
 # Formatting
 pretty-code:
 	clang-format -i src/*.c src/*.h
-	make -C libChf pretty-code
+	make -C src/libChf pretty-code
 
 # Dependencies
 get-roms:
@@ -160,7 +160,7 @@ install: dist/$(NAME) doc
 	cp -R dist/ROMs/ $(DESTDIR)$(PREFIX)/share/$(NAME)/
 
 	install -m 755 -d -- $(DESTDIR)$(DOCDIR)
-	cp -R COPYING LICENSE README* docs-4.1.1.1 docs/*.{info,dvi,ps,pdf} libChf/docs/*.{info,dvi,ps,pdf} $(DESTDIR)$(DOCDIR)
+	cp -R COPYING LICENSE README* docs-4.1.1.1 docs/*.{info,dvi,ps,pdf} src/libChf/docs/*.{info,dvi,ps,pdf} $(DESTDIR)$(DOCDIR)
 
 	install -m 755 -d -- $(DESTDIR)$(PREFIX)/share/applications
 	sed "s|@PREFIX@|$(PREFIX)|g" dist/saturn48gx.desktop > $(DESTDIR)$(PREFIX)/share/applications/saturn48gx.desktop

src/___x11.c

@@ -216,7 +216,7 @@ static char rcs_id[] = "$Id: x11.c,v 4.1.1.1 2002/11/11 16:11:47 cibrario Exp $"
 #include "debug.h"
 
 #define CHF_MODULE_ID X11_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /*---------------------------------------------------------------------------
         Misc. parameters

src/___x11_lcd.c

@@ -110,7 +110,7 @@ static char rcs_id[] = "$Id: display.c,v 4.1.1.1 2002/11/11 16:12:46 cibrario Ex
 #include "debug.h"
 
 #define CHF_MODULE_ID X11_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 #ifndef LCD_MAG
 #  define LCD_MAG 2 /* 4.1.1.1: Compat. default */

src/___x11_main.c

@@ -117,7 +117,7 @@ static char rcs_id[] = "$Id: saturn.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $";
 /* Chf condition codes (main program only) */
 
 #define CHF_MODULE_ID MAIN_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 #define MAIN_M_COPYRIGHT 501
 #define MAIN_M_LICENSE 502

src/chf_messages.h

@@ -3,7 +3,7 @@
 
 #include <stdlib.h>
 
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 // #include "../libChf/src/Chf.h"
 
 /* Chf Module Identifiers:

src/cpu.c

@@ -116,7 +116,7 @@ static char rcs_id[] = "$Id: cpu.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $";
 #include "debug.h"
 
 #define CHF_MODULE_ID CPU_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 #define GetNibble FetchNibble
 

src/debug.c

@@ -74,7 +74,7 @@ static char rcs_id[] = "$Id: debug.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $";
 #include "debug.h"
 
 #define CHF_MODULE_ID DEBUG_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /*---------------------------------------------------------------------------
         Static/Global variables

src/dis.c

@@ -96,7 +96,7 @@ static char rcs_id[] = "$Id: dis.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $";
 #include "debug.h"
 
 #define CHF_MODULE_ID CPU_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /*---------------------------------------------------------------------------
         Private functions/macros/variables

src/disk_io.c

@@ -77,7 +77,7 @@ static char rcs_id[] = "$Id: disk_io.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $"
 #include "debug.h"
 
 #define CHF_MODULE_ID DISK_IO_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /* .+
 

src/disk_io_obj.c

@@ -76,7 +76,7 @@ static char rcs_id[] = "$Id: disk_io_obj.c,v 4.1 2000/12/11 09:54:19 cibrario Re
 #include "debug.h"
 
 #define CHF_MODULE_ID DISK_IO_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /* .+
 

src/emulator.c

@@ -128,7 +128,7 @@ static char rcs_id[] = "$Id: emulator.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $
 #include "debug.h"
 
 #define CHF_MODULE_ID CPU_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /*---------------------------------------------------------------------------
         Private macros / variables / functions

src/flash49.c

@@ -86,7 +86,7 @@ static char rcs_id[] = "$Id: flash49.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $"
 #include "debug.h"
 
 #define CHF_MODULE_ID FLASH_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /*---------------------------------------------------------------------------
         Private Macro/Data type definitions

src/hdw.c

@@ -119,7 +119,7 @@ static char rcs_id[] = "$Id: hdw.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $";
 #include "debug.h"
 
 #define CHF_MODULE_ID MOD_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 static const int addr_mask[] = { 0x0000F, 0x000F0, 0x00F00, 0x0F000, 0xF0000 };
 

src/hw_config.c

@@ -88,7 +88,7 @@ static char rcs_id[] = "$Id: hw_config.c,v 4.1 2000/12/11 09:54:19 cibrario Rel
 #include "debug.h"
 
 #define CHF_MODULE_ID MOD_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /*---------------------------------------------------------------------------
         Module description tables

src/keyb.c

@@ -98,7 +98,7 @@ static char rcs_id[] = "$Id: keyb.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $";
 #include "debug.h"
 
 #define CHF_MODULE_ID MOD_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 #define OUT_BITS 12
 

src/modules.c

@@ -128,7 +128,7 @@ static char rcs_id[] = "$Id: modules.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $"
 #include "debug.h"
 
 #define CHF_MODULE_ID MOD_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /*---------------------------------------------------------------------------
         Static/Global variables

src/monitor.c

@@ -83,7 +83,7 @@ static char rcs_id[] = "$Id: monitor.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $"
 #include "debug.h"
 
 #define CHF_MODULE_ID CPU_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /*---------------------------------------------------------------------------
         Macro & Data type definitions

src/pack.c

@@ -96,7 +96,7 @@ static char rcs_id[] = "$Id";
 #define UTIL_F_PACK_WRITE_NIBBLES 8
 
 #define CHF_MODULE_ID UTIL_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /* Maximum size of source ROM (bytes) handled by this utility; set to
    a reasonable value

src/romram.c

@@ -97,7 +97,7 @@ static char rcs_id[] = "$Id: romram.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $";
 #include "debug.h"
 
 #define CHF_MODULE_ID MOD_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /* 3.2: The rom/ram storage areas are now dynamically allocated in
    a private struct ModStatus_48. The dynamic allocation is performed during

src/romram49.c

@@ -110,7 +110,7 @@ static char rcs_id[] = "$Id: romram49.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $
 #include "debug.h"
 
 #define CHF_MODULE_ID MOD_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 #define FLASH_VIEW_SELECTOR 0x40000
 #define FLASH_BANK_MASK 0x3FFFF

src/serial.c

@@ -116,7 +116,7 @@ static char rcs_id[] = "$Id: serial.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $";
 #include "debug.h"
 
 #define CHF_MODULE_ID SERIAL_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /*---------------------------------------------------------------------------
         Determine pty implementation

src/x_func.c

@@ -107,7 +107,7 @@ static char rcs_id[] = "$Id: x_func.c,v 4.1 2000/12/11 09:54:19 cibrario Rel $";
 #include "debug.h"
 
 #define CHF_MODULE_ID X_FUNC_CHF_MODULE_ID
-#include <Chf.h>
+#include "libChf/src/Chf.h"
 
 /*---------------------------------------------------------------------------
         Private functions: CPU access