* Fix 'mod' files not getting stringfixed

.gitignore

@@ -7,7 +7,7 @@
 /build/config.status
 /build/stamp.*
 /build/autotools/src
-/build/build.mk
+/src/mod/mod.mk
 /*.tgz
 /leaf
 /hub

Makefile.in

@@ -12,7 +12,7 @@ VPATH = @srcdir@
 CCDEPMODE = @CCDEPMODE@
 BINEXEC = wraith@EXEEXT@
 
-STATICMAKEFILES = lib/Makefile src/mod/Makefile src/crypto/Makefile src/compat/Makefile src/Makefile Makefile build/build.mk
+STATICMAKEFILES = lib/Makefile src/mod/Makefile src/crypto/Makefile src/compat/Makefile src/Makefile Makefile src/mod/mod.mk
 CONFIGFILES = build/config.cache build/config.log build/config.status src/config.h src/buildinfo.h
 
 DISTROFILES = README LICENSE build doc scripts lib Makefile.in build.sh configure src BSDmakefile

build/autotools/configure.ac

@@ -220,7 +220,7 @@ EGG_SUBST_VERSION
 EGG_SUBST_MOD_UPDIR
 DO_DEPS
 
-AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h build/build.mk])
+AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h src/mod/mod.mk])
 AC_OUTPUT
 
 AH_TEMPLATE(HAVE_ST_MTIM, [Define to 1 if your struct stat has an st_mtim member])

configure

@@ -8611,7 +8611,7 @@ $as_echo X"$mf" |
 done
 
 
-ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h build/build.mk"
+ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h src/mod/mod.mk"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -9324,7 +9324,7 @@ do
     "src/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES src/crypto/Makefile" ;;
     "src/mod/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/Makefile" ;;
     "src/buildinfo.h") CONFIG_FILES="$CONFIG_FILES src/buildinfo.h" ;;
-    "build/build.mk") CONFIG_FILES="$CONFIG_FILES build/build.mk" ;;
+    "src/mod/mod.mk") CONFIG_FILES="$CONFIG_FILES src/mod/mod.mk" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

src/Makefile.in

@@ -10,7 +10,7 @@ VPATH = @srcdir@
 CXXFLAGS = @CXXFLAGS@ -I. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/pack @DEFS@ $(INCLUDES) $(CFLGS) '-DCOMMIT="$(COMMIT)"' '-DBRANCH="$(BRANCH)"' -DBUILDTS=$(BUILDTS) '-DVERSION="$(VERSION)"'
 CPPFLAGS = @CPPFLAGS@
 
-include $(top_srcdir)/build/build.mk
+depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
 
 OBJCOPY = @OBJCOPY@
 
@@ -129,3 +129,9 @@ mycrypto:
 	+@cd crypto && $(MAKE_GENERIC) crypto
 
 include ./.deps/includes
+
+%.o: %.c stringfix@EXEEXT@ $(top_srcdir)/build/cc1plus
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	# STRINGFIX included after CXX for ccache to recognize
+	stringfix="$(top_srcdir)/$(STRINGFIX)" source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
+	$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $<  -o `basename $< .c`.o

src/mod/Makefile.in

@@ -38,7 +38,7 @@ mod_objs = channels.mod_o \
 egg_ac_parameters = @egg_ac_parameters@
 
 MAKE_MOD = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD)' \
-'CCDEPMODE=$(CCDEPMODE)' \
+'CCDEPMODE=$(CCDEPMODE)' 'top_srcdir=$(MOD_UPDIR)$(top_srcdir)' \
 'STRIP=$(STRIP)' 'CXXFLAGS=$(MOD_CXXFLAGS)' 'CPPFLAGS=$(MOD_CPPFLAGS)' \
 'LIBS=$(LIBS)' 'SHELL=$(SHELL)'
 

src/mod/channels.mod/Makefile

@@ -7,6 +7,7 @@ depcomp = /bin/sh ../../../build/autotools/depcomp
 OBJS = channels.o
 
 include ./.deps/includes
+include ../mod.mk
 
 doofus:
 	@echo ""
@@ -16,14 +17,6 @@ doofus:
 
 static: ../channels.o
 
-../channels.o:
-	@echo -e "Compiling: \033[1mchannels\033[0m"
-	source='channels.c' object='$@' depfile='.deps/channels.Po' tmpdepfile='.deps/channels.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/channels.c
-	@rm -f ../channels.o
-	@mv channels.o ../
-
-
 clean:
 	@rm -f .depend *.o *~
 

src/mod/compress.mod/Makefile

@@ -7,6 +7,7 @@ depcomp = /bin/sh ../../../build/autotools/depcomp
 OBJS = compress.o
 
 include ./.deps/includes
+include ../mod.mk
 
 doofus:
 	@echo ""
@@ -16,13 +17,6 @@ doofus:
 
 static: ../compress.o
 
-../compress.o:
-	@echo -e "Compiling: \033[1mcompress\033[0m"
-	source='compress.c' object='$@' depfile='.deps/compress.Po' tmpdepfile='.deps/compress.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/compress.c
-	@rm -f ../compress.o
-	@mv compress.o ../
-
 clean:
 	@rm -f .depend *.o *~
 

src/mod/console.mod/Makefile

@@ -7,6 +7,7 @@ depcomp = /bin/sh ../../../build/autotools/depcomp
 OBJS = console.o
 
 include ./.deps/includes
+include ../mod.mk
 
 doofus:
 	@echo ""
@@ -16,13 +17,6 @@ doofus:
 
 static: ../console.o
 
-../console.o:
-	@echo -e "Compiling: \033[1mconsole\033[0m"
-	source='console.c' object='$@' depfile='.deps/console.Po' tmpdepfile='.deps/console.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/console.c
-	@rm -f ../console.o
-	@mv console.o ../
-
 clean:
 	@rm -f .depend *.o *~
 

src/mod/ctcp.mod/Makefile

@@ -7,6 +7,7 @@ depcomp = /bin/sh ../../../build/autotools/depcomp
 OBJS = ctcp.o
 
 include ./.deps/includes
+include ../mod.mk
 
 doofus:
 	@echo ""
@@ -16,13 +17,6 @@ doofus:
 
 static: ../ctcp.o
 
-../ctcp.o:
-	@echo -e "Compiling: \033[1mctcp\033[0m"
-	source='ctcp.c' object='$@' depfile='.deps/ctcp.Po' tmpdepfile='.deps/ctcp.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/ctcp.c
-	@rm -f ../ctcp.o
-	@mv ctcp.o ../
-
 clean:
 	@rm -f .depend *.o *~
 

src/mod/irc.mod/Makefile

@@ -8,6 +8,7 @@ depcomp = /bin/sh ../../../build/autotools/depcomp
 OBJS = irc.o
 
 include ./.deps/includes
+include ../mod.mk
 
 doofus:
 	@echo ""
@@ -17,14 +18,6 @@ doofus:
 
 static: ../irc.o
 
-../irc.o:
-	@echo -e "Compiling: \033[1mirc\033[0m"
-	source='irc.c' object='$@' depfile='.deps/irc.Po' tmpdepfile='.deps/irc.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/irc.c
-	@rm -f ../irc.o
-	@mv irc.o ../
-
-
 clean:
 	@rm -f .depend *.o *~
 

build/build.mk.in → src/mod/mod.mk.in

@@ -1,8 +1,7 @@
 depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
 
-%.o: %.c stringfix@EXEEXT@ $(top_srcdir)/build/cc1plus
+../%.o: %.c $(top_srcdir)/src/stringfix $(top_srcdir)/build/cc1plus
 	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
 	# STRINGFIX included after CXX for ccache to recognize
 	stringfix="$(top_srcdir)/$(STRINGFIX)" source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $<  -o `basename $< .c`.o
-
+	$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $<  -o ../`basename $< .c`.o

src/mod/server.mod/Makefile

@@ -7,6 +7,7 @@ depcomp = /bin/sh ../../../build/autotools/depcomp
 OBJS = server.o
 
 include ./.deps/includes
+include ../mod.mk
 
 doofus:
 	@echo ""
@@ -16,13 +17,6 @@ doofus:
 
 static: ../server.o
 
-../server.o:
-	@echo -e "Compiling: \033[1mserver\033[0m"
-	source='server.c' object='$@' depfile='.deps/server.Po' tmpdepfile='.deps/server.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/server.c
-	@rm -f ../server.o
-	@mv server.o ../
-
 clean:
 	@rm -f .depend *.o *~
 

src/mod/share.mod/Makefile

@@ -7,6 +7,7 @@ depcomp = /bin/sh ../../../build/autotools/depcomp
 OBJS = share.o
 
 include ./.deps/includes
+include ../mod.mk
 
 doofus:
 	@echo ""
@@ -16,13 +17,6 @@ doofus:
 
 static: ../share.o
 
-../share.o:
-	@echo -e "Compiling: \033[1mshare\033[0m"
-	source='share.c' object='$@' depfile='.deps/share.Po' tmpdepfile='.deps/share.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/share.c
-	@rm -f ../share.o
-	@mv share.o ../
-
 clean:
 	@rm -f .depend *.o *~
 

src/mod/transfer.mod/Makefile

@@ -7,6 +7,7 @@ depcomp = /bin/sh ../../../build/autotools/depcomp
 OBJS = transfer.o
 
 include ./.deps/includes
+include ../mod.mk
 
 doofus:
 	@echo ""
@@ -16,13 +17,6 @@ doofus:
 
 static: ../transfer.o
 
-../transfer.o:
-	@echo -e "Compiling: \033[1mtransfer\033[0m"
-	source='transfer.c' object='$@' depfile='.deps/transfer.Po' tmpdepfile='.deps/transfer.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/transfer.c
-	@rm -f ../transfer.o
-	@mv transfer.o ../
-
 clean:
 	@rm -f .depend *.o *~
 

src/mod/update.mod/Makefile

@@ -7,6 +7,7 @@ depcomp = /bin/sh ../../../build/autotools/depcomp
 OBJS = update.o
 
 include ./.deps/includes
+include ../mod.mk
 
 doofus:
 	@echo ""
@@ -16,13 +17,6 @@ doofus:
 
 static: ../update.o
 
-../update.o:
-	@echo -e "Compiling: \033[1mupdate\033[0m"
-	source='update.c' object='$@' depfile='.deps/update.Po' tmpdepfile='.deps/update.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(srcdir)/update.c
-	@rm -f ../update.o
-	@mv update.o ../
-
 clean:
 	@rm -f .depend *.o *~