5 files changed, 51 insertions, 6 deletions
diff --git a/src/modules/Makefile b/src/modules/Makefile
index 51306248c..e73fd7e7c 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -32,7 +32,12 @@ subs:
         echo "make all in $$i..."; \
         (cd $$i; $(MAKE) $(MAKEARGS) all); done
 
-clean:
+subs_clean:
+	@for i in $(SUBS); do \
+	echo "cleaning in $$i..."; \
+	(cd $$i; $(MAKE) $(MAKEARGS) clean); done
+
+clean: subs_clean
 	rm -f *.o *.so *.c~ core
 
 spotless: clean
diff --git a/src/modules/catserv/makefile.win32 b/src/modules/catserv/makefile.win32
new file mode 100644
index 000000000..638704440
--- /dev/null
+++ b/src/modules/catserv/makefile.win32
@@ -0,0 +1,4 @@
+SRCS=ircd_catserv.c purr.c catserv_messages.c meow.c
+TARGET=ircd_catserv.dll
+
+include ..\Makefile.sub.win32
diff --git a/src/modules/makefile.inc.win32 b/src/modules/makefile.inc.win32
index f97acfd3d..f069be350 100644
--- a/src/modules/makefile.inc.win32
+++ b/src/modules/makefile.inc.win32
@@ -1,2 +1,2 @@
-SRCS=hs_moo.c ircd_catserv.c events.c
-
+SRCS=hs_moo.c events.c
+SUBS=catserv
diff --git a/src/modules/makefile.sub.win32 b/src/modules/makefile.sub.win32
new file mode 100644
index 000000000..0d0f41069
--- /dev/null
+++ b/src/modules/makefile.sub.win32
@@ -0,0 +1,19 @@
+include ../../../Makefile.inc.win32
+
+OBJECTS= $(SRCS:.c=.obj)
+CFLAGS=/nologo /LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../../include" /I "../"
+LFLAGS=/nologo ../../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini /OUT:$(TARGET)
+
+all: 
+    $(CC) $(SRCS) $(CFLAGS) /link $(LFLAGS)
+
+distclean: clean spotless
+
+clean:
+        -@del *.obj
+
+spotless: clean
+        -@del *.dll *.lib *.exp
+        
+install:
+        -@copy *.dll ..\..\..\$(DATDEST)\modules
diff --git a/src/modules/makefile.win32 b/src/modules/makefile.win32
index 13133e0b7..5a6d62ad9 100644
--- a/src/modules/makefile.win32
+++ b/src/modules/makefile.win32
@@ -5,20 +5,37 @@ OBJECTS= $(SRCS:.c=.dll)
 CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include"
 LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini
 
-all: $(OBJECTS)
+all: $(OBJECTS) subs
 
 distclean: clean spotless
 
 .c.dll:
         $(CC) $(CFLAGS) $(IRCTYPE) $< $(LFLAGS)
         
-clean:
+
+subs:
+        @for %i in ( $(SUBS) ); do \
+        	@if exist %i; @cd %i && $(MAKE) $(MAKEARGS) && cd ..
+
+clean: subs-clean
         -@del *.obj
 
-spotless: clean
+subs-clean:
+	@for %i in ( $(SUBS) ); do \
+		@if exist %i; @cd %i && $(MAKE) $(MAKEARGS) clean && cd ..
+
+spotless: clean subs-spotless
         -@del *.dll *.lib *.exp
+
+subs-spotless:
+	@for %i in ( $(SUBS) ); do \
+		@if exist %i; @cd %i && $(MAKE) $(MAKEARGS) spotless && cd ..
         
 install:
         -@mkdir ..\..\$(DATDEST)\modules
         -@mkdir ..\..\$(DATDEST)\modules\runtime
         -@copy *.dll ..\..\$(DATDEST)\modules
+
+subs-install: install
+	@for i in ( $(SUBS) ); do \
+		@if exist %i; @cd %i && $(MAKE) $(MAKEARGS) install && cd ..