X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.build;h=e124011ac646210885fc7c311080ede3e6bfd3d3;hb=59385cfe7f0fc5a66dfc1da7c2e5b817edbcae65;hp=8a7348590772227fc466643b433e39796b2106b7;hpb=b0a700d18f0a0a8c87e1a4fff3a2108e0edb0fbc;p=pintos-anon

diff --git a/src/Makefile.build b/src/Makefile.build
index 8a73485..e124011 100644
--- a/src/Makefile.build
+++ b/src/Makefile.build
@@ -1,37 +1,13 @@
 # -*- 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
+CPPFLAGS = -nostdinc -I../.. -I- -I../../lib -I../../lib/kernel
 
 # Core kernel.
 threads_SRC  = threads/init.c		# Main program.
@@ -54,11 +30,11 @@ devices_SRC += devices/disk.c		# IDE disk device.
 devices_SRC += devices/intq.c		# Interrupt queue.
 
 # Library code shared between kernel and user programs.
-lib_SRC  = lib/debug.c		# Debug helpers.
-lib_SRC += lib/random.c		# Pseudo-random numbers.
-lib_SRC += lib/stdio.c		# I/O library.
-lib_SRC += lib/stdlib.c		# Utility functions.
-lib_SRC += lib/string.c		# String functions.
+lib_SRC  = lib/debug.c			# Debug helpers.
+lib_SRC += lib/random.c			# Pseudo-random numbers.
+lib_SRC += lib/stdio.c			# I/O library.
+lib_SRC += lib/stdlib.c			# Utility functions.
+lib_SRC += lib/string.c			# String functions.
 
 # Kernel-specific library code.
 lib_kernel_SRC += lib/kernel/list.c	# Doubly-linked lists.
@@ -66,31 +42,31 @@ lib_kernel_SRC += lib/kernel/bitmap.c	# Bitmaps.
 lib_kernel_SRC += lib/kernel/hash.c	# Hash tables.
 lib_kernel_SRC += lib/kernel/console.c	# printf(), putchar().
 
-# Filesystem code.
-filesys_SRC  = filesys/filesys.c	# Filesystem core.
-filesys_SRC += filesys/file.c		# Files.
-filesys_SRC += filesys/directory.c	# Directories.
-filesys_SRC += filesys/inode.c		# File headers.
-filesys_SRC += filesys/fsutil.c		# Utilities.
-
 # User process code.
-userprog_SRC  = userprog/addrspace.c	# Address spaces.
+userprog_SRC  = userprog/process.c	# Process loading.
 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.
 userprog_SRC += userprog/tss.c		# TSS management.
 
+# No virtual memory code yet.
+#vm_SRC = vm/filename.c			# Some file.
+
+# Filesystem code.
+filesys_SRC  = filesys/filesys.c	# Filesystem core.
+filesys_SRC += filesys/file.c		# Files.
+filesys_SRC += filesys/directory.c	# Directories.
+filesys_SRC += filesys/inode.c		# File headers.
+filesys_SRC += filesys/fsutil.c		# Utilities.
+
 SOURCES = $(foreach dir,$(SUBDIRS),$($(subst /,_,$(dir))_SRC))
 OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
 DEPENDS = $(patsubst %.o,%.d,$(OBJECTS))
 
 all: os.dsk
 
-threads/intr-stubs.S: threads/intr-stubs.pl threads/loader.h
-	$< > $@
-
-threads/kernel.lds.s: CPPFLAGS += -P -C
+threads/kernel.lds.s: CPPFLAGS += -P
 threads/kernel.lds.s: threads/kernel.lds.S threads/loader.h
 
 kernel.o: threads/kernel.lds.s $(OBJECTS) 
@@ -112,17 +88,11 @@ os.dsk: loader.bin kernel.bin
 
 clean:
 	$(RM) -f $(OBJECTS) $(DEPENDS) 
-	$(RM) -f threads/intr-stubs.S threads/loader.o
+	$(RM) -f threads/loader.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)