@@ -12,6 +12,7 @@ clobber: clean clean: -rm -f cleese.img $(MAKE) -C hello_world clean + $(MAKE) -C oneplusone clean $(MAKE) -C echo clean grub.img: boot/grub/stage1 boot/grub/stage2 @@ -20,6 +21,9 @@ grub.img: boot/grub/stage1 boot/grub/stage2 hello_world/KERNEL.BIN: $(MAKE) -C hello_world +oneplusone/KERNEL.BIN: + $(MAKE) -C oneplusone + echo/KERNEL.BIN: $(MAKE) -C echo @@ -32,12 +36,13 @@ empty-disk: umount -f ./mnt rm -r ./mnt -cleese.img: empty.img hello_world/KERNEL.BIN echo/KERNEL.BIN menu.lst +cleese.img: empty.img hello_world/KERNEL.BIN oneplusone/KERNEL.BIN echo/KERNEL.BIN menu.lst cp empty.img cleese.img mkdir -p mnt mount_msdos -o nosync `hdid -nomount cleese.img` ./mnt cp menu.lst ./mnt/boot/grub cp hello_world/KERNEL.BIN ./mnt/hello_world.bin + cp oneplusone/KERNEL.BIN ./mnt/oneplusone.bin cp echo/KERNEL.BIN ./mnt/echo.bin umount -f ./mnt rm -r ./mnt Makefile @@ -5,3 +5,7 @@ title Hello World title Echo root (fd0) kernel /echo.bin + +title One plus one + root (fd0) + kernel /oneplusone.bin menu.lst 00289980c900ed5cb8937f278321f343eb26e194 James Tauber jtauber@jtauber.com http://github.com/jtauber/cleese/commit/d989be4e21a541bc9bcacf10ec87d2719e7c1721 d989be4e21a541bc9bcacf10ec87d2719e7c1721 2009-10-11T00:01:36-07:00 2009-10-11T00:01:36-07:00 hooked up oneplusone to main makefile and menu.lst c21be895d4f7f9976045ff991b797165ce5adf9c James Tauber jtauber@jtauber.com