Further simply build by removing src/mod/mod.mk

src/Makefile.in

@@ -57,14 +57,14 @@ OBJS = auth.o \
 	userrec.o \
 	users.o
 
-MODOBJS = mod/channels.o \
-        mod/console.o \
-        mod/ctcp.o \
-        mod/irc.o \
-        mod/server.o \
-        mod/share.o \
-        mod/transfer.o \
-        mod/update.o
+MODOBJS = mod/channels.mod/channels.o \
+        mod/console.mod/console.o \
+        mod/ctcp.mod/ctcp.o \
+        mod/irc.mod/irc.o \
+        mod/server.mod/server.o \
+        mod/share.mod/share.o \
+        mod/transfer.mod/transfer.o \
+        mod/update.mod/update.o
 
 
 MAKE_GENERIC = $(MAKE) 'MAKE=$(MAKE)' 'MAKEFLAGS=$(MAKEFLAGS)' 'CXX=$(CXX)' 'LD=$(LD)' 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS)' 'CCDEPMODE=$(CCDEPMODE)'

src/mod/Makefile.in

@@ -73,7 +73,7 @@ clean:
 			cp $(srcdir)/$$i/Makefile $$i/Makefile; \
 		fi; \
 		if (test -r $$i/Makefile); then \
-			(cd $$i; $(MAKE) "VPATH=$(MOD_UPDIR)$(srcdir)/$$i" "srcdir=$(MOD_UPDIR)$(srcdir)/$$i" 'MAKE=$(MAKE)' clean); \
+			(cd $$i; $(MAKE) "VPATH=$(MOD_UPDIR)$(srcdir)/$$i" top_srcdir="$(MOD_UPDIR)$(top_srcdir)" "srcdir=$(MOD_UPDIR)$(srcdir)/$$i" 'MAKE=$(MAKE)' clean); \
 		fi; \
 	done
 
@@ -86,7 +86,7 @@ distclean:
 			cp $(srcdir)/$$i/Makefile $$i/Makefile; \
 		fi; \
 		if (test -r $$i/Makefile); then \
-			(cd $$i; $(MAKE) "VPATH=$(MOD_UPDIR)$(srcdir)/$$i" "srcdir=$(MOD_UPDIR)$(srcdir)/$$i" 'MAKE=$(MAKE)' distclean); \
+			(cd $$i; $(MAKE) "VPATH=$(MOD_UPDIR)$(srcdir)/$$i" top_srcdir="$(MOD_UPDIR)$(top_srcdir)" "srcdir=$(MOD_UPDIR)$(srcdir)/$$i" 'MAKE=$(MAKE)' distclean); \
 		fi; \
 	done
 

src/mod/channels.mod/Makefile

@@ -2,11 +2,10 @@
 
 srcdir = .
 
-#This line is simply for configure to generate .deps/
 OBJS = channels.o
 
 include ./.deps/includes
-include ../mod.mk
+include $(top_srcdir)/build/build.mk
 
 doofus:
 	@echo ""
@@ -14,7 +13,7 @@ doofus:
 	@echo ""
 	@cd ../../../ && make
 
-static: ../channels.o
+static: $(OBJS)
 
 clean:
 	@rm -f .depend *.o *~

src/mod/compress.mod/Makefile

@@ -2,11 +2,10 @@
 
 srcdir = .
 
-#This line is simply for configure to generate .deps/
 OBJS = compress.o
 
 include ./.deps/includes
-include ../mod.mk
+include $(top_srcdir)/build/build.mk
 
 doofus:
 	@echo ""
@@ -14,7 +13,7 @@ doofus:
 	@echo ""
 	@cd ../../../ && make
 
-static: ../compress.o
+static: $(OBJS)
 
 clean:
 	@rm -f .depend *.o *~

src/mod/console.mod/Makefile

@@ -2,11 +2,10 @@
 
 srcdir = .
 
-#This line is simply for configure to generate .deps/
 OBJS = console.o
 
 include ./.deps/includes
-include ../mod.mk
+include $(top_srcdir)/build/build.mk
 
 doofus:
 	@echo ""
@@ -14,7 +13,7 @@ doofus:
 	@echo ""
 	@cd ../../../ && make
 
