From cbf31fb45dc5545c72422baf6f032fe5da6f7f4c Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Tue, 26 Mar 2024 15:51:15 +0100 Subject: [PATCH] move libChf out of src/ --- .gitignore | 4 +-- Makefile | 38 ++++++++++++++--------------- {src/libChf => libChf}/Bugs | 0 {src/libChf => libChf}/Chf.h | 0 {src/libChf => libChf}/ChfPriv.h | 0 {src/libChf => libChf}/Makefile | 0 {src/libChf => libChf}/Makefile_def | 0 {src/libChf => libChf}/Makefile_sub | 0 {src/libChf => libChf}/chf.msf | 0 {src/libChf => libChf}/chf.rc | 0 {src/libChf => libChf}/chf.texi | 0 {src/libChf => libChf}/chf_abrt.c | 0 {src/libChf => libChf}/chf_gen.c | 0 {src/libChf => libChf}/chf_hdlr.c | 0 {src/libChf => libChf}/chf_init.c | 0 {src/libChf => libChf}/chf_msgc.c | 0 {src/libChf => libChf}/chf_sig.c | 0 {src/libChf => libChf}/chf_st.c | 0 {src/libChf => libChf}/chf_top.c | 0 {src/libChf => libChf}/chf_win32.c | 0 {src/libChf => libChf}/libChf.vcp | 0 {src/libChf => libChf}/resource.h | 0 {src/libChf => libChf}/test01.c | 0 {src/libChf => libChf}/test01.msf | 0 {src/libChf => libChf}/test02.c | 0 {src/libChf => libChf}/test03.c | 0 {src/libChf => libChf}/test04.c | 0 {src/libChf => libChf}/test05.c | 0 {src/libChf => libChf}/test06.c | 0 {src/libChf => libChf}/test07.c | 0 src/{ => MSFs}/cpu.msf | 0 src/{ => MSFs}/debug.msf | 0 src/{ => MSFs}/disk_io.msf | 0 src/{ => MSFs}/flash49.msf | 0 src/{ => MSFs}/modules.msf | 0 src/{ => MSFs}/saturn.msf | 0 src/{ => MSFs}/serial.msf | 0 src/{ => MSFs}/util.msf | 0 src/{ => MSFs}/x11.msf | 0 src/{ => MSFs}/x_func.msf | 0 40 files changed, 21 insertions(+), 21 deletions(-) rename {src/libChf => libChf}/Bugs (100%) rename {src/libChf => libChf}/Chf.h (100%) rename {src/libChf => libChf}/ChfPriv.h (100%) rename {src/libChf => libChf}/Makefile (100%) rename {src/libChf => libChf}/Makefile_def (100%) rename {src/libChf => libChf}/Makefile_sub (100%) rename {src/libChf => libChf}/chf.msf (100%) rename {src/libChf => libChf}/chf.rc (100%) rename {src/libChf => libChf}/chf.texi (100%) rename {src/libChf => libChf}/chf_abrt.c (100%) rename {src/libChf => libChf}/chf_gen.c (100%) rename {src/libChf => libChf}/chf_hdlr.c (100%) rename {src/libChf => libChf}/chf_init.c (100%) rename {src/libChf => libChf}/chf_msgc.c (100%) rename {src/libChf => libChf}/chf_sig.c (100%) rename {src/libChf => libChf}/chf_st.c (100%) rename {src/libChf => libChf}/chf_top.c (100%) rename {src/libChf => libChf}/chf_win32.c (100%) rename {src/libChf => libChf}/libChf.vcp (100%) rename {src/libChf => libChf}/resource.h (100%) rename {src/libChf => libChf}/test01.c (100%) rename {src/libChf => libChf}/test01.msf (100%) rename {src/libChf => libChf}/test02.c (100%) rename {src/libChf => libChf}/test03.c (100%) rename {src/libChf => libChf}/test04.c (100%) rename {src/libChf => libChf}/test05.c (100%) rename {src/libChf => libChf}/test06.c (100%) rename {src/libChf => libChf}/test07.c (100%) rename src/{ => MSFs}/cpu.msf (100%) rename src/{ => MSFs}/debug.msf (100%) rename src/{ => MSFs}/disk_io.msf (100%) rename src/{ => MSFs}/flash49.msf (100%) rename src/{ => MSFs}/modules.msf (100%) rename src/{ => MSFs}/saturn.msf (100%) rename src/{ => MSFs}/serial.msf (100%) rename src/{ => MSFs}/util.msf (100%) rename src/{ => MSFs}/x11.msf (100%) rename src/{ => MSFs}/x_func.msf (100%) diff --git a/.gitignore b/.gitignore index f224f3c..1ae936f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/src/libChf/mt_build/ -/src/libChf/st_build/ +/libChf/mt_build/ +/libChf/st_build/ /src/*.o manual/saturn.toc manual/saturn.aux diff --git a/Makefile b/Makefile index 29f7db2..2250960 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ CC ?= gcc OPTIM ?= 2 -CFLAGS = -g -O$(OPTIM) -I./src/ -D_GNU_SOURCE=1 -I./src/libChf -L./src/libChf/st_build -lutil +CFLAGS = -g -O$(OPTIM) -I./src/ -D_GNU_SOURCE=1 -I./libChf -L./libChf/st_build -lutil LIBS = -lm -lChf -lXm X11CFLAGS = $(shell pkg-config --cflags x11 xext) -D_GNU_SOURCE=1 @@ -40,30 +40,30 @@ DOTOS = src/cpu.o \ src/x11.o \ src/x_func.o -MSFS= src/debug.msf \ - src/cpu.msf \ - src/modules.msf \ - src/disk_io.msf \ - src/x11.msf \ - src/serial.msf \ - src/flash49.msf \ - src/x_func.msf \ - src/saturn.msf \ - src/util.msf \ - src/libChf/chf.msf +MSFS= src/MSFs/debug.msf \ + src/MSFs/cpu.msf \ + src/MSFs/modules.msf \ + src/MSFs/disk_io.msf \ + src/MSFs/x11.msf \ + src/MSFs/serial.msf \ + src/MSFs/flash49.msf \ + src/MSFs/x_func.msf \ + src/MSFs/saturn.msf \ + src/MSFs/util.msf \ + libChf/chf.msf .PHONY: all clean clean-all pretty-code install mrproper get-roms -all: src/libChf/st_build/libChf.a dist/saturn dist/pack dist/saturn.cat manual +all: libChf/st_build/libChf.a dist/saturn dist/pack dist/saturn.cat manual # Building -src/libChf/st_build/libChf.a: - make -C src/libChf +libChf/st_build/libChf.a: + make -C libChf -dist/saturn: $(DOTOS) src/libChf/st_build/libChf.a +dist/saturn: $(DOTOS) libChf/st_build/libChf.a $(CC) $^ -o $@ $(CFLAGS) $(LIBS) -dist/pack: src/pack.o src/disk_io.o src/debug.o src/libChf/st_build/libChf.a +dist/pack: src/pack.o src/disk_io.o src/debug.o libChf/st_build/libChf.a $(CC) $^ -o $@ $(CFLAGS) $(LIBS) dist/saturn.cat: $(MSFS) @@ -77,7 +77,7 @@ manual: # Cleaning clean: rm -f src/*.o - make -C src/libChf clean + make -C libChf clean make -C manual clean mrproper: clean @@ -87,7 +87,7 @@ clean-all: mrproper # Formatting pretty-code: - clang-format -i src/*.c src/*.h src/libChf/*.c src/libChf/*.h + clang-format -i src/*.c src/*.h libChf/*.c libChf/*.h # Dependencies get-roms: diff --git a/src/libChf/Bugs b/libChf/Bugs similarity index 100% rename from src/libChf/Bugs rename to libChf/Bugs diff --git a/src/libChf/Chf.h b/libChf/Chf.h similarity index 100% rename from src/libChf/Chf.h rename to libChf/Chf.h diff --git a/src/libChf/ChfPriv.h b/libChf/ChfPriv.h similarity index 100% rename from src/libChf/ChfPriv.h rename to libChf/ChfPriv.h diff --git a/src/libChf/Makefile b/libChf/Makefile similarity index 100% rename from src/libChf/Makefile rename to libChf/Makefile diff --git a/src/libChf/Makefile_def b/libChf/Makefile_def similarity index 100% rename from src/libChf/Makefile_def rename to libChf/Makefile_def diff --git a/src/libChf/Makefile_sub b/libChf/Makefile_sub similarity index 100% rename from src/libChf/Makefile_sub rename to libChf/Makefile_sub diff --git a/src/libChf/chf.msf b/libChf/chf.msf similarity index 100% rename from src/libChf/chf.msf rename to libChf/chf.msf diff --git a/src/libChf/chf.rc b/libChf/chf.rc similarity index 100% rename from src/libChf/chf.rc rename to libChf/chf.rc diff --git a/src/libChf/chf.texi b/libChf/chf.texi similarity index 100% rename from src/libChf/chf.texi rename to libChf/chf.texi diff --git a/src/libChf/chf_abrt.c b/libChf/chf_abrt.c similarity index 100% rename from src/libChf/chf_abrt.c rename to libChf/chf_abrt.c diff --git a/src/libChf/chf_gen.c b/libChf/chf_gen.c similarity index 100% rename from src/libChf/chf_gen.c rename to libChf/chf_gen.c diff --git a/src/libChf/chf_hdlr.c b/libChf/chf_hdlr.c similarity index 100% rename from src/libChf/chf_hdlr.c rename to libChf/chf_hdlr.c diff --git a/src/libChf/chf_init.c b/libChf/chf_init.c similarity index 100% rename from src/libChf/chf_init.c rename to libChf/chf_init.c diff --git a/src/libChf/chf_msgc.c b/libChf/chf_msgc.c similarity index 100% rename from src/libChf/chf_msgc.c rename to libChf/chf_msgc.c diff --git a/src/libChf/chf_sig.c b/libChf/chf_sig.c similarity index 100% rename from src/libChf/chf_sig.c rename to libChf/chf_sig.c diff --git a/src/libChf/chf_st.c b/libChf/chf_st.c similarity index 100% rename from src/libChf/chf_st.c rename to libChf/chf_st.c diff --git a/src/libChf/chf_top.c b/libChf/chf_top.c similarity index 100% rename from src/libChf/chf_top.c rename to libChf/chf_top.c diff --git a/src/libChf/chf_win32.c b/libChf/chf_win32.c similarity index 100% rename from src/libChf/chf_win32.c rename to libChf/chf_win32.c diff --git a/src/libChf/libChf.vcp b/libChf/libChf.vcp similarity index 100% rename from src/libChf/libChf.vcp rename to libChf/libChf.vcp diff --git a/src/libChf/resource.h b/libChf/resource.h similarity index 100% rename from src/libChf/resource.h rename to libChf/resource.h diff --git a/src/libChf/test01.c b/libChf/test01.c similarity index 100% rename from src/libChf/test01.c rename to libChf/test01.c diff --git a/src/libChf/test01.msf b/libChf/test01.msf similarity index 100% rename from src/libChf/test01.msf rename to libChf/test01.msf diff --git a/src/libChf/test02.c b/libChf/test02.c similarity index 100% rename from src/libChf/test02.c rename to libChf/test02.c diff --git a/src/libChf/test03.c b/libChf/test03.c similarity index 100% rename from src/libChf/test03.c rename to libChf/test03.c diff --git a/src/libChf/test04.c b/libChf/test04.c similarity index 100% rename from src/libChf/test04.c rename to libChf/test04.c diff --git a/src/libChf/test05.c b/libChf/test05.c similarity index 100% rename from src/libChf/test05.c rename to libChf/test05.c diff --git a/src/libChf/test06.c b/libChf/test06.c similarity index 100% rename from src/libChf/test06.c rename to libChf/test06.c diff --git a/src/libChf/test07.c b/libChf/test07.c similarity index 100% rename from src/libChf/test07.c rename to libChf/test07.c diff --git a/src/cpu.msf b/src/MSFs/cpu.msf similarity index 100% rename from src/cpu.msf rename to src/MSFs/cpu.msf diff --git a/src/debug.msf b/src/MSFs/debug.msf similarity index 100% rename from src/debug.msf rename to src/MSFs/debug.msf diff --git a/src/disk_io.msf b/src/MSFs/disk_io.msf similarity index 100% rename from src/disk_io.msf rename to src/MSFs/disk_io.msf diff --git a/src/flash49.msf b/src/MSFs/flash49.msf similarity index 100% rename from src/flash49.msf rename to src/MSFs/flash49.msf diff --git a/src/modules.msf b/src/MSFs/modules.msf similarity index 100% rename from src/modules.msf rename to src/MSFs/modules.msf diff --git a/src/saturn.msf b/src/MSFs/saturn.msf similarity index 100% rename from src/saturn.msf rename to src/MSFs/saturn.msf diff --git a/src/serial.msf b/src/MSFs/serial.msf similarity index 100% rename from src/serial.msf rename to src/MSFs/serial.msf diff --git a/src/util.msf b/src/MSFs/util.msf similarity index 100% rename from src/util.msf rename to src/MSFs/util.msf diff --git a/src/x11.msf b/src/MSFs/x11.msf similarity index 100% rename from src/x11.msf rename to src/MSFs/x11.msf diff --git a/src/x_func.msf b/src/MSFs/x_func.msf similarity index 100% rename from src/x_func.msf rename to src/MSFs/x_func.msf