From 4b07c387822622be6ff9d5583f1cda5c8142226b Mon Sep 17 00:00:00 2001 From: David Given Date: Tue, 6 Aug 2019 22:25:11 +0200 Subject: [PATCH] Mechanical refactor to rearrange the source files into a more pleasing order. --- Makefile | 2 +- {lib => arch}/aeslanier/aeslanier.h | 0 {lib => arch}/aeslanier/decoder.cc | 0 {lib => arch}/amiga/amiga.h | 0 {lib => arch}/amiga/decoder.cc | 0 {lib => arch}/apple2/apple2.h | 0 {lib => arch}/apple2/data_gcr.h | 0 {lib => arch}/apple2/decoder.cc | 0 {lib => arch}/brother/brother.h | 0 {lib => arch}/brother/brotherdecode.h | 0 {lib => arch}/brother/data_gcr.h | 0 {lib => arch}/brother/decoder.cc | 0 {lib => arch}/brother/encoder.cc | 0 {lib => arch}/brother/header_gcr.h | 0 {lib => arch}/c64/c64.h | 0 {lib => arch}/c64/data_gcr.h | 0 {lib => arch}/c64/decoder.cc | 0 {lib => arch}/f85/data_gcr.h | 0 {lib => arch}/f85/decoder.cc | 0 {lib => arch}/f85/f85.h | 0 {lib => arch}/fb100/decoder.cc | 0 {lib => arch}/fb100/fb100.h | 0 {lib => arch}/ibm/decoder.cc | 0 {lib => arch}/ibm/ibm.h | 0 {lib => arch}/macintosh/data_gcr.h | 0 {lib => arch}/macintosh/decoder.cc | 0 {lib => arch}/macintosh/macintosh.h | 0 {lib => arch}/mx/decoder.cc | 0 {lib => arch}/mx/mx.h | 0 {lib => arch}/victor9k/data_gcr.h | 0 {lib => arch}/victor9k/decoder.cc | 0 {lib => arch}/victor9k/victor9k.h | 0 {lib => arch}/zilogmcz/decoder.cc | 0 {lib => arch}/zilogmcz/zilogmcz.h | 0 mkninja.sh | 26 +++++++++++++------------- 35 files changed, 14 insertions(+), 14 deletions(-) rename {lib => arch}/aeslanier/aeslanier.h (100%) rename {lib => arch}/aeslanier/decoder.cc (100%) rename {lib => arch}/amiga/amiga.h (100%) rename {lib => arch}/amiga/decoder.cc (100%) rename {lib => arch}/apple2/apple2.h (100%) rename {lib => arch}/apple2/data_gcr.h (100%) rename {lib => arch}/apple2/decoder.cc (100%) rename {lib => arch}/brother/brother.h (100%) rename {lib => arch}/brother/brotherdecode.h (100%) rename {lib => arch}/brother/data_gcr.h (100%) rename {lib => arch}/brother/decoder.cc (100%) rename {lib => arch}/brother/encoder.cc (100%) rename {lib => arch}/brother/header_gcr.h (100%) rename {lib => arch}/c64/c64.h (100%) rename {lib => arch}/c64/data_gcr.h (100%) rename {lib => arch}/c64/decoder.cc (100%) rename {lib => arch}/f85/data_gcr.h (100%) rename {lib => arch}/f85/decoder.cc (100%) rename {lib => arch}/f85/f85.h (100%) rename {lib => arch}/fb100/decoder.cc (100%) rename {lib => arch}/fb100/fb100.h (100%) rename {lib => arch}/ibm/decoder.cc (100%) rename {lib => arch}/ibm/ibm.h (100%) rename {lib => arch}/macintosh/data_gcr.h (100%) rename {lib => arch}/macintosh/decoder.cc (100%) rename {lib => arch}/macintosh/macintosh.h (100%) rename {lib => arch}/mx/decoder.cc (100%) rename {lib => arch}/mx/mx.h (100%) rename {lib => arch}/victor9k/data_gcr.h (100%) rename {lib => arch}/victor9k/decoder.cc (100%) rename {lib => arch}/victor9k/victor9k.h (100%) rename {lib => arch}/zilogmcz/decoder.cc (100%) rename {lib => arch}/zilogmcz/zilogmcz.h (100%) diff --git a/Makefile b/Makefile index 6e23dc15..57d31924 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ export LIBS = $(shell pkg-config --libs $(PACKAGES)) export EXTENSION = endif -CFLAGS += -Ilib -Idep/fmt +CFLAGS += -Ilib -Idep/fmt -Iarch export OBJDIR = .obj diff --git a/lib/aeslanier/aeslanier.h b/arch/aeslanier/aeslanier.h similarity index 100% rename from lib/aeslanier/aeslanier.h rename to arch/aeslanier/aeslanier.h diff --git a/lib/aeslanier/decoder.cc b/arch/aeslanier/decoder.cc similarity index 100% rename from lib/aeslanier/decoder.cc rename to arch/aeslanier/decoder.cc diff --git a/lib/amiga/amiga.h b/arch/amiga/amiga.h similarity index 100% rename from lib/amiga/amiga.h rename to arch/amiga/amiga.h diff --git a/lib/amiga/decoder.cc b/arch/amiga/decoder.cc similarity index 100% rename from lib/amiga/decoder.cc rename to arch/amiga/decoder.cc diff --git a/lib/apple2/apple2.h b/arch/apple2/apple2.h similarity index 100% rename from lib/apple2/apple2.h rename to arch/apple2/apple2.h diff --git a/lib/apple2/data_gcr.h b/arch/apple2/data_gcr.h similarity index 100% rename from lib/apple2/data_gcr.h rename to arch/apple2/data_gcr.h diff --git a/lib/apple2/decoder.cc b/arch/apple2/decoder.cc similarity index 100% rename from lib/apple2/decoder.cc rename to arch/apple2/decoder.cc diff --git a/lib/brother/brother.h b/arch/brother/brother.h similarity index 100% rename from lib/brother/brother.h rename to arch/brother/brother.h diff --git a/lib/brother/brotherdecode.h b/arch/brother/brotherdecode.h similarity index 100% rename from lib/brother/brotherdecode.h rename to arch/brother/brotherdecode.h diff --git a/lib/brother/data_gcr.h b/arch/brother/data_gcr.h similarity index 100% rename from lib/brother/data_gcr.h rename to arch/brother/data_gcr.h diff --git a/lib/brother/decoder.cc b/arch/brother/decoder.cc similarity index 100% rename from lib/brother/decoder.cc rename to arch/brother/decoder.cc diff --git a/lib/brother/encoder.cc b/arch/brother/encoder.cc similarity index 100% rename from lib/brother/encoder.cc rename to arch/brother/encoder.cc diff --git a/lib/brother/header_gcr.h b/arch/brother/header_gcr.h similarity index 100% rename from lib/brother/header_gcr.h rename to arch/brother/header_gcr.h diff --git a/lib/c64/c64.h b/arch/c64/c64.h similarity index 100% rename from lib/c64/c64.h rename to arch/c64/c64.h diff --git a/lib/c64/data_gcr.h b/arch/c64/data_gcr.h similarity index 100% rename from lib/c64/data_gcr.h rename to arch/c64/data_gcr.h diff --git a/lib/c64/decoder.cc b/arch/c64/decoder.cc similarity index 100% rename from lib/c64/decoder.cc rename to arch/c64/decoder.cc diff --git a/lib/f85/data_gcr.h b/arch/f85/data_gcr.h similarity index 100% rename from lib/f85/data_gcr.h rename to arch/f85/data_gcr.h diff --git a/lib/f85/decoder.cc b/arch/f85/decoder.cc similarity index 100% rename from lib/f85/decoder.cc rename to arch/f85/decoder.cc diff --git a/lib/f85/f85.h b/arch/f85/f85.h similarity index 100% rename from lib/f85/f85.h rename to arch/f85/f85.h diff --git a/lib/fb100/decoder.cc b/arch/fb100/decoder.cc similarity index 100% rename from lib/fb100/decoder.cc rename to arch/fb100/decoder.cc diff --git a/lib/fb100/fb100.h b/arch/fb100/fb100.h similarity index 100% rename from lib/fb100/fb100.h rename to arch/fb100/fb100.h diff --git a/lib/ibm/decoder.cc b/arch/ibm/decoder.cc similarity index 100% rename from lib/ibm/decoder.cc rename to arch/ibm/decoder.cc diff --git a/lib/ibm/ibm.h b/arch/ibm/ibm.h similarity index 100% rename from lib/ibm/ibm.h rename to arch/ibm/ibm.h diff --git a/lib/macintosh/data_gcr.h b/arch/macintosh/data_gcr.h similarity index 100% rename from lib/macintosh/data_gcr.h rename to arch/macintosh/data_gcr.h diff --git a/lib/macintosh/decoder.cc b/arch/macintosh/decoder.cc similarity index 100% rename from lib/macintosh/decoder.cc rename to arch/macintosh/decoder.cc diff --git a/lib/macintosh/macintosh.h b/arch/macintosh/macintosh.h similarity index 100% rename from lib/macintosh/macintosh.h rename to arch/macintosh/macintosh.h diff --git a/lib/mx/decoder.cc b/arch/mx/decoder.cc similarity index 100% rename from lib/mx/decoder.cc rename to arch/mx/decoder.cc diff --git a/lib/mx/mx.h b/arch/mx/mx.h similarity index 100% rename from lib/mx/mx.h rename to arch/mx/mx.h diff --git a/lib/victor9k/data_gcr.h b/arch/victor9k/data_gcr.h similarity index 100% rename from lib/victor9k/data_gcr.h rename to arch/victor9k/data_gcr.h diff --git a/lib/victor9k/decoder.cc b/arch/victor9k/decoder.cc similarity index 100% rename from lib/victor9k/decoder.cc rename to arch/victor9k/decoder.cc diff --git a/lib/victor9k/victor9k.h b/arch/victor9k/victor9k.h similarity index 100% rename from lib/victor9k/victor9k.h rename to arch/victor9k/victor9k.h diff --git a/lib/zilogmcz/decoder.cc b/arch/zilogmcz/decoder.cc similarity index 100% rename from lib/zilogmcz/decoder.cc rename to arch/zilogmcz/decoder.cc diff --git a/lib/zilogmcz/zilogmcz.h b/arch/zilogmcz/zilogmcz.h similarity index 100% rename from lib/zilogmcz/zilogmcz.h rename to arch/zilogmcz/zilogmcz.h diff --git a/mkninja.sh b/mkninja.sh index 33f4a2b6..d99a4019 100644 --- a/mkninja.sh +++ b/mkninja.sh @@ -137,13 +137,20 @@ buildlibrary libfmt.a \ dep/fmt/posix.cc \ buildlibrary libbackend.a \ - lib/aeslanier/decoder.cc \ - lib/amiga/decoder.cc \ - lib/apple2/decoder.cc \ - lib/brother/decoder.cc \ - lib/brother/encoder.cc \ + arch/aeslanier/decoder.cc \ + arch/amiga/decoder.cc \ + arch/apple2/decoder.cc \ + arch/brother/decoder.cc \ + arch/brother/encoder.cc \ + arch/c64/decoder.cc \ + arch/f85/decoder.cc \ + arch/fb100/decoder.cc \ + arch/ibm/decoder.cc \ + arch/macintosh/decoder.cc \ + arch/mx/decoder.cc \ + arch/victor9k/decoder.cc \ + arch/zilogmcz/decoder.cc \ lib/bytes.cc \ - lib/c64/decoder.cc \ lib/common/crunch.c \ lib/crc.cc \ lib/dataspec.cc \ @@ -151,8 +158,6 @@ buildlibrary libbackend.a \ lib/decoders/fluxmapreader.cc \ lib/decoders/fmmfm.cc \ lib/encoders/encoders.cc \ - lib/f85/decoder.cc \ - lib/fb100/decoder.cc \ lib/flags.cc \ lib/fluxmap.cc \ lib/fluxsink/fluxsink.cc \ @@ -165,18 +170,13 @@ buildlibrary libbackend.a \ lib/fluxsource/streamfluxsource.cc \ lib/globals.cc \ lib/hexdump.cc \ - lib/ibm/decoder.cc \ lib/image.cc \ - lib/macintosh/decoder.cc \ - lib/mx/decoder.cc \ lib/reader.cc \ lib/sector.cc \ lib/sectorset.cc \ lib/sql.cc \ lib/usb.cc \ - lib/victor9k/decoder.cc \ lib/writer.cc \ - lib/zilogmcz/decoder.cc \ buildlibrary libfrontend.a \ src/fe-cwftoflux.cc \