projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve basic alarm clock test.
[pintos-anon]
/
src
/
Makefile.userprog
diff --git
a/src/Makefile.userprog
b/src/Makefile.userprog
index 6b3c25027d2df1445ee00472292f17d619b044e3..2e95f9b0f99ffee177b63b42bf05e8caa7669e78 100644
(file)
--- a/
src/Makefile.userprog
+++ b/
src/Makefile.userprog
@@
-6,11
+6,11
@@
SHELL = /bin/sh
VPATH = $(SRCDIR)
VPATH = $(SRCDIR)
-DEFINES = -DUSER
-CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib -I$(SRCDIR)/lib/user
+DEFINES = -D
PINTOS -D
USER
+CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib -I$(SRCDIR)/lib/user
-I.
# Linker flags.
# Linker flags.
-LDFLAGS = -nostdlib -static
-s
+LDFLAGS = -nostdlib -static
LDLIBS = $(shell $(CC) -print-libgcc-file-name)
# C library sources linked into every test program.
LDLIBS = $(shell $(CC) -print-libgcc-file-name)
# C library sources linked into every test program.
@@
-27,18
+27,19
@@
LIB_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(LIB_SRC)))
LIB_DEP = $(patsubst %.o,%.d,$(LIB_OBJ))
LIB = lib/user/entry.o libc.a
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
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
endef
-$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog))))
+$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog)
,$(subst -,_,$(prog))
)))
$(PROGS): $(LIB)
$(PROGS): $(LIB)