updated build process

Author: thecoder08

.github/workflows/build.yml

@@ -13,12 +13,6 @@ jobs:
 
       - name: Install NASM
         run: sudo apt install nasm -y
-
-      - name: Build Kernel
-        run: make kernel.elf
-
-      - name: Build Programs
-        run: cd programs && make && cd ..
 
       - name: Build Image
         run: make myos.img

Makefile

@@ -2,10 +2,10 @@ C_SRC = $(wildcard *.c)
 ASM_SRC = $(wildcard *.asm)
 OBJ = $(ASM_SRC:.asm=.o) $(C_SRC:.c=.o)
 
-run: kernel.elf
-	qemu-system-i386 --gdb tcp::1234 -m 4G -kernel $^
+run: myos.img
+	qemu-system-i386 --gdb tcp::1234 -m 4G -hda $^
 
-myos.img: kernel.elf grub.cfg myos.sfdisk programs/shell.bin programs/test.bin
+myos.img: kernel.elf grub.cfg myos.sfdisk pgms
 	dd if=/dev/zero of=$@ bs=1M count=10
 	cat myos.sfdisk | sfdisk $@
 	sudo losetup -P loop8 $@
@@ -19,14 +19,18 @@ myos.img: kernel.elf grub.cfg myos.sfdisk programs/shell.bin programs/test.bin
 	sudo losetup -d /dev/loop8
 	rmdir build
 
+pgms:
+	$(MAKE) -C programs
+
 kernel.elf: ${OBJ}
 	ld $^ -melf_i386 -e kmain -Ttext 0x0 -o $@
 
 %.o: %.asm
 	nasm -g -f elf32 $^
 
 %.o: %.c
-	gcc -ffreestanding -g -m32 -Wall -c $^ -mgeneral-regs-only -fno-pie
+	gcc -ffreestanding -g -m32 -Wall -c $^ -mgeneral-regs-only -fno-pie -fno-stack-protector
 
 clean:
 	rm -rf *.o *.elf *.img build
+	$(MAKE) -C programs clean