aboutsummaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
Diffstat (limited to 'makefile')
-rw-r--r--makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/makefile b/makefile
index 9c2728c..f45d65a 100644
--- a/makefile
+++ b/makefile
@@ -35,19 +35,21 @@ $(CXX_OBJ): %.o : %.cc
libk/libk.a:
$(MAKE) -C libk libk.a
+libk/test:
+ $(MAKE) -C libk test
+test: libk/test
+
iso: glitch.elf
mkdir -p isodir/boot/grub
cp glitch.elf isodir/boot/glitch.elf
cp grub.cfg isodir/boot/grub/grub.cfg
grub-mkrescue -o myos.iso isodir
-run: glitch.elf
- qemu-system-i386 -kernel glitch.elf
-run-iso: iso
+run: iso
qemu-system-i386 -cdrom myos.iso
clean:
- rm boot.o $(CXX_OBJ) glitch.elf
+ rm -f boot.o $(CXX_OBJ) glitch.elf
$(MAKE) -C libk clean
clean-iso: