Merge pull request #84 from davidgiven/cleanup

Mechanical refactor to rearrange the source files into a more pleasing order.
davidgiven · Aug 6, 2019 · 28e0ef0 · 28e0ef0
2 parents e0256ad + 4b07c38
commit 28e0ef0
Show file tree

Hide file tree

Showing 35 changed files with 14 additions and 14 deletions.
diff --git 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 → arch/aeslanier/aeslanier.h b/lib/aeslanier/aeslanier.h → arch/aeslanier/aeslanier.h
diff --git a/lib/aeslanier/decoder.cc → arch/aeslanier/decoder.cc b/lib/aeslanier/decoder.cc → arch/aeslanier/decoder.cc
diff --git a/lib/amiga/amiga.h → arch/amiga/amiga.h b/lib/amiga/amiga.h → arch/amiga/amiga.h
diff --git a/lib/amiga/decoder.cc → arch/amiga/decoder.cc b/lib/amiga/decoder.cc → arch/amiga/decoder.cc
diff --git a/lib/apple2/apple2.h → arch/apple2/apple2.h b/lib/apple2/apple2.h → arch/apple2/apple2.h
diff --git a/lib/apple2/data_gcr.h → arch/apple2/data_gcr.h b/lib/apple2/data_gcr.h → arch/apple2/data_gcr.h
diff --git a/lib/apple2/decoder.cc → arch/apple2/decoder.cc b/lib/apple2/decoder.cc → arch/apple2/decoder.cc
diff --git a/lib/brother/brother.h → arch/brother/brother.h b/lib/brother/brother.h → arch/brother/brother.h
diff --git a/lib/brother/brotherdecode.h → arch/brother/brotherdecode.h b/lib/brother/brotherdecode.h → arch/brother/brotherdecode.h
diff --git a/lib/brother/data_gcr.h → arch/brother/data_gcr.h b/lib/brother/data_gcr.h → arch/brother/data_gcr.h
diff --git a/lib/brother/decoder.cc → arch/brother/decoder.cc b/lib/brother/decoder.cc → arch/brother/decoder.cc
diff --git a/lib/brother/encoder.cc → arch/brother/encoder.cc b/lib/brother/encoder.cc → arch/brother/encoder.cc
diff --git a/lib/brother/header_gcr.h → arch/brother/header_gcr.h b/lib/brother/header_gcr.h → arch/brother/header_gcr.h
diff --git a/lib/c64/c64.h → arch/c64/c64.h b/lib/c64/c64.h → arch/c64/c64.h
diff --git a/lib/c64/data_gcr.h → arch/c64/data_gcr.h b/lib/c64/data_gcr.h → arch/c64/data_gcr.h
diff --git a/lib/c64/decoder.cc → arch/c64/decoder.cc b/lib/c64/decoder.cc → arch/c64/decoder.cc
diff --git a/lib/f85/data_gcr.h → arch/f85/data_gcr.h b/lib/f85/data_gcr.h → arch/f85/data_gcr.h
diff --git a/lib/f85/decoder.cc → arch/f85/decoder.cc b/lib/f85/decoder.cc → arch/f85/decoder.cc
diff --git a/lib/f85/f85.h → arch/f85/f85.h b/lib/f85/f85.h → arch/f85/f85.h
diff --git a/lib/fb100/decoder.cc → arch/fb100/decoder.cc b/lib/fb100/decoder.cc → arch/fb100/decoder.cc
diff --git a/lib/fb100/fb100.h → arch/fb100/fb100.h b/lib/fb100/fb100.h → arch/fb100/fb100.h
diff --git a/lib/ibm/decoder.cc → arch/ibm/decoder.cc b/lib/ibm/decoder.cc → arch/ibm/decoder.cc
diff --git a/lib/ibm/ibm.h → arch/ibm/ibm.h b/lib/ibm/ibm.h → arch/ibm/ibm.h
diff --git a/lib/macintosh/data_gcr.h → arch/macintosh/data_gcr.h b/lib/macintosh/data_gcr.h → arch/macintosh/data_gcr.h
diff --git a/lib/macintosh/decoder.cc → arch/macintosh/decoder.cc b/lib/macintosh/decoder.cc → arch/macintosh/decoder.cc
diff --git a/lib/macintosh/macintosh.h → arch/macintosh/macintosh.h b/lib/macintosh/macintosh.h → arch/macintosh/macintosh.h
diff --git a/lib/mx/decoder.cc → arch/mx/decoder.cc b/lib/mx/decoder.cc → arch/mx/decoder.cc
diff --git a/lib/mx/mx.h → arch/mx/mx.h b/lib/mx/mx.h → arch/mx/mx.h
diff --git a/lib/victor9k/data_gcr.h → arch/victor9k/data_gcr.h b/lib/victor9k/data_gcr.h → arch/victor9k/data_gcr.h
diff --git a/lib/victor9k/decoder.cc → arch/victor9k/decoder.cc b/lib/victor9k/decoder.cc → arch/victor9k/decoder.cc
diff --git a/lib/victor9k/victor9k.h → arch/victor9k/victor9k.h b/lib/victor9k/victor9k.h → arch/victor9k/victor9k.h
diff --git a/lib/zilogmcz/decoder.cc → arch/zilogmcz/decoder.cc b/lib/zilogmcz/decoder.cc → arch/zilogmcz/decoder.cc
diff --git a/lib/zilogmcz/zilogmcz.h → arch/zilogmcz/zilogmcz.h b/lib/zilogmcz/zilogmcz.h → arch/zilogmcz/zilogmcz.h
diff --git a/mkninja.sh b/mkninja.sh
@@ -137,22 +137,27 @@ 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 \
     lib/decoders/decoders.cc \
     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 \