From 72f187357b86202001d7cb7b46abc269a5882746 Mon Sep 17 00:00:00 2001
From: Tom Everett <tom@khubla.com>
Date: Sun, 27 Oct 2019 19:24:21 -0400
Subject: [PATCH] unrefactored

---
 build/Makefile                    | 8 ++++----
 src/alt/{chrm => }/chrm.s         | 0
 src/alt/{init => }/init.s         | 0
 src/alt/{s2 => }/s2.s             | 0
 src/alt/{wktls => }/wktls.s       | 0
 src/alt/{wktmkdir => }/wktmkdir.s | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename src/alt/{chrm => }/chrm.s (100%)
 rename src/alt/{init => }/init.s (100%)
 rename src/alt/{s2 => }/s2.s (100%)
 rename src/alt/{wktls => }/wktls.s (100%)
 rename src/alt/{wktmkdir => }/wktmkdir.s (100%)

diff --git a/build/Makefile b/build/Makefile
index 32f9183..2fcf76a 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -58,9 +58,9 @@ a.out:
 # Alternative kernel: no dd, but . and ..
 alt/a.out:
 	$(AS) -f ptr -o alt/a.out $(SYSSRC)/sop.s $(SYSSRC)/s1.s \
-		$(ALTSRC)/s2/s2.s $(SYSSRC)/s[3-8].s
+		$(ALTSRC)/s2.s $(SYSSRC)/s[3-8].s
 	$(AS) -n -f list -o alt/a.lst $(SYSSRC)/sop.s $(SYSSRC)/s1.s \
-		$(ALTSRC)/s2/s2.s $(SYSSRC)/s[3-8].s
+		$(ALTSRC)/s2.s $(SYSSRC)/s[3-8].s
 
 # Phil's bootstrap code
 boot.rim: $(SYSSRC)/sop.s $(OTHERSRC)/pbboot.s
@@ -249,8 +249,8 @@ $(BINDIR)/ls: $(OTHERSRC)/wktls.s
 $(BINDIR)/lsd: $(OTHERSRC)/pblsd.s
 	$(AS) $(ASARGS) -o $(BINDIR)/lsd $(OTHERSRC)/pblsd.s
 
-$(BINDIR)/altls: $(ALTSRC)/wktls/wktls.s
-	$(AS) $(ASARGS) -o $(BINDIR)/altls $(ALTSRC)/wktls/wktls.s
+$(BINDIR)/altls: $(ALTSRC)/wktls.s
+	$(AS) $(ASARGS) -o $(BINDIR)/altls $(ALTSRC)/wktls.s
 
 $(BINDIR)/lsl: $(OTHERSRC)/pblsd.s
 	$(AS) $(ASARGS) -o $(BINDIR)/lsl $(OTHERSRC)/pblsd.s
diff --git a/src/alt/chrm/chrm.s b/src/alt/chrm.s
similarity index 100%
rename from src/alt/chrm/chrm.s
rename to src/alt/chrm.s
diff --git a/src/alt/init/init.s b/src/alt/init.s
similarity index 100%
rename from src/alt/init/init.s
rename to src/alt/init.s
diff --git a/src/alt/s2/s2.s b/src/alt/s2.s
similarity index 100%
rename from src/alt/s2/s2.s
rename to src/alt/s2.s
diff --git a/src/alt/wktls/wktls.s b/src/alt/wktls.s
similarity index 100%
rename from src/alt/wktls/wktls.s
rename to src/alt/wktls.s
diff --git a/src/alt/wktmkdir/wktmkdir.s b/src/alt/wktmkdir.s
similarity index 100%
rename from src/alt/wktmkdir/wktmkdir.s
rename to src/alt/wktmkdir.s