X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.build;h=1c92b77d2783b36e757626687b9fe06d5ca4c4b1;hb=d46fd132092304422193b717d9a60641604cc1b5;hp=f6eb9c46cf0e610259f55cf1b50f2c1bcb389c67;hpb=ec904f0c2c0732292965a1240b5651dc25fff026;p=pintos-anon

diff --git a/src/Makefile.build b/src/Makefile.build
index f6eb9c4..1c92b77 100644
--- a/src/Makefile.build
+++ b/src/Makefile.build
@@ -1,37 +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
 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.
@@ -40,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.
@@ -76,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.
@@ -119,10 +96,4 @@ clean:
 Makefile: ../../Makefile.build
 	cp $< $@
 
-%.o: %.c
-	$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES)
-
-%.o: %.S
-	$(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES)
-
 -include $(DEPENDS)