-static: ../console.o
+static: $(OBJS)
 
 clean:
 	@rm -f .depend *.o *~

src/mod/ctcp.mod/Makefile

@@ -2,11 +2,10 @@
 
 srcdir = .
 
-#This line is simply for configure to generate .deps/
 OBJS = ctcp.o
 
 include ./.deps/includes
-include ../mod.mk
+include $(top_srcdir)/build/build.mk
 
 doofus:
 	@echo ""
@@ -14,7 +13,7 @@ doofus:
 	@echo ""
 	@cd ../../../ && make
 
-static: ../ctcp.o
+static: $(OBJS)
 
 clean:
 	@rm -f .depend *.o *~

src/mod/irc.mod/Makefile

@@ -2,11 +2,10 @@
 
 srcdir = .
 
-#This line is simply for configure to generate .deps/
 OBJS = irc.o
 
 include ./.deps/includes
-include ../mod.mk
+include $(top_srcdir)/build/build.mk
 
 doofus:
 	@echo ""
@@ -14,7 +13,7 @@ doofus:
 	@echo ""
 	@cd ../../../ && make
 
-static: ../irc.o
+static: $(OBJS)
 
 clean:
 	@rm -f .depend *.o *~

src/mod/mod.mk

@@ -1,14 +0,0 @@
-depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
-
-../%.o: %.c $(top_srcdir)/src/stringfix $(top_srcdir)/build/cc1plus
-	@echo -e "Compiling: \033[1m$*\033[0m"
-ifeq ($(CCDEPMODE),gcc3)
-	if STRINGFIX='$(top_srcdir)/$(STRINGFIX)' $(CXX) -MT '$@' -MD -MP -MF '.deps/$*.TPo' -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@; then \
-	mv '.deps/$*.TPo' '.deps/$*.Po'; \
-	else rm -f '.deps/$*.Tpo'; exit 1; \
-	fi
-else
-	# STRINGFIX included after CXX for ccache to recognize
-	STRINGFIX="$(top_srcdir)/$(STRINGFIX)" libtool=no source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
-endif

src/mod/server.mod/Makefile

@@ -2,11 +2,10 @@
 
 srcdir = .
 
-#This line is simply for configure to generate .deps/
 OBJS = server.o
 
 include ./.deps/includes
-include ../mod.mk
+include $(top_srcdir)/build/build.mk
 
 doofus:
 	@echo ""
@@ -14,7 +13,7 @@ doofus:
 	@echo ""
 	@cd ../../../ && make
 
-static: ../server.o
+static: $(OBJS)
 
 clean:
 	@rm -f .depend *.o *~

src/mod/share.mod/Makefile

@@ -2,11 +2,10 @@
 
 srcdir = .
 
-#This line is simply for configure to generate .deps/
 OBJS = share.o
 
 include ./.deps/includes
-include ../mod.mk
+include $(top_srcdir)/build/build.mk
 
 doofus:
 	@echo ""
@@ -14,7 +13,7 @@ doofus:
 	@echo ""
 	@cd ../../../ && make
 
-static: ../share.o
+static: $(OBJS)
 
 clean:
 	@rm -f .depend *.o *~

src/mod/transfer.mod/Makefile

@@ -2,11 +2,10 @@
 
 srcdir = .
 
-#This line is simply for configure to generate .deps/
 OBJS = transfer.o
 
 include ./.deps/includes
-include ../mod.mk
+include $(top_srcdir)/build/build.mk
 
 doofus:
 	@echo ""
@@ -14,7 +13,7 @@ doofus:
 	@echo ""
 	@cd ../../../ && make
 
-static: ../transfer.o
+static: $(OBJS)
 
 clean:
 	@rm -f .depend *.o *~

src/mod/update.mod/Makefile

@@ -2,11 +2,10 @@
 
 srcdir = .
 
-#This line is simply for configure to generate .deps/
 OBJS = update.o
 
 include ./.deps/includes
-include ../mod.mk
+include $(top_srcdir)/build/build.mk
 
 doofus:
 	@echo ""
@@ -14,7 +13,7 @@ doofus:
 	@echo ""
 	@cd ../../../ && make
 
-static: ../update.o
+static: $(OBJS)
 
 clean:
 	@rm -f .depend *.o *~