From 06cbb9961e2810da416fa63579f83df5d055f3c0 Mon Sep 17 00:00:00 2001
From: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
Date: Fri, 27 Sep 2024 10:01:51 +0200
Subject: [PATCH] move libChf under src/

---
 Makefile                                | 24 ++++++++++++------------
 src/___x11.c                            |  2 +-
 src/___x11_lcd.c                        |  2 +-
 src/___x11_main.c                       |  2 +-
 src/chf_messages.h                      |  2 +-
 src/cpu.c                               |  2 +-
 src/debug.c                             |  2 +-
 src/dis.c                               |  2 +-
 src/disk_io.c                           |  2 +-
 src/disk_io_obj.c                       |  2 +-
 src/emulator.c                          |  2 +-
 src/flash49.c                           |  2 +-
 src/hdw.c                               |  2 +-
 src/hw_config.c                         |  2 +-
 src/keyb.c                              |  2 +-
 {libChf => src/libChf}/.clang-format    |  0
 {libChf => src/libChf}/Bugs             |  0
 {libChf => src/libChf}/Makefile         |  0
 {libChf => src/libChf}/docs/Makefile    |  0
 {libChf => src/libChf}/docs/chf.texi    |  0
 {libChf => src/libChf}/src/Chf.h        |  0
 {libChf => src/libChf}/src/ChfPriv.h    |  0
 {libChf => src/libChf}/src/chf.msf      |  0
 {libChf => src/libChf}/src/chf_abrt.c   |  0
 {libChf => src/libChf}/src/chf_gen.c    |  0
 {libChf => src/libChf}/src/chf_hdlr.c   |  0
 {libChf => src/libChf}/src/chf_init.c   |  0
 {libChf => src/libChf}/src/chf_msgc.c   |  0
 {libChf => src/libChf}/src/chf_sig.c    |  0
 {libChf => src/libChf}/src/chf_st.c     |  0
 {libChf => src/libChf}/src/chf_top.c    |  0
 {libChf => src/libChf}/tests/chf.msf    |  0
 {libChf => src/libChf}/tests/test01.c   |  0
 {libChf => src/libChf}/tests/test01.msf |  0
 {libChf => src/libChf}/tests/test02.c   |  0
 {libChf => src/libChf}/tests/test03.c   |  0
 {libChf => src/libChf}/tests/test04.c   |  0
 {libChf => src/libChf}/tests/test05.c   |  0
 {libChf => src/libChf}/tests/test06.c   |  0
 {libChf => src/libChf}/tests/test07.c   |  0
 src/modules.c                           |  2 +-
 src/monitor.c                           |  2 +-
 src/pack.c                              |  2 +-
 src/romram.c                            |  2 +-
 src/romram49.c                          |  2 +-
 src/serial.c                            |  2 +-
 src/x_func.c                            |  2 +-
 47 files changed, 33 insertions(+), 33 deletions(-)
 rename {libChf => src/libChf}/.clang-format (100%)
 rename {libChf => src/libChf}/Bugs (100%)
 rename {libChf => src/libChf}/Makefile (100%)
 rename {libChf => src/libChf}/docs/Makefile (100%)
 rename {libChf => src/libChf}/docs/chf.texi (100%)
 rename {libChf => src/libChf}/src/Chf.h (100%)
 rename {libChf => src/libChf}/src/ChfPriv.h (100%)
 rename {libChf => src/libChf}/src/chf.msf (100%)
 rename {libChf => src/libChf}/src/chf_abrt.c (100%)
 rename {libChf => src/libChf}/src/chf_gen.c (100%)
 rename {libChf => src/libChf}/src/chf_hdlr.c (100%)
 rename {libChf => src/libChf}/src/chf_init.c (100%)
 rename {libChf => src/libChf}/src/chf_msgc.c (100%)
 rename {libChf => src/libChf}/src/chf_sig.c (100%)
 rename {libChf => src/libChf}/src/chf_st.c (100%)
 rename {libChf => src/libChf}/src/chf_top.c (100%)
 rename {libChf => src/libChf}/tests/chf.msf (100%)
 rename {libChf => src/libChf}/tests/test01.c (100%)
 rename {libChf => src/libChf}/tests/test01.msf (100%)
 rename {libChf => src/libChf}/tests/test02.c (100%)
 rename {libChf => src/libChf}/tests/test03.c (100%)
 rename {libChf => src/libChf}/tests/test04.c (100%)
 rename {libChf => src/libChf}/tests/test05.c (100%)
 rename {libChf => src/libChf}/tests/test06.c (100%)
 rename {libChf => src/libChf}/tests/test07.c (100%)

