Move problem 1-2 (join) into project 2 as the "wait" system call.

[pintos-anon] / src / Makefile.userprog

diff --git a/src/Makefile.userprog b/src/Makefile.userprog
index e28a408a3bc1a5f03ddca7476c1c9fdfef1a48a7..c5e6f3db33c6e992682c7b61818846b10b6a5034 100644 (file)
--- a/src/Makefile.userprog
+++ b/src/Makefile.userprog
@@ -1,20 +1,18 @@
+# -*- makefile -*-
+
 include $(SRCDIR)/Make.config
 
 SHELL = /bin/sh
 
 VPATH = $(SRCDIR)
 
-DEFINES = -DUSER
-CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib -I$(SRCDIR)/lib/user
+DEFINES = -DPINTOS -DUSER
+CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib -I$(SRCDIR)/lib/user -I.
 
 # Linker flags.
-LDFLAGS = -nostdlib -static -s
+LDFLAGS = -nostdlib -static
 LDLIBS = $(shell $(CC) -print-libgcc-file-name)
 
-# Uncomment the line below to round up segment sizes to full pages for
-# testing purposes only.
-#LDFLAGS += -Wl,-T,fullpage.x
-
 # C library sources linked into every test program.
 LIB_SRC  = lib/debug.c                 # Debug code.
 LIB_SRC += lib/random.c                        # Pseudo-random numbers.
@@ -22,25 +20,25 @@ LIB_SRC += lib/stdio.c                      # I/O library.
 LIB_SRC += lib/stdlib.c                        # atoi()
 LIB_SRC += lib/string.c                        # String functions.
 LIB_SRC += lib/user/syscall.c          # System calls.
-LIB_SRC += lib/user/syscall-stub.S     # System call stub.
 LIB_SRC += lib/user/console.c          # Console code.
 
 LIB_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(LIB_SRC)))
 LIB_DEP = $(patsubst %.o,%.d,$(LIB_OBJ))
 LIB = lib/user/entry.o libc.a
 
-PROGS_SRC = $(foreach prog,$(PROGS),$($(prog)_SRC))
+PROGS_SRC = $(foreach prog,$(PROGS),$($(subst -,_,$(prog))_SRC))
 PROGS_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(PROGS_SRC)))
 PROGS_DEP = $(patsubst %.o,%.d,$(PROGS_OBJ))
 
 all: $(PROGS)
 
 define TEMPLATE
-$(1)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(1)_SRC)))
-$(1): $$($(1)_OBJ) $$(LIB)
+$(2)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(2)_SRC)))
+$(1): $$($(2)_OBJ) $$(LIB)
+       $$(CC) $$(LDFLAGS) $$^ $$(LDLIBS) -o $$@
 endef
 
-$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog))))
+$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog),$(subst -,_,$(prog)))))
 
 $(PROGS): $(LIB)
 
@@ -49,7 +47,7 @@ libc.a: $(LIB_OBJ)
        ar r $@ $^
        ranlib $@
 
-clean:
+clean::
        rm -f $(PROGS) $(PROGS_OBJ) $(PROGS_DEP)
        rm -f $(LIB_DEP) $(LIB_OBJ) lib/user/entry.[do] libc.a