Make tests/userprog makefile modular so we can reuse it for

grading/userprog.

diff --git a/src/Makefile.userprog b/src/Makefile.userprog
new file mode 100644 (file)
index 0000000..e28a408
--- /dev/null
+++ b/src/Makefile.userprog
@@ -0,0 +1,58 @@
+include $(SRCDIR)/Make.config
+
+SHELL = /bin/sh
+
+VPATH = $(SRCDIR)
+
+DEFINES = -DUSER
+CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib -I$(SRCDIR)/lib/user
+
+# Linker flags.
+LDFLAGS = -nostdlib -static -s
+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.
+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_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)
+endef
+
+$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog))))
+
+$(PROGS): $(LIB)
+
+libc.a: $(LIB_OBJ)
+       rm -f $@
+       ar r $@ $^
+       ranlib $@
+
+clean:
+       rm -f $(PROGS) $(PROGS_OBJ) $(PROGS_DEP)
+       rm -f $(LIB_DEP) $(LIB_OBJ) lib/user/entry.[do] libc.a 
+
+.PHONY: all clean
+
+-include $(LIB_DEP) $(PROGS_DEP)

diff --git a/src/tests/userprog/Makefile b/src/tests/userprog/Makefile
index 0fae9628f2867db00ea3e7a2b95f0162d498cce7..2aad5a3e5f4f0d097ff8b1115dc020da7c15f615 100644 (file)
--- a/src/tests/userprog/Makefile
+++ b/src/tests/userprog/Makefile
@@ -1,12 +1,4 @@
-include ../../Make.config
-
-SHELL = /bin/sh
-
-VPATH = ../..
-
-DEFINES = -DUSER
-CPPFLAGS = -nostdinc -I../.. -I- -I../../lib -I../../lib/user \
-          -include constants.h
+SRCDIR = ../..
 
 # Test programs to compile, and a list of sources for each.
 # To add a new test, put its name on the PROGS list
@@ -21,55 +13,4 @@ matmult_SRC = matmult.c
 recursor_SRC = recursor.c
 shell_SRC = shell.c
 
-# Linker flags.
-LDFLAGS = -nostdlib -static -s
-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.
-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_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) | ./lib/user
-endef
-
-./lib/user:
-       $(MKDIR) -p lib/user
-
-$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog))))
-
-$(PROGS): $(LIB)
-
-libc.a: $(LIB_OBJ)
-       rm -f $@
-       ar r $@ $^
-       ranlib $@
-
-clean:
-       rm -f $(PROGS) $(PROGS_OBJ) $(PROGS_DEP)
-       rm -f $(LIB_DEP) $(LIB_OBJ) lib/user/entry.[do] libc.a 
-
-.PHONY: all clean
-
--include $(LIB_DEP) $(PROGS_DEP)
+include $(SRCDIR)/Makefile.userprog