summaryrefslogtreecommitdiff
path: root/kernel/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile5
1 files changed, 4 insertions, 1 deletions
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 $^