mkfile: standalone build in place, fix clean target

Author: Noam Preil

mkfile

@@ -7,7 +7,6 @@ BIN=/$objtype/bin/
 JANET_CONFIG=JANET_SINGLE_THREADED JANET_NO_DYNAMIC_MODULES JANET_NO_THREADS JANET_OS_NAME=9front JANET_ARCH_NAME=$objtype JANET_BUILD="9front" JANET_API='' JANET_NO_RETURN='' JANET_NO_REALPATH JANET_NO_UTC_MKTIME JANET_SIMPLE_GETLINE JANET_NO_FFI JANET_REDUCED_OS JANET_64 JANET_NO_ASSEMBLER JANET_NO_NET JANET_NO_EV
 CFLAGS=-FTVBNcwp -D _POSIX_SOURCE -DJANET_PLAN9 -D_BSD_EXTENSION -D_LIMITS_EXTENSION -Isrc/include -Isrc/conf -I/sys/include/npe -Dtypestr=janettypestr -DJANET_API `{echo '-D'^$JANET_CONFIG}
 BOOT_CFLAGS=$CFLAGS -DJANET_BOOTSTRAP
-CLEANFILES=`{ls build/c/* build/boot/* build/core/* >[2]/dev/null}
 
 JANET_CORE_HEADERS=`{ls src/core/*.h}
 JANET_CORE_SOURCES=`{ls src/core/*.c}
@@ -19,32 +18,21 @@ JANET_BOOT_SOURCES=src/boot/array_test.c \
 				   src/boot/system_test.c \
 				   src/boot/table_test.c
 JANET_BOOT_HEADERS=src/boot/tests.h
-JANET_BOOT_OBJECTS=`{echo $JANET_CORE_SOURCES $JANET_BOOT_SOURCES | sed -e 's/\.c/.boot.o/g' -e 's$src/$build/$g'}
+JANET_BOOT_OBJECTS=`{echo $JANET_CORE_SOURCES $JANET_BOOT_SOURCES | sed -e 's/\.c/.boot.'$O'/g'}
 
-OFILES=build/janet.$O build/shell.$O
+OFILES=janet.$O src/mainclient/shell.$O
 
-build/%.boot.o: src/%.c $JANET_HEADERS $JANET_CORE_HEADERS $JANET_BOOT_HEADERS
+src/%.boot.$O: src/%.c $JANET_HEADERS $JANET_CORE_HEADERS $JANET_BOOT_HEADERS
 	$CC $BOOT_CFLAGS  -o $target $prereq(1)
 
-build/core/%.$O: build/core
-
-build/core:
-	mkdir -p build/core
-
-build/boot/%.$O: build/boot
-
-build/boot:
-	mkdir -p build/boot
+src/mainclient/shell.$O: src/mainclient/shell.c
+	$CC $BOOT_CFLAGS  -o $target $prereq(1)
 
-build/boot/$O.janet: $JANET_BOOT_OBJECTS
+$O.janetboot: $JANET_BOOT_OBJECTS
 	$LD $LDFLAGS -o $target $prereq
 
-build/c/janet.c: build/boot/$O.janet src/boot/boot.janet
-	build/boot/$O.janet . JANET_PATH $JANET_PATH >$target
-
-build/c/shell.c: src/mainclient/shell.c
-	cp $prereq $target
-
+janet.c: $O.janetboot src/boot/boot.janet
+	$prereq(1) . JANET_PATH $JANET_PATH >$target
 
 build/janet.$O: build/c/janet.c src/conf/janetconf.h src/include/janet.h
 	$CC $CFLAGS -D^$JANET_CONFIG -o $target $prereq(1)
@@ -53,3 +41,6 @@ build/shell.$O: src/mainclient/shell.c src/conf/janetconf.h src/include/janet.h
 	$CC $CFLAGS -D^$JANET_CONFIG -o $target $prereq(1)
 
 </sys/src/cmd/mkone
+
+clean:V:
+	rm -f src/core/*.[$OS] src/boot/*.[$OS] *.a[$OS] y.tab.? lex.yy.c y.debug y.output [$OS].??* $TARG janet.[$OS] janet.c src/mainclient/shell.[$OS]