From 499ca6c243b05da176a2d4bd9a2317f0b28afc7f Mon Sep 17 00:00:00 2001 From: Alex AUVOLAT Date: Sat, 19 May 2012 11:45:49 +0200 Subject: Introducing FWIK, the userland C++ framework. Far from complete. --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index db4d827..01b6062 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: clean, mrproper, Init.rfs, floppy, commit -Projects = tools/makeinitrd kernel user/lib user/init user/test user/yosh +Projects = tools/makeinitrd kernel user/lib/libc user/lib/fwik user/app/init user/app/test user/app/yosh user/app/prime QemuCmd = qemu-system-i386 BasePath = $(shell pwd) @@ -36,19 +36,20 @@ commit: mrproper git commit -a; exit 0 git push origin -$(Cdrom): menu_cdrom.lst src/kernel/kernel.elf src/user/test/test.elf src/user/init/init.elf src/user/yosh/yosh.elf +$(Cdrom): menu_cdrom.lst src/kernel/kernel.elf src/user/app/test/test.elf src/user/app/init/init.elf src/user/app/yosh/yosh.elf src/user/app/prime/prime.elf mkdir -p cdrom/boot/grub if [ ! -e cdrom/boot/grub/stage2_eltorito ]; then \ echo "Please copy grub's stage2_eltorito to cdrom/boot/grub."; \ exit -1; \ fi src/tools/makeinitrd/makeinitrd cdrom/initrd \ - src/user/test/test.elf:/bin/test \ - src/user/yosh/yosh.elf:/bin/yosh \ + src/user/app/test/test.elf:/bin/test \ + src/user/app/yosh/yosh.elf:/bin/yosh \ + src/user/app/prime/prime.elf:/bin/prime \ README:/readme cp menu_cdrom.lst cdrom/boot/grub/menu.lst cp src/kernel/kernel.elf cdrom - cp src/user/init/init.elf cdrom + cp src/user/app/init/init.elf cdrom genisoimage -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 \ -boot-info-table -input-charset ascii -A TCE -o $(Cdrom) cdrom -- cgit v1.2.3