1 files changed, 64 insertions, 0 deletions
diff --git a/user/Make.mk b/user/Make.mk
new file mode 100644
index 0000000..648de69
--- /dev/null
+++ b/user/Make.mk
@@ -0,0 +1,64 @@
+#
+# Makefile fragment for the user components of the system.
+# 
+# THIS IS NOT A COMPLETE Makefile - run GNU make in the top-level
+# directory, and this will be pulled in automatically.
+#
+
+SUBDIRS += user
+
+###################
+#  FILES SECTION  #
+###################
+
+# order here must match the order of program names in the
+# 'user_e' enum defined in include/userids.h!!!
+USER_SRC := user/init.c user/idle.c user/shell.c \
+	user/progABC.c user/progDE.c user/progFG.c user/progH.c \
+	user/progI.c user/progJ.c user/progKL.c user/progMN.c \
+	user/progP.c user/progQ.c user/progR.c user/progS.c \
+	user/progTUV.c user/progW.c user/progX.c user/progY.c \
+	user/progZ.c
+
+USER_OBJ := $(patsubst %.c, $(BUILDDIR)/%.o, $(USER_SRC))
+
+USER_BIN := $(basename $(USER_SRC))
+USER_BIN := $(addprefix $(BUILDDIR)/, $(USER_BIN))
+
+ULDFLAGS := -T user/user.ld
+ULIBS := -luser -lcommon
+
+###################
+#  RULES SECTION  #
+###################
+
+userland: $(USER_BIN)
+
+$(BUILDDIR)/user/%.o: user/%.c $(BUILDDIR)/.vars.CFLAGS
+	@mkdir -p $(@D)
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+$(BUILDDIR)/user/%: $(BUILDDIR)/user/%.o
+	@mkdir -p $(@D)
+	$(LD) $(ULDFLAGS) $(LDFLAGS) -o $@ $@.o $(ULIBS)
+	$(OBJDUMP) -S $@ > $@.asm
+	$(NM) -n $@ > $@.sym
+	$(READELF) -a $@ > $@.info
+
+#
+# Remake the "user blob". When this happens, we also generate a new
+# version of the userids.h header file; we don't copy it over the
+# previous version if it is the same, to avoid triggering remakes
+# of the rest of the system.
+#
+user.img:	$(USR_BIN) mkblob
+	./mkblob $(USER_BIN)
+	@./listblob -e $@ > $(BUILDDIR)/new_userids.h
+	-@sh -c 'cmp -s include/userids.h $(BUILDDIR)/new_userids.h || \
+		(cp $(BUILDDIR)/new_userids.h include/userids.h; \
+		echo "\n*** NOTE - updated include/userids.h, rebuild\!" ; \
+		rm -f $(BUILDDIR)/new_userids.h)'
+
+# some debugging assist rules
+user.hex:	user.img
+	hexdump -C $< > $@