Revise makefile structure.

[pintos-anon] / src / Makefile.build

diff --git a/src/Makefile.build b/src/Makefile.build
index 3aa8a88ffa9d507931c36c90e7feeedbb15224da..1c92b77d2783b36e757626687b9fe06d5ca4c4b1 100644 (file)
--- a/src/Makefile.build
+++ b/src/Makefile.build
@@ -1,36 +1,14 @@
 # -*- makefile -*-
 
-include ../Makefile.vars
-
-SHELL = /bin/sh
-
-# Binary utilities.
-# If the host appears to be x86, use the normal tools.
-# Otherwise assume cross-tools are installed as i386-elf-*.
-X86 = i.86\|pentium.*\|[pk][56]\|nexgen\|viac3\|6x86\|athlon.*
-ifneq (0, $(shell expr `uname -m` : '$(X86)'))
-CC = gcc
-LD = ld
-OBJCOPY = objcopy
-else
-CC = i386-elf-gcc
-LD = i386-elf-ld
-OBJCOPY = i386-elf-objcopy
-endif
-
-# Other utilities.
-DD = dd
-RM = rm
-CAT = cat
+include ../Make.vars
+include ../../Make.config
 
 VPATH = ../..
 
 # 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
 
 # Core kernel.
 threads_SRC  = threads/init.c          # Main program.
@@ -39,7 +17,6 @@ threads_SRC += threads/switch.S               # Thread switch routine.
 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.
@@ -75,6 +52,7 @@ filesys_SRC += filesys/fsutil.c               # Utilities.
 
 # 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.
@@ -101,7 +79,7 @@ kernel.bin: kernel.o
        $(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 $@ $<
@@ -115,4 +93,7 @@ clean:
        $(RM) -f kernel.o kernel.lds.s
        $(RM) -f kernel.bin loader.bin
 
+Makefile: ../../Makefile.build
+       cp $< $@
+
 -include $(DEPENDS)