From 4f670845ff9ab6c48bcb5f7bf4d4ef6dc3c3064b Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 27 Mar 2012 11:51:08 +0200 Subject: reorganize file structure to match the upstream requirements --- pintos-progos/Makefile.userprog | 52 ----------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 pintos-progos/Makefile.userprog (limited to 'pintos-progos/Makefile.userprog') diff --git a/pintos-progos/Makefile.userprog b/pintos-progos/Makefile.userprog deleted file mode 100644 index 0df391a..0000000 --- a/pintos-progos/Makefile.userprog +++ /dev/null @@ -1,52 +0,0 @@ -# -*- makefile -*- - -$(PROGS): CPPFLAGS += -I$(SRCDIR)/lib/user -I. - -# Linker flags. -$(PROGS): LDFLAGS += -nostdlib -static -Wl,-T,$(LDSCRIPT) -$(PROGS): LDSCRIPT = $(SRCDIR)/lib/user/user.lds - -# Library code shared between kernel and user programs. -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 # Utility functions. -lib_SRC += lib/string.c # String functions. -lib_SRC += lib/arithmetic.c # 64-bit arithmetic for GCC. -lib_SRC += lib/ustar.c # Unix standard tar format utilities. - -# User level only library code. -lib/user_SRC = lib/user/debug.c # Debug helpers. -lib/user_SRC += lib/user/syscall.c # System calls. -lib/user_SRC += lib/user/console.c # Console code. - -LIB_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(lib_SRC) $(lib/user_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) $$(LDSCRIPT) - $$(CC) $$(LDFLAGS) $$($(1)_OBJ) $$(LIB) -o $$@ -endef - -$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog)))) - -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) -- cgit v1.2.3