From a4ea0b14840ef5946408a3893f3f1c92ed57ae80 Mon Sep 17 00:00:00 2001
From: Jake Mannens <jake72360@gmail.com>
Date: Wed, 20 Jun 2018 04:39:25 +1000
Subject: Added a very basic types.h header file that defines NULL, size_t and
 time_t. Moved the kernel's loading point down to address 0 in conventional
 memory and updated linker scripts accordingly. Began to experiment with
 loading a binary blob into extended memory (0x100000), switching to userspace
 mode, and executing it.

---
 kernel/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'kernel/Makefile')

diff --git a/kernel/Makefile b/kernel/Makefile
index 0f3ac41..3427449 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -2,7 +2,7 @@ TARGET = kernel
 
 SRCS = $(wildcard *.c)
 ASMS = $(wildcard *.s)
-OBJS = $(SRCS:.c=.o) $(ASMS:.s=.o)
+OBJS = $(SRCS:.c=.o) $(ASMS:.s=.o) usrbin/usrbin.o
 
 CFLAGS = -m32 -I../include -ffreestanding -nostdinc -nostdlib -fno-stack-protector -gstabs+
 LDFLAGS = -m elf_i386 -Tlink.ld
@@ -16,6 +16,9 @@ all: build
 
 build: $(TARGET)
 
+usrbin/usrbin.o: usrbin/usrbin.s
+	make -C usrbin
+
 .s.o:
 	$(ASM) -o $*.o $^
 
-- 
cgit v1.3