clean build and demo.

Makefile

@@ -1,23 +1,26 @@
 #
 # this is just a top-level makefile to build the simulator
 #
-all:
+
+all: src/usersim/sim
+
+src/usersim/sim src/tools/readall:
 	cd src ; make
 
-test: src/usersim/sim
-	cd src/usersim ; ./sim
+test: filesystem  src/usersim/sim
+	src/usersim/sim
 
-unpack:
-	cd src/tools; make
+filesystem: src/tools/readall
 	for i in disks/*.image ; do src/tools/readall -d filesystem $$i ; done
 	cp -r src/kernel filesystem/usr/src/sys
 
 clean:
-	for dir in usersim tools src/sgs src/fstools ; do \
+	for dir in src ; do \
 		(cd $$dir ; make clean) \
 	done
 
 clobber:
-	for dir in usersim tools src/sgs src/fstools ; do \
+	for dir in src ; do \
 		(cd $$dir ; make clobber) \
 	done
+	rm -rf filesystem

README.md

@@ -3,9 +3,23 @@ for a blast from the past, type:
  make test
 
  you now are running micronix 1.4 shell and can do a lot
+ including:
+
+	cd /usr/src/sys
+	make
+
+or, for a quite strange experience,
+
+    src/usersim/sim bin/man sh | less
+
+	(run the simulated z80 micronix man program on sh, and pipe it to linux less)
 
 ---------------------
 
+this document is obsolete, as I've changed the directory structure radically,
+with source code in src, and almost every work in progress thing moved to
+./extra
+
 Morrow Designs Micronix and tools
 
 directories:

src/Makefile

@@ -4,3 +4,15 @@ all:
 	for i in $(DIRS) ; do \
 		(cd $$i ; make ) ; \
 	done
+
+clean:
+	for i in $(DIRS) ; do \
+		(cd $$i ; make clean ) ; \
+	done
+
+clobber:
+	for i in $(DIRS) ; do \
+		(cd $$i ; make clobber ) ; \
+	done
+
+

src/usersim/Makefile

@@ -1,4 +1,4 @@
-INCLUDE = -I../../include -I../include
+INCLUDE = -I../include -I../kernel
 
 OBJECTS = z80emu.o micronix.o
 TARGETS = sim

src/usersim/micronix.c

@@ -40,7 +40,7 @@ typedef unsigned short UINT;
 static int do_exec(char *name, char **argv);
 static void emulate();
 
-#define	DEFROOT	"../../filesystem"
+#define	DEFROOT	"filesystem"
 
 int savemode;
 int debug_terminal;