# Compiler and assembler options.
DEFINES += -DKERNEL
WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes
-INCLUDES = -nostdinc -I../.. -I- -I../../lib -I../../lib/kernel
-CFLAGS = -g -O3 -MMD -msoft-float $(INCLUDES) $(WARNINGS) $(DEFINES)
-ASFLAGS = -Wa,--gstabs -MMD $(INCLUDES) $(DEFINES)
+CPPFLAGS = -nostdinc -I../.. -I- -I../../lib -I../../lib/kernel \
+ -include constants.h
+CFLAGS = -g -O3 -MMD -msoft-float
+ASFLAGS = -Wa,--gstabs -MMD
# Core kernel.
threads_SRC = threads/init.c # Main program.
threads_SRC += threads/interrupt.c # Interrupt core.
threads_SRC += threads/intr-stubs.S # Interrupt stubs.
threads_SRC += threads/synch.c # Synchronization.
-threads_SRC += threads/paging.c # Page tables.
threads_SRC += threads/palloc.c # Page allocator.
threads_SRC += threads/malloc.c # Subpage allocator.
threads_SRC += threads/start.S # Startup code.
# User process code.
userprog_SRC = userprog/addrspace.c # Address spaces.
+userprog_SRC += userprog/pagedir.c # Page directories.
userprog_SRC += userprog/exception.c # User exception handler.
userprog_SRC += userprog/syscall.c # System call handler.
userprog_SRC += userprog/gdt.c # GDT initialization.
$(RM) $@.tmp
threads/loader.o: threads/loader.S kernel.bin
- $(CC) -c $< -o $@ $(ASFLAGS) -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
+ $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES) -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
loader.bin: threads/loader.o
$(LD) -N -e start -Ttext 0x7c00 --oformat binary -o $@ $<
$(RM) -f kernel.o kernel.lds.s
$(RM) -f kernel.bin loader.bin
+Makefile: ../../Makefile.build
+ cp $< $@
+
+%.o: %.c
+ $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES)
+
+%.o: %.S
+ $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES)
+
-include $(DEPENDS)