diff --git a/Makefile b/Makefile
index 9817612..d46e21a 100644
--- a/Makefile
+++ b/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:
-	make -C libChf
+src/libChf/libChf.a:
+	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
diff --git a/src/___x11.c b/src/___x11.c
index 4964915..f79d809 100644
--- a/src/___x11.c
+++ b/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
diff --git a/src/___x11_lcd.c b/src/___x11_lcd.c
index 0e77c6c..7946135 100644
--- a/src/___x11_lcd.c
+++ b/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 */
diff --git a/src/___x11_main.c b/src/___x11_main.c
index 4de836c..4d825e9 100644
--- a/src/___x11_main.c
+++ b/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
diff --git a/src/chf_messages.h b/src/chf_messages.h
index 5503cb1..8df11db 100644
--- a/src/chf_messages.h
+++ b/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:
diff --git a/src/cpu.c b/src/cpu.c
index 38f7975..94421d8 100644
--- a/src/cpu.c
+++ b/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
 
diff --git a/src/debug.c b/src/debug.c
index a6977c7..5422f7c 100644
--- a/src/debug.c
+++ b/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
diff --git a/src/dis.c b/src/dis.c
index 7e593f3..475ce8d 100644
--- a/src/dis.c
+++ b/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
diff --git a/src/disk_io.c b/src/disk_io.c
index 1fbcd94..5edc731 100644
--- a/src/disk_io.c
+++ b/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"
 
 /* .+
 
diff --git a/src/disk_io_obj.c b/src/disk_io_obj.c
index 62846b4..04ed5fe 100644
--- a/src/disk_io_obj.c
+++ b/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"
 
 /* .+
 
diff --git a/src/emulator.c b/src/emulator.c
index f45c607..16e6b37 100644
--- a/src/emulator.c
+++ b/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
diff --git a/src/flash49.c b/src/flash49.c
index 21cecf3..7f1054f 100644
--- a/src/flash49.c
+++ b/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
diff --git a/src/hdw.c b/src/hdw.c
index 7a51aa5..5555b48 100644
--- a/src/hdw.c
+++ b/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 };
 
diff --git a/src/hw_config.c b/src/hw_config.c
index 5059466..0110103 100644
--- a/src/hw_config.c
+++ b/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
diff --git a/src/keyb.c b/src/keyb.c
index 9beb030..4444aa2 100644
--- a/src/keyb.c
+++ b/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
 
diff --git a/libChf/.clang-format b/src/libChf/.clang-format
similarity index 100%
rename from libChf/.clang-format
rename to src/libChf/.clang-format
diff --git a/libChf/Bugs b/src/libChf/Bugs
similarity index 100%
rename from libChf/Bugs
rename to src/libChf/Bugs
diff --git a/libChf/Makefile b/src/libChf/Makefile
similarity index 100%
rename from libChf/Makefile
rename to src/libChf/Makefile
diff --git a/libChf/docs/Makefile b/src/libChf/docs/Makefile
similarity index 100%
rename from libChf/docs/Makefile
rename to src/libChf/docs/Makefile
diff --git a/libChf/docs/chf.texi b/src/libChf/docs/chf.texi
similarity index 100%
rename from libChf/docs/chf.texi
rename to src/libChf/docs/chf.texi
diff --git a/libChf/src/Chf.h b/src/libChf/src/Chf.h
similarity index 100%
rename from libChf/src/Chf.h
rename to src/libChf/src/Chf.h
diff --git a/libChf/src/ChfPriv.h b/src/libChf/src/ChfPriv.h
similarity index 100%
rename from libChf/src/ChfPriv.h
rename to src/libChf/src/ChfPriv.h
diff --git a/libChf/src/chf.msf b/src/libChf/src/chf.msf
similarity index 100%
rename from libChf/src/chf.msf
rename to src/libChf/src/chf.msf
diff --git a/libChf/src/chf_abrt.c b/src/libChf/src/chf_abrt.c
similarity index 100%
rename from libChf/src/chf_abrt.c
rename to src/libChf/src/chf_abrt.c
diff --git a/libChf/src/chf_gen.c b/src/libChf/src/chf_gen.c
similarity index 100%
rename from libChf/src/chf_gen.c
rename to src/libChf/src/chf_gen.c
diff --git a/libChf/src/chf_hdlr.c b/src/libChf/src/chf_hdlr.c
similarity index 100%
rename from libChf/src/chf_hdlr.c
rename to src/libChf/src/chf_hdlr.c
diff --git a/libChf/src/chf_init.c b/src/libChf/src/chf_init.c
similarity index 100%
rename from libChf/src/chf_init.c
rename to src/libChf/src/chf_init.c
diff --git a/libChf/src/chf_msgc.c b/src/libChf/src/chf_msgc.c
similarity index 100%
rename from libChf/src/chf_msgc.c
rename to src/libChf/src/chf_msgc.c
diff --git a/libChf/src/chf_sig.c b/src/libChf/src/chf_sig.c
similarity index 100%
rename from libChf/src/chf_sig.c
rename to src/libChf/src/chf_sig.c
diff --git a/libChf/src/chf_st.c b/src/libChf/src/chf_st.c
similarity index 100%
rename from libChf/src/chf_st.c
rename to src/libChf/src/chf_st.c
diff --git a/libChf/src/chf_top.c b/src/libChf/src/chf_top.c
similarity index 100%
rename from libChf/src/chf_top.c
rename to src/libChf/src/chf_top.c
diff --git a/libChf/tests/chf.msf b/src/libChf/tests/chf.msf
similarity index 100%
rename from libChf/tests/chf.msf
rename to src/libChf/tests/chf.msf
diff --git a/libChf/tests/test01.c b/src/libChf/tests/test01.c
similarity index 100%
rename from libChf/tests/test01.c
rename to src/libChf/tests/test01.c
diff --git a/libChf/tests/test01.msf b/src/libChf/tests/test01.msf
similarity index 100%
rename from libChf/tests/test01.msf
rename to src/libChf/tests/test01.msf
diff --git a/libChf/tests/test02.c b/src/libChf/tests/test02.c
similarity index 100%
rename from libChf/tests/test02.c
rename to src/libChf/tests/test02.c
diff --git a/libChf/tests/test03.c b/src/libChf/tests/test03.c
similarity index 100%
rename from libChf/tests/test03.c
rename to src/libChf/tests/test03.c
diff --git a/libChf/tests/test04.c b/src/libChf/tests/test04.c
similarity index 100%
rename from libChf/tests/test04.c
rename to src/libChf/tests/test04.c
diff --git a/libChf/tests/test05.c b/src/libChf/tests/test05.c
similarity index 100%
rename from libChf/tests/test05.c
rename to src/libChf/tests/test05.c
diff --git a/libChf/tests/test06.c b/src/libChf/tests/test06.c
similarity index 100%
rename from libChf/tests/test06.c
rename to src/libChf/tests/test06.c
diff --git a/libChf/tests/test07.c b/src/libChf/tests/test07.c
similarity index 100%
rename from libChf/tests/test07.c
rename to src/libChf/tests/test07.c
diff --git a/src/modules.c b/src/modules.c
index f78ac7d..b9aad71 100644
--- a/src/modules.c
+++ b/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
diff --git a/src/monitor.c b/src/monitor.c
index 761ce72..9c6bb8e 100644
--- a/src/monitor.c
+++ b/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
diff --git a/src/pack.c b/src/pack.c
index 8a235ed..9ab542b 100644
--- a/src/pack.c
+++ b/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
diff --git a/src/romram.c b/src/romram.c
index e23e46d..522a78e 100644
--- a/src/romram.c
+++ b/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
diff --git a/src/romram49.c b/src/romram49.c
index 9937858..e4f329e 100644
--- a/src/romram49.c
+++ b/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
diff --git a/src/serial.c b/src/serial.c
index 9da8538..1e99b44 100644
--- a/src/serial.c
+++ b/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
diff --git a/src/x_func.c b/src/x_func.c
index 75b7920..723fa7a 100644
--- a/src/x_func.c
+++ b/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