kernel: Makefile分離

Author: Yuma Arakawa

Makefile

@@ -1,64 +1,36 @@
+KERNEL_PATH = kernel
 CFLAGS	=	-Wall -Wextra
 CFLAGS	+=	-nostdinc -nostdlib -fno-builtin -c
-CFLAGS	+=	-Iinclude
+CFLAGS	+=	-Iinclude -I$(KERNEL_PATH)/include
 
-.s.o:
-	as -o $@ $<
-.S.o:
-	gcc $(CFLAGS) -o $@ $<
 .c.o:
 	gcc $(CFLAGS) -o $@ $<
 
 all: fd.img
 
-fd.img: boot/boot.bin sys.bin shell.bin uptime.bin
+fd.img: boot/boot.bin kernel/kernel.bin shell.bin uptime.bin
 	cat $+ > $@
 
 boot/boot.bin: FORCE
 	make -C boot
 
+kernel/kernel.bin: FORCE
+	make -C kernel
+
 shell.bin: apps/shell.o
 	ld -o $@ $< -Map apps/shell.map -s -T apps/app.ld -x
 
 uptime.bin: apps/uptime.o
 	ld -o $@ $< -Map apps/uptime.map -s -T apps/app.ld -x
 
-sys.bin: kernel/sys.o kernel/cpu.o kernel/intr.o kernel/excp.o kernel/memory.o kernel/sched.o kernel/timer.o kernel/console_io.o kernel/debug.o kernel/main.o kernel/kern_task_init.o apps/shell_init.o apps/uptime_init.o
-	ld -o $@ $+ -Map System.map -s -T kernel/sys.ld -x
-
-kernel/sys.o: kernel/sys.S
-
-kernel/cpu.o: kernel/cpu.c
-
-kernel/intr.o: kernel/intr.c
-
-kernel/excp.o: kernel/excp.c
-
-kernel/memory.o: kernel/memory.c
-
-kernel/sched.o: kernel/sched.c
-
-kernel/timer.o: kernel/timer.c
-
-kernel/console_io.o: kernel/console_io.c
-
-kernel/debug.o: kernel/debug.c
-
-kernel/main.o: kernel/main.c
-
-kernel/kern_task_init.o: kernel/kern_task_init.c
-
-apps/shell_init.o: apps/shell_init.c
-
-apps/uptime_init.o: apps/uptime_init.c
-
 apps/shell.o: apps/shell.c
 
 apps/uptime.o: apps/uptime.c
 
 clean:
 	make -C boot clean
-	rm -f *~ *.o *.bin *.dat *.img *.map include/*~ include/*.o kernel/*~ kernel/*.o apps/*~ apps/*.o
+	make -C kernel clean
+	rm -f *~ *.o *.bin *.dat *.img *.map include/*~ include/*.o apps/*~ apps/*.o
 
 run: fd.img
 	qemu -fda $<

apps/shell.c

@@ -1,6 +1,4 @@
-#include <shell.h>
 #include <io_port.h>
-#include <console_io.h>
 #include <kernel.h>
 
 #define MAX_LINE_SIZE	512

apps/uptime.c

@@ -1,8 +1,5 @@
-#include <uptime.h>
-#include <timer.h>
-#include <console_io.h>
 #include <kernel.h>
-#include <sched.h>
+#include <console_io.h>
 
 unsigned int syscall(unsigned int syscall_id, unsigned int arg1, unsigned int arg2, unsigned int arg3);
 

kernel/Makefile

@@ -0,0 +1,42 @@
+CFLAGS	=	-Wall -Wextra
+CFLAGS	+=	-nostdinc -nostdlib -fno-builtin -c
+CFLAGS	+=	-Iinclude
+
+.S.o:
+	gcc $(CFLAGS) -o $@ $<
+.c.o:
+	gcc $(CFLAGS) -o $@ $<
+
+kernel.bin: sys.o cpu.o intr.o excp.o memory.o sched.o timer.o console_io.o debug.o main.o kern_task_init.o shell_init.o uptime_init.o
+	ld -o $@ $+ -Map System.map -s -T sys.ld -x
+
+sys.o: sys.S
+
+cpu.o: cpu.c
+
+intr.o: intr.c
+
+excp.o: excp.c
+
+memory.o: memory.c
+
+sched.o: sched.c
+
+timer.o: timer.c
+
+console_io.o: console_io.c
+
+debug.o: debug.c
+
+main.o: main.c
+
+kern_task_init.o: kern_task_init.c
+
+shell_init.o: shell_init.c
+
+uptime_init.o: uptime_init.c
+
+clean:
+	rm -f *~ *.o *.bin *.dat *.img *.map
+
+.PHONY: clean

kernel/cpu.c

@@ -1,6 +1,6 @@
 #include <cpu.h>
-#include <shell.h>
-#include <uptime.h>
+#include <shell_init.h>
+#include <uptime_init.h>
 
 void init_gdt(unsigned int idx, unsigned int base, unsigned int limit)
 {