--- diet/cvm-0.32.org/Makefile	2004-12-21 14:57:54.000000000 +0000
+++ diet/cvm-0.32/Makefile	2004-12-21 14:58:37.000000000 +0000
@@ -101,13 +101,13 @@
 	./compile cvm-pgsql.c
 
 cvm-pwfile: load cvm-pwfile.o module.a crypt.lib socket.lib
-	./load cvm-pwfile module.a -lbg -lpwcmp `cat crypt.lib` `cat socket.lib`
+	./load cvm-pwfile module_main.o module.a -lbg -lpwcmp `cat crypt.lib` `cat socket.lib`
 
 cvm-pwfile.o: compile cvm-pwfile.c module.h facts.h errors.h
 	./compile cvm-pwfile.c
 
 cvm-qmail: load cvm-qmail.o getpwnam.o module.a qmail.a crypt.lib
-	./load cvm-qmail getpwnam.o module.a qmail.a -lbg `cat crypt.lib`
+	./load cvm-qmail getpwnam.o module_main.o module.a qmail.a -lbg `cat crypt.lib`
 
 cvm-qmail.o: compile cvm-qmail.c module.h facts.h errors.h qmail.h
 	./compile cvm-qmail.c
@@ -119,22 +119,22 @@
 	./compile cvm-testclient.c
 
 cvm-unix: load cvm-unix.o getpwnam.o module.a crypt.lib shadow.lib s.lib socket.lib
-	./load cvm-unix getpwnam.o module.a -lbg `cat crypt.lib` `cat shadow.lib` `cat s.lib` `cat socket.lib`
+	./load cvm-unix getpwnam.o module_main.o module.a -lbg `cat crypt.lib` `cat shadow.lib` `cat s.lib` `cat socket.lib`
 
 cvm-unix.o: compile cvm-unix.c module.h facts.h errors.h
 	./compile cvm-unix.c
 
 cvm-vmailmgr: load cvm-vmailmgr.o vmmain.o vmlookup.o getpwnam.o module.a qmail.a socket.lib crypt.lib
-	./load cvm-vmailmgr vmmain.o vmlookup.o getpwnam.o module.a qmail.a -lbg `cat socket.lib` `cat crypt.lib`
+	./load cvm-vmailmgr vmmain.o vmlookup.o getpwnam.o module_main.o module.a qmail.a -lbg `cat socket.lib` `cat crypt.lib`
 
 cvm-vmailmgr-local: load cvm-vmailmgr-local.o cvm-vmailmgr.o vmmain.o vmlookup.o getpwnam.o local.a qmail.a socket.lib crypt.lib
-	./load cvm-vmailmgr-local cvm-vmailmgr.o vmmain.o vmlookup.o getpwnam.o local.a qmail.a -lbg `cat socket.lib` `cat crypt.lib`
+	./load cvm-vmailmgr-local cvm-vmailmgr.o vmmain.o vmlookup.o getpwnam.o module_local_main.o local.a qmail.a -lbg `cat socket.lib` `cat crypt.lib`
 
 cvm-vmailmgr-local.o: compile cvm-vmailmgr-local.c
 	./compile cvm-vmailmgr-local.c
 
 cvm-vmailmgr-udp: load cvm-vmailmgr-udp.o cvm-vmailmgr.o vmmain.o vmlookup.o getpwnam.o udp.a qmail.a socket.lib crypt.lib
-	./load cvm-vmailmgr-udp cvm-vmailmgr.o vmmain.o vmlookup.o getpwnam.o udp.a qmail.a -lbg `cat socket.lib` `cat crypt.lib`
+	./load cvm-vmailmgr-udp cvm-vmailmgr.o vmmain.o vmlookup.o getpwnam.o module_udp_main.o udp.a qmail.a -lbg `cat socket.lib` `cat crypt.lib`
 
 cvm-vmailmgr-udp.o: compile cvm-vmailmgr-udp.c
 	./compile cvm-vmailmgr-udp.c