1 files changed, 77 insertions, 5 deletions
diff --git a/libtrivfs/Makefile b/libtrivfs/Makefile
index 883c62ca..9f0d1c4b 100644
--- a/libtrivfs/Makefile
+++ b/libtrivfs/Makefile
@@ -19,17 +19,89 @@ dir := libtrivfs
 
 include ../Makeconf
 
-DIST_FILES= demuxer.c dir-link.c dir-mkdir.c dir-mkfile.c dir-pathtrans.c \
+FSSRCS= dir-link.c dir-mkdir.c dir-mkfile.c dir-pathtrans.c \
 	dir-readdir.c dir-rename.c dir-rmdir.c dir-unlink.c file-chauthor.c \
 	file-chflags.c file-chmod.c file-chown.c file-get-trans.c \
 	file-get-transcntl.c file-getcontrol.c file-getfh.c file-getlinknode.c\
 	file-lock.c file-pathconf.c file-set-trans.c file-statfs.c \
-	file-sync.c file-syncfs.c file-truncate.c file-utimes.c fsys-getroot.c\
-	fsys-goaway.c fsys-stubs.c handle-port.c interrupt.c io-async-icky.c \
+	file-sync.c file-syncfs.c file-truncate.c file-utimes.c 
+
+IOSRCS=io-async-icky.c \
 	io-async.c io-duplicate.c io-map.c io-modes-get.c io-modes-off.c \
 	io-modes-on.c io-modes-set.c io-owner-get.c io-owner-mod.c io-read.c \
 	io-readable.c io-reauthenticate.c io-restrict-auth.c io-seek.c \
-	io-select.c io-stat.c io-stubs.c io-version.c io-write.c nosenders.c \
-	notify-stubs.c trivfs.h ChangeLog
+	io-select.c io-stat.c io-stubs.c io-version.c io-write.c 
+
+FSYSSRCS=fsys-getroot.c fsys-goaway.c fsys-startup.c fsys-getfile.c
+
+NOTIFYSRCS=nosenders.c notify-stubs.c
+
+INTSRCS=interrupt.c
+
+OTHERSRCS=demuxer.c handle-port.c
+
+SRCS=$(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(NOTIFYSRCS) $(INTSRCS) $(OTHERSCS)
+
+OBJS= $(subst .c,.o,$(SRCS)) $(MIGSTUBS)
+
+DIST_FILES= $(SRCS) Makefile ChangeLog trivfs.h
+
+MIGSFLAGS=-imacros fsmutations.h
+
+all: libtrivfs.a
+
+libtrivfs.a: $(sort $(OBJS))
+	rm -f libtrivfs.a
+	$(AR) r $@ $^
+
+$(hurdinst)/lib/libtrivfs.a: libtrivfs.a
+	cp libtrivfs.a $@
+	$(RANLIB) $@
+
+$(includedir)/hurd/trivfs.h: trivfs.h
+	cp $< $@
+
+install: $(hurdinst)/lib/libtrivfs.a $(includedir)/hurd/trivfs.h
 
 clean:
+	rm -f *.o libtrivfs.a *_S.h *Server.c fsys_reply.h *User.c
+
+$(subst .c,.o,$(FSSRCS)): fs_S.h
+$(subst .c,.o,$(IOSRCS)): io_S.h
+$(subst .c,.o,$(FSYSSRCS)): fsys_S.h
+$(subst .c,.o,$(NOTIFYSRCS)): notify_S.h
+$(subst .c,.o,$(INTSRCS)): interrupt_S.h
+
+$(OBJS): trivfs.h $(includedir)/hurd/ports.h
+
+fs_S.h fsServer.c: $(includedir)/hurd/fs.defs $(includedir)/hurd/hurd_types.defs fsmutations.h
+	$(CPP) $(CPPFLAGS) $(MIGSFLAGS) $(includedir)/hurd/fs.defs \
+	| $(MIGCOM) -sheader fs_S.h -header /dev/null -user /dev/null
+
+io_S.h ioServer.c: $(includedir)/hurd/io.defs $(includedir)/hurd/hurd_types.defs fsmutations.h
+	$(CPP) $(CPPFLAGS) $(MIGSFLAGS) $(includedir)/hurd/io.defs \
+	| $(MIGCOM) -sheader io_S.h -header /dev/null -user /dev/null
+
+fsys_S.h fsysServer.c: $(includedir)/hurd/fsys.defs \
+		$(includedir)/hurd/hurd_types.defs fsmutations.h
+	$(CPP) $(CPPFLAGS) $(MIGSFLAGS) $(includedir)/hurd/fsys.defs \
+	| $(MIGCOM) -sheader fsys_S.h -header /dev/null -user /dev/null
+
+notify_S.h notifyServer.c: $(includedir)/mach/notify.defs
+	$(CPP) $(CPPFLAGS) -DSEQNOS $(includedir)/mach/notify.defs \
+	| $(MIGCOM) -prefix trivfs_ \
+		 -sheader notify_S.h -header /dev/null -user /dev/null
+
+exec_S.h execServer.c: $(includedir)/hurd/exec.defs \
+		$(includedir)/hurd/hurd_types.defs fsmutations.h
+	$(CPP) $(CPPFLAGS) $(MIGSFLAGS) $(includedir)/hurd/exec.defs \
+	| $(MIGCOM) -sheader exec_S.h -header /dev/null -user /dev/null
+
+interrupt_S.h interruptServer.c: $(includedir)/hurd/interrupt.defs \
+		$(includedir)/hurd/hurd_types.defs fsmutations.h
+	$(CPP) $(CPPFLAGS) $(MIGSFLAGS) $(includedir)/hurd/interrupt.defs \
+	| $(MIGCOM) -sheader interrupt_S.h -header /dev/null -user /dev/null
+
+fsys_reply.h fsys_replyUser.c: $(includedir)/hurd/fsys_reply.defs $(hurd/hurd_types.defs)
+	$(CPP) $(CPPFLAGS) $(includedir)/hurd/fsys_reply.defs \
+	| $(MIGCOM) -prefix trivfs__ -server /dev/null