entered into RCS

1 files changed, 18 insertions, 65 deletions

diff --git a/proc/Makefile b/proc/Makefile
index 09199465..510145f7 100644
--- a/proc/Makefile
+++ b/proc/Makefile
@@ -16,88 +16,41 @@
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 dir := proc
+makemode := server
 
-include ../Makeconf
-
-PROCMIGOPTS="-DPROCESS_INTRAN=pstruct_t reqport_find (process_t)" \
-	"-DPROCESS_IMPORTS=import \"proc.h\";" \
-	"-DSERVERPREFIX=S_"
+MIGSFLAGS ="-DPROCESS_INTRAN=pstruct_t reqport_find (process_t)" \
+	"-DPROCESS_IMPORTS=import \"proc.h\";" 
 
 OBJS = wait.o hash.o host.o info.o main.o mgt.o	notify.o pgrp.o msg.o \
 	primes.o cpu-types.o stubs.o \
-	processServer.o notifyServer.o process_replyUser.o msgUser.o \
+	processServer.o notifyServer.o process_replyUser.o ourmsgUser.o \
 	interruptServer.o proc_excUser.o proc_excServer.o proc_excreplUser.o \
 	proc_excreplServer.o
 
 SRCS = wait.c hash.c host.c info.c main.c mgt.c	notify.c pgrp.c msg.c \
        primes.c cpu-types.c stubs.c
-TAGSHDRS = proc.h
-TAGSLIBS = libthreads
-
-DIST_FILES = $(SRCS) proc.h Makefile proc_exc.defs proc_excrepl.defs \
-		ChangeLog
-
-LIBS = $(libthreads)
 
-all: proc
+LCLHDRS = proc.h
+REMHDRS = ../libthreads/cthreads.h
+HURDLIBS = libthreads
+DIST_FILES = proc_exc.defs proc_excrepl.defs
+target = proc
 
-proc: $(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) -o $@ $^
-
-install: proc $(hurdroot)
-	$(INSTALL_BIN) proc $(hurdroot)/hurd/proc
+include ../Makeconf
 
-$(OBJS): proc.h proc_S.h
+$(OBJS): proc.h 
+wait.o host.o info.o mgt.o pgrp.o: process_S.h
+msg.o: process_reply_U.h
 notify.o: notify_S.h
-wait.o: process_reply.h msg.h interrupt_S.h
-mgt.o: proc_exc_S.h proc_exc.h proc_excrepl.h proc_excrepl_S.h
-
-proc_S.h processServer.c: $(includedir)/hurd/process.defs $(includedir)/hurd/hurd_types.defs
-	$(CPP) $(CPPFLAGS) $(PROCMIGOPTS) $(includedir)/hurd/process.defs \
-	| $(MIGCOM) -sheader proc_S.h -user /dev/null -header /dev/null
-
-process_reply.h process_replyUser.c: $(includedir)/hurd/process_reply.defs $(hurd/hurd_types.defs)
-	$(CPP) $(CPPFLAGS) $(includedir)/hurd/process_reply.defs \
-	| $(MIGCOM) -server /dev/null
-
-interrupt_S.h interruptServer.c: $(includedir)/hurd/interrupt.defs
-	$(CPP) $(CPPFLAGS) $(PROCMIGOPTS) $(includedir)/hurd/interrupt.defs \
-	| $(MIGCOM) -sheader interrupt_S.h -user /dev/null -header /dev/null
-
-notify_S.h notifyServer.c:
-	$(CPP) $(CPPFLAGS) $(includedir)/mach/notify.defs \
-	 | $(MIGCOM) -sheader notify_S.h -header /dev/null -user /dev/null
-
-proc_exc_S.h proc_excUser.c proc_excServer.c proc_exc.h: proc_exc.defs
-	$(CPP) $(CPPFLAGS) proc_exc.defs \
-	| $(MIGCOM) -sheader proc_exc_S.h
-
-proc_excrepl_S.h proc_excreplUser.c proc_excreplServer.c proc_excrepl.h: proc_excrepl.defs
-	$(CPP) $(CPPFLAGS) proc_excrepl.defs \
-	| $(MIGCOM) -sheader proc_excrepl_S.h
-
+pgrp.o: ourmsg_U.h
+wait.o: process_reply_U.h ourmsg_U.h interrupt_S.h
+mgt.o: proc_exc_S.h proc_exc_U.h proc_excrepl_U.h proc_excrepl_S.h ourmsg_U.h
 
 # The reason for -Dout= is to prevent errors for get_init_port,
 # get_init_ports, get_init_int, get_init_ints, get_dtable, and get_fd.
 # We don't use those, so we're safe in breaking them.
-# 
-# The first sed command inserts timeout argments for each of the RPCs.
-# The second sed command fixes the prototypes in msg.h to correspond.
-msg.h msgUser.c: $(includedir)/hurd/msg.defs $(includedir)/hurd/hurd_types.defs
+ourmsg_U.h ourmsgUser.c: $(includedir)/hurd/msg.defs $(includedir)/hurd/hurd_types.defs
 	$(CPP) $(CPPFLAGS) -Droutine=simpleroutine -Dout= $(includedir)/hurd/msg.defs \
-	| $(MIGCOM) -prefix nowait_ -server /dev/null -user msgUser.c -header msg.h
-
+	| $(MIGCOM) -prefix nowait_ -server /dev/null -user ourmsgUser.c -header ourmsg_U.h
 
-#	sed	-e 's/process,/process,int timeout,/' \
-#		-e 's/MACH_MSG_OPTION_NONE/MACH_SEND_TIMEOUT/' \
-#		-e 's/MACH_MSG_TIMEOUT_NONE/timeout/' \
-#		< msgUser.c > msgUser.c.temp
-#	mv msgUser.c.temp msgUser.c
-#	sed -e 's/process,/process,int timeout,/' < msg.h > msg.h.temp
-#	mv msg.h.temp msg.h
 
-clean:
-	rm -f *.o *Server.c *_S.h *User.c proc process_reply.h \
-		msg.h proc_exc.h proc_excrepl.h
-relink:
-	rm -f proc