Make module building non-recursive

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
+STATICMAKEFILES = lib/Makefile src/crypto/Makefile src/compat/Makefile src/Makefile Makefile
 CONFIGFILES = build/config.cache build/config.log build/config.status src/config.h src/buildinfo.h
 
 DISTROFILES = README.md LICENSE build doc scripts lib Makefile.in build.sh configure src BSDmakefile
@@ -46,21 +46,19 @@ CXXFLAGS = @CXXFLAGS@ $(CFLGS) @GCC3_CXXFLAGS@ -fno-rtti
 
 MAKEFLAGS = -s
 
-STRINGFIX = src/stringfix
-
 MAKE_STATIC = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD_STATIC)' 'INCLUDES=$(INCLUDES)' \
 'CCDEPMODE=$(CCDEPMODE)' 'BRANCH=$(BRANCH)' 'COMMIT=$(COMMIT_SHORT)' 'BUILDTS=$(BUILDTS)' 'VERSION=$(VERSION)' \
-'STRIP=$(STRIP)' 'CXXFLAGS=$(CXXFLAGS)' 'CFLGS=$(CFLGS) -DBIN_TYPE_STATIC' 'STRINGFIX=$(STRINGFIX)' \
+'STRIP=$(STRIP)' 'CXXFLAGS=$(CXXFLAGS)' 'CFLGS=$(CFLGS) -DBIN_TYPE_STATIC' \
 'LIBS=$(LIBS)' 'EGGEXEC=$(BINEXEC)' 'EGGBUILD=(wraith)'
 
 MAKE_DYNAMIC = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD_DYNAMIC)' 'INCLUDES=$(INCLUDES)' \
 'CCDEPMODE=$(CCDEPMODE)' 'BRANCH=$(BRANCH)' 'COMMIT=$(COMMIT_SHORT)' 'BUILDTS=$(BUILDTS)' 'VERSION=$(VERSION)' \
-'STRIP=$(STRIP)' 'CXXFLAGS=$(CXXFLAGS)' 'CFLGS=$(CFLGS) -DBIN_TYPE_DYNAMIC' 'STRINGFIX=$(STRINGFIX)' \
+'STRIP=$(STRIP)' 'CXXFLAGS=$(CXXFLAGS)' 'CFLGS=$(CFLGS) -DBIN_TYPE_DYNAMIC' \
 'LIBS=$(LIBS)' 'EGGEXEC=$(BINEXEC)' 'EGGBUILD=(wraith)'
 
 MAKE_DEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX_DEBUG)' 'LD=$(LD_DEBUG) -g' 'INCLUDES=$(INCLUDES)' \
 'CCDEPMODE=$(CCDEPMODE)' 'BRANCH=$(BRANCH)' 'COMMIT=$(COMMIT_SHORT)' 'BUILDTS=$(BUILDTS)' 'VERSION=$(VERSION)' \
-'STRIP=touch' 'CXXFLAGS=$(CXXFLAGS) $(DEBCXXFLAGS)' 'CFLGS=$(CFLGS) $(DEBCXXFLAGS) -DBIN_TYPE_DYNAMIC' 'STRINGFIX=' \
+'STRIP=touch' 'CXXFLAGS=$(CXXFLAGS) $(DEBCXXFLAGS)' 'CFLGS=$(CFLGS) $(DEBCXXFLAGS) -DBIN_TYPE_DYNAMIC' \
 'LIBS=$(LIBS)' 'EGGEXEC=$(BINEXEC)' 'EGGBUILD=(debug)'
 
 MAKE_UTILS = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX_DEBUG)' 'STRIP=touch' 'INCLUDES=$(INCLUDES)' \
@@ -73,10 +71,12 @@ MAKE_UTILS_NR = $(MAKE) 'CXX=$(CXX)' 'STRIP=touch' 'INCLUDES=$(INCLUDES)' \
 
 MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'
 
-.PHONY: checkclean.static checkclean.dynamic checkclean.debug lib wraith dwraith lib.debug debug test general crypto utils sorthelp stringfix sort indent tar distrib distclean clean cleanutils test all dynamic static tags
+.PHONY: checkclean.static checkclean.dynamic checkclean.debug lib wraith dwraith lib.debug debug test general crypto sorthelp sort indent tar distrib distclean clean cleanutils test all dynamic static tags
 
 all: dynamic
 
+include $(top_srcdir)/build/build.mk
+
 test:
 
 cleanutils:
@@ -86,7 +86,6 @@ clean:  cleanutils
 	+@cd src && $(MAKE) clean
 	+@cd src/compat && $(MAKE) clean
 	+@cd src/crypto && $(MAKE) clean
-	+@cd src/mod && $(MAKE) clean
 	-+@cd lib && $(MAKE) clean
 	@rm -f $(BINEXEC) build/stamp.* *~ src/*~ configure.temp .mangled stamp.*
 	@rm -f utctime@EXEEXT@ ts@EXEEXT@
@@ -144,18 +143,13 @@ sort: sorthelp
 	@(src/sorthelp@EXEEXT@ $(HELPFILE) $(HELPFILE) || (cp -f help.txt~ $(HELPFILE); echo "Sort failed, restoring backup."))
 	@rm -f help.txt~
 
-stringfix: src/stringfix.cc src/config.h
-	+@cd src && ${MAKE_UTILS} stringfix
-
 sorthelp: src/sorthelp.cc
 	+@cd src && ${MAKE_UTILS} sorthelp
 
-utils: stringfix
-
 crypto:
 	+@cd src/crypto && ${MAKE_UTILS} crypto
 
-general: stringfix
+general:
 
 .NOTPARALLEL: checkclean.static checkclean.dynamic checkclean.debug
 
@@ -188,7 +182,6 @@ dynamic: checkclean.dynamic lib general
 	@echo "Making dynamic binary"
 	@echo ""
 	@echo ""
-	+@cd src/mod && $(MAKE_DYNAMIC) static
 	+@cd src && $(MAKE_DYNAMIC) $(BINEXEC)
 	@echo ""
 
@@ -197,7 +190,6 @@ static: checkclean.static lib general
 	@echo "Making static binary"
 	@echo ""
 	@echo ""
-	+@cd src/mod && $(MAKE_STATIC) static
 	+@cd src && $(MAKE_STATIC) $(BINEXEC)
 	@echo ""
 
@@ -211,7 +203,6 @@ debug: checkclean.debug lib.debug general
 	@echo "Making debug binary"
 	@echo ""
 	@echo ""
-	+@cd src/mod && $(MAKE_DEBUG) static
 	+@cd src && $(MAKE_DEBUG) $(BINEXEC)
 	@echo ""
 

build/autotools/configure.ac

@@ -224,10 +224,9 @@ AC_CACHE_SAVE
 
 EGG_SUBST_VERSION
 #FIND_WRAPS
-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])
+AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/buildinfo.h])
 AC_OUTPUT
 
 AH_TEMPLATE(HAVE_ST_MTIM, [Define to 1 if your struct stat has an st_mtim member])

build/autotools/includes/acinclude.m4

@@ -659,26 +659,6 @@ AC_SUBST(NUMVER)dnl
 ])
 
 
-dnl  EGG_SUBST_MOD_UPDIR()
-dnl
-dnl  Since module's Makefiles aren't generated by configure, some
-dnl  paths in src/mod/Makefile.in take care of them. For correct
-dnl  path "calculation", we need to keep absolute paths in mind
-dnl  (which don't need a "../" pre-pended).
-AC_DEFUN([EGG_SUBST_MOD_UPDIR],
-[
-case "$srcdir" in
-  [[\\/]]* | ?:[[\\/]]*)
-    MOD_UPDIR=""
-  ;;
-  *)
-    MOD_UPDIR="../"
-  ;;
-esac
-AC_SUBST(MOD_UPDIR)dnl
-])dnl
-
-
 dnl EGG_REPLACE_IF_CHANGED(FILE-NAME, CONTENTS-CMDS, INIT-CMDS)
 dnl
 dnl Replace FILE-NAME if the newly created contents differs from the existing

build/autotools/includes/depend.m4

@@ -24,7 +24,7 @@ AC_SUBST(GCC4DEB)dnl
 
 AC_DEFUN([DO_DEPS],
 [
-files="src/Makefile.in src/compat/Makefile.in src/crypto/Makefile.in src/mod/channels.mod/Makefile src/mod/compress.mod/Makefile src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile src/mod/irc.mod/Makefile src/mod/server.mod/Makefile src/mod/share.mod/Makefile src/mod/transfer.mod/Makefile src/mod/update.mod/Makefile"
+files="src/Makefile.in src/compat/Makefile.in src/crypto/Makefile.in"
 for mf in $files; do
   # Strip MF so we end up with the name of the file.
   mf=${mf%%:*}

build/build.mk

@@ -1,72 +1,97 @@
 depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
 
-.SUFFIXES:
-.SUFFIXES: .c .cc .h .o .So
+STRINGFIX= $(top_srcdir)/src/stringfix
 
-.cc.So:
+$(STRINGFIX): $(STRINGFIX).cc
+	@echo -e "[CC]	\033[1m$@\033[0m"
+	$(CXX) $(CPPFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CXXFLAGS) $< $(LDFLAGS) -o $(STRINGFIX)
+
+# Cannot use .SUFFIXES as it won't allow a dependency on $(STRINGFIX)
+
+%.So: %.cc $(STRINGFIX)
 	@echo -e "{CC}	\033[1m$*\033[0m"
-	set -e; trap "rm -f '.deps/$*.TPo' $*.ii $*.fail; exit 1" 1 2 3 5 10 13 15; \
+	file="$*"; \
+	dirname="$${file%/*}"; \
+	if [ "$${dirname}" = "$${file}" ]; then dirname=.; fi; \
+	file="$${file##*/}"; \
+	deps="$${dirname}/.deps/$${file}"; \
+	set -e; trap "rm -f "$${deps}.TPo" $*.ii $*.fail; exit 1" 1 2 3 5 10 13 15; \
 	if [ "$(CCDEPMODE)" = "gcc3" ]; then \
-	  if { { $(CXX) -MT '$@' -MD -MP -MF '.deps/$*.TPo' $(CXXFLAGS) $(CPPFLAGS) -E $< || :> $*.fail; } | \
-	    $(top_srcdir)/src/stringfix > $*.ii; } && ! [ -f $*.fail ]; then \
-	    echo '$@: $(top_srcdir)/src/stringfix' >> '.deps/$*.TPo'; \
-	    mv '.deps/$*.TPo' '.deps/$*.Po'; \
+	  if { { $(CXX) -MT '$@' -MD -MP -MF "$${deps}.TPo" $(CXXFLAGS) $(CPPFLAGS) -E $< || :> $*.fail; } | \
+	    $(STRINGFIX) > $*.ii; } && ! [ -f $*.fail ]; then \
+	    echo '$@: $(STRINGFIX)' >> "$${deps}.TPo"; \
+	    mv "$${deps}.TPo" "$${deps}.Po"; \
 	   else \
-	     rm -f '.deps/$*.TPo' $*.ii $*.fail; \
+	     rm -f "$${deps}.TPo" $*.ii $*.fail; \
 	     exit 1; \
 	  fi; \
 	else \
-	  libtool=no source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -E $< | $(top_srcdir)/src/stringfix > $*.ii; \
+	  libtool=no source='$<' object='$@' depfile="$${deps}.Po" tmpdepfile="$${deps}.TPo" depmode=$(CCDEPMODE) $(depcomp) \
+	  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -E $< | $(STRINGFIX) > $*.ii; \
 	fi; \
 	$(CXX) $(CXXFLAGS) -c $*.ii -o $@; \
 	rm -f $*.ii
 
-.c.So:
+%.So: %.c $(STRINGFIX)
 	@echo -e "{C }	\033[1m$*\033[0m"
-	set -e; trap "rm -f '.deps/$*.TPo' $*.i $*.fail; exit 1" 1 2 3 5 10 13 15; \
+	file="$*"; \
+	dirname="$${file%/*}"; \
+	if [ "$${dirname}" = "$${file}" ]; then dirname=.; fi; \
+	file="$${file##*/}"; \
+	deps="$${dirname}/.deps/$${file}"; \
+	set -e; trap "rm -f "$${deps}.TPo" $*.i $*.fail; exit 1" 1 2 3 5 10 13 15; \
 	if [ "$(CCDEPMODE)" = "gcc3" ]; then \
-	  if { { $(CC) -MT '$@' -MD -MP -MF '.deps/$*.TPo' $(CPPFLAGS) $(CFLAGS) -E $< || :> $*.fail; } | \
-	    $(top_srcdir)/src/stringfix > $*.i; } && ! [ -f $*.fail ]; then \
-	    echo '$@: $(top_srcdir)/src/stringfix' >> '.deps/$*.TPo'; \
-	    mv '.deps/$*.TPo' '.deps/$*.Po'; \
+	  if { { $(CC) -MT '$@' -MD -MP -MF "$${deps}.TPo" $(CPPFLAGS) $(CFLAGS) -E $< || :> $*.fail; } | \
+	    $(STRINGFIX) > $*.i; } && ! [ -f $*.fail ]; then \
+	    echo '$@: $(STRINGFIX)' >> "$${deps}.TPo"; \
+	    mv "$${deps}.TPo" "$${deps}.Po"; \
 	   else \
-	     rm -f '.deps/$*.TPo' $*.i $*.fail; \
+	     rm -f "$${deps}.TPo" $*.i $*.fail; \
 	     exit 1; \
 	  fi; \
 	else \
-	  libtool=no source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	  $(CC) $(CPPFLAGS) $(CFLAGS) -E $< | $(top_srcdir)/src/stringfix > $*.i; \
+	  libtool=no source='$<' object='$@' depfile="$${deps}.Po" tmpdepfile="$${deps}.TPo" depmode=$(CCDEPMODE) $(depcomp) \
+	  $(CC) $(CPPFLAGS) $(CFLAGS) -E $< | $(STRINGFIX) > $*.i; \
 	fi; \
 	$(CC) $(CFLAGS) -c $*.i -o $@; \
 	rm -f $*.i
 
-.cc.o:
+%.o: %.cc
 	@echo -e "[CC]	\033[1m$*\033[0m"
-	set -e; trap "rm -f '.deps/$*.TPo'; exit 1" 1 2 3 5 10 13 15; \
+	file="$*"; \
+	dirname="$${file%/*}"; \
+	if [ "$${dirname}" = "$${file}" ]; then dirname=.; fi; \
+	file="$${file##*/}"; \
+	deps="$${dirname}/.deps/$${file}"; \
+	set -e; trap "rm -f "$${deps}.TPo"; exit 1" 1 2 3 5 10 13 15; \
 	if [ "$(CCDEPMODE)" = "gcc3" ]; then \
-	  if $(CXX) -MT '$@' -MD -MP -MF '.deps/$*.TPo' $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@; then \
-	    mv '.deps/$*.TPo' '.deps/$*.Po'; \
+	  if $(CXX) -MT '$@' -MD -MP -MF "$${deps}.TPo" $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@; then \
+	    mv "$${deps}.TPo" "$${deps}.Po"; \
 	   else \
-	     rm -f '.deps/$*.TPo'; \
+	     rm -f "$${deps}.TPo"; \
 	     exit 1; \
 	  fi; \
 	else \
-	  libtool=no source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
+	  libtool=no source='$<' object='$@' depfile="$${deps}.Po" tmpdepfile="$${deps}.TPo" depmode=$(CCDEPMODE) $(depcomp) \
 	  $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@; \
 	fi
 
-.c.o:
+%.o: %.c
 	@echo -e "[C]	\033[1m$*\033[0m"
-	set -e; trap "rm -f '.deps/$*.TPo'; exit 1" 1 2 3 5 10 13 15; \
+	file="$*"; \
+	dirname="$${file%/*}"; \
+	if [ "$${dirname}" = "$${file}" ]; then dirname=.; fi; \
+	file="$${file##*/}"; \
+	deps="$${dirname}/.deps/$${file}"; \
+	set -e; trap "rm -f "$${deps}.TPo"; exit 1" 1 2 3 5 10 13 15; \
 	if [ "$(CCDEPMODE)" = "gcc3" ]; then \
-	  if $(CC) -MT '$@' -MD -MP -MF '.deps/$*.TPo' $(CPPFLAGS) $(CFLAGS) -c $< -o $@; then \
-	    mv '.deps/$*.TPo' '.deps/$*.Po'; \
+	  if $(CC) -MT '$@' -MD -MP -MF "$${deps}.TPo" $(CPPFLAGS) $(CFLAGS) -c $< -o $@; then \
+	    mv "$${deps}.TPo" "$${deps}.Po"; \
 	   else \
-	     rm -f '.deps/$*.TPo'; \
+	     rm -f "$${deps}.TPo"; \
 	     exit 1; \
 	  fi; \
 	else \
-	  libtool=no source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
+	  libtool=no source='$<' object='$@' depfile="$${deps}.Po" tmpdepfile="$${deps}.TPo" depmode=$(CCDEPMODE) $(depcomp) \
 	  $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@; \
 	fi

configure

@@ -626,7 +626,6 @@ ac_includes_default="\
 ac_header_list=
 ac_func_list=
 ac_subst_vars='LTLIBOBJS
-MOD_UPDIR
 NUMVER
 VERSION
 LIBOBJS
@@ -8853,17 +8852,7 @@ _ACEOF
 
 #FIND_WRAPS
 
-case "$srcdir" in
-  [\\/]* | ?:[\\/]*)
-    MOD_UPDIR=""
-  ;;
-  *)
-    MOD_UPDIR="../"
-  ;;
-esac
-
-
-files="src/Makefile.in src/compat/Makefile.in src/crypto/Makefile.in src/mod/channels.mod/Makefile src/mod/compress.mod/Makefile src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile src/mod/irc.mod/Makefile src/mod/server.mod/Makefile src/mod/share.mod/Makefile src/mod/transfer.mod/Makefile src/mod/update.mod/Makefile"
+files="src/Makefile.in src/compat/Makefile.in src/crypto/Makefile.in"
 for mf in $files; do
   # Strip MF so we end up with the name of the file.
   mf=${mf%%:*}
@@ -8903,7 +8892,7 @@ for mf in $files; do
 done
 
 
-ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h"
+ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/buildinfo.h"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -9602,7 +9591,6 @@ do
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/compat/Makefile") CONFIG_FILES="$CONFIG_FILES src/compat/Makefile" ;;
     "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" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

src/Makefile.in

@@ -60,9 +60,8 @@ OBJS = auth.So \
 	sprintf.So \
 	userent.So \
 	userrec.So \
-	users.So
-
-MODOBJS = mod/channels.mod/channels.So \
+	users.So \
+        mod/channels.mod/channels.So \
         mod/console.mod/console.So \
         mod/ctcp.mod/ctcp.So \
         mod/irc.mod/irc.So \
@@ -71,7 +70,6 @@ MODOBJS = mod/channels.mod/channels.So \
         mod/transfer.mod/transfer.So \
         mod/update.mod/update.So
 
-
 MAKE_GENERIC = $(MAKE) 'MAKE=$(MAKE)' 'MAKEFLAGS=$(MAKEFLAGS)' 'CXX=$(CXX)' 'LD=$(LD)' 'STRIP=$(STRIP)' 'CXXFLAGS=$(CXXFLAGS)' 'CFLGS=$(CFLGS)' 'CCDEPMODE=$(CCDEPMODE)'
 
 blah:
@@ -93,36 +91,30 @@ responses.cc: $(RESPONSESFILE) $(top_srcdir)/build/makeres.sh
 
 cmds.cc: help.h
 
-help.h: $(HELPFILE) $(top_srcdir)/build/makehelp.sh stringfix
-	@echo -e "[H]	\033[1m$@\033[0m"
-	$(top_srcdir)/build/makehelp.sh < $(HELPFILE) | ./stringfix > $@
+help.h: $(HELPFILE) $(top_srcdir)/build/makehelp.sh $(STRINGFIX)
+	@echo -e "[H]	\033[1m$*\033[0m"
+	@$(top_srcdir)/build/makehelp.sh < $(HELPFILE) | $(STRINGFIX) > $@
 
 sorthelp: sorthelp.cc ../lib/bdlib/src/libbdlib.a
 	@echo -e "Compiling: \033[1msorthelp\033[0m"
 	$(CXX) $(CPPFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CXXFLAGS) $< ../lib/bdlib/src/libbdlib.a $(LDFLAGS) -o $@
 	@$(STRIP) $@@EXEEXT@
 
-stringfix: stringfix.cc
-	@echo -e "Compiling: \033[1mstringfix\033[0m"
-	$(CXX) $(CPPFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CXXFLAGS) $< $(LDFLAGS) -o stringfix
-	@$(STRIP) $@@EXEEXT@
-
-#../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability
 ../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability ../lib/bdlib/src/libbdlib.a @LIBELF_BUNDLED@
 	@echo "[*] Linking"
 	@echo ""
 	@echo "Linking wraith... $(EGGBUILD)"
 	@echo ""
-	$(LD) $(LDFLAGS) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) compat/*.o crypto/*.o ../lib/bdlib/src/libbdlib.a $(LIBS) @LIBELF_LIB@
+	$(LD) $(LDFLAGS) -o ../$(EGGEXEC) $(OBJS) compat/*.o crypto/*.o ../lib/bdlib/src/libbdlib.a $(LIBS) @LIBELF_LIB@
 	@$(STRIP) ../$(EGGEXEC)
 	@$(OBJCOPY) ../$(EGGEXEC)
 	@echo "Successful compile: $(EGGEXEC)"
 	@echo ""
 
-$(EGGEXEC): stringfix ../$(EGGEXEC)
+$(EGGEXEC): ../$(EGGEXEC)
 
 clean:
-	@rm -f .depend *.o *.So *~ _*.c _*.cc *.ii *.i set_default.h responses.cc help.h
+	@rm -f .depend *.o $(OBJS) *~ _*.c _*.cc *.ii *.i set_default.h responses.cc help.h
 
 build_msg:
 	@echo "[*] Compiling core components"

src/mod/.gitignore

@@ -1,2 +0,0 @@
-/Makefile
-*.o

src/mod/Makefile.in

@@ -1,95 +0,0 @@
-# Makefile for src/mod/
-
-SHELL = @SHELL@
-top_srcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-MOD_UPDIR = @MOD_UPDIR@
-
-@SET_MAKE@
-
-STRIP = @STRIP@
-CXXFLAGS = $(CXXFLAGS)
-CFLAGS = $(CFLGS)
-CPPFLAGS = @CPPFLAGS@ -I../.. -I$(top_srcdir)
-MOD_CXXFLAGS = $(CXXFLAGS)
-MOD_CPPFLAGS = @CPPFLAGS@ -I. -I$(MOD_UPDIR)$(top_srcdir)/src -I$(MOD_UPDIR)$(top_srcdir) \
-  -I$(MOD_UPDIR)$(top_srcdir)/src/mod -I$(MOD_UPDIR)$(top_srcdir)/lib @DEFS@
-LIBS = @LIBS@
-
-mods = channels.mod \
-	console.mod \
-	ctcp.mod \
-	irc.mod \
-	server.mod \
-	share.mod \
-	transfer.mod \
-	update.mod
-
-mod_objs = channels.mod_o \
-	console.mod_o \
-	ctcp.mod_o \
-	irc.mod_o \
-	server.mod_o \
-	share.mod_o \
-	transfer.mod_o \
-	update.mod_o
-
-
-egg_ac_parameters = @egg_ac_parameters@
-
-MAKE_MOD = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD)' \
-'CCDEPMODE=$(CCDEPMODE)' 'top_srcdir=$(MOD_UPDIR)$(top_srcdir)' \
-'STRIP=$(STRIP)' 'CXXFLAGS=$(MOD_CXXFLAGS)' 'CPPFLAGS=$(MOD_CPPFLAGS)' \
-'LIBS=$(LIBS)' 'SHELL=$(SHELL)'
-
-
-doofus:
-	@echo ""
-	@echo "Let's try this from the right directory..."
-	@echo ""
-	@cd ../.. && $(MAKE)
-
-static: build_msg $(mod_objs)
-
-build_msg:
-	@echo "[*] Compiling modules"
-
-.SUFFIXES:
-.SUFFIXES: .mod .mod_o
-
-.mod.mod_o:
-	+@if test ! -d $*.mod; then mkdir $*.mod; fi; \
-	if test ! -r $*.mod/Makefile; then \
-		cp $(srcdir)/$*.mod/Makefile $*.mod/Makefile; \
-	fi; \
-	cd $*.mod && $(MAKE_MOD) 'VPATH=$(MOD_UPDIR)$(srcdir)/$*.mod' 'srcdir=$(MOD_UPDIR)$(srcdir)/$*.mod' static;
-
-clean:
-	@rm -f *.o *.So *~
-	@for i in *.mod; do \
-		if test ! -d $$i; then mkdir $$i; fi; \
-		if (test ! -r $$i/Makefile) && \
-		   (test -r $(srcdir)/$$i/Makefile); then \
-			cp $(srcdir)/$$i/Makefile $$i/Makefile; \
-		fi; \
-		if (test -r $$i/Makefile); then \
-			(cd $$i; $(MAKE) "VPATH=$(MOD_UPDIR)$(srcdir)/$$i" top_srcdir="$(MOD_UPDIR)$(top_srcdir)" "srcdir=$(MOD_UPDIR)$(srcdir)/$$i" 'MAKE=$(MAKE)' clean); \
-		fi; \
-	done
-
-distclean:
-	@rm -f *.o *.So *~
-	@for i in *.mod; do \
-		if test ! -d $$i; then mkdir $$i; fi; \
-		if (test ! -r $$i/Makefile) && \
-		   (test -r $(srcdir)/$$i/Makefile); then \
-			cp $(srcdir)/$$i/Makefile $$i/Makefile; \
-		fi; \
-		if (test -r $$i/Makefile); then \
-			(cd $$i; $(MAKE) "VPATH=$(MOD_UPDIR)$(srcdir)/$$i" top_srcdir="$(MOD_UPDIR)$(top_srcdir)" "srcdir=$(MOD_UPDIR)$(srcdir)/$$i" 'MAKE=$(MAKE)' distclean); \
-		fi; \
-	done
-
-
-#safety hash

src/mod/channels.mod/Makefile

@@ -1,22 +0,0 @@
-# Makefile for src/mod/channels.mod/
-
-srcdir = .
-
-OBJS = channels.So
-
-include ./.deps/includes
-include $(top_srcdir)/build/build.mk
-
-doofus:
-	@echo ""
-	@echo "Let's try this from the right directory..."
-	@echo ""
-	@cd ../../../ && make
-
-static: $(OBJS)
-
-clean:
-	@rm -f .depend *.So *~
-
-distclean: clean
-

src/mod/compress.mod/Makefile

@@ -1,22 +0,0 @@
-# Makefile for src/mod/compress.mod/
-
-srcdir = .
-
-OBJS = compress.So
-
-include ./.deps/includes
-include $(top_srcdir)/build/build.mk
-
-doofus:
-	@echo ""
-	@echo "Let's try this from the right directory..."
-	@echo ""
-	@cd ../../../ && make
-
-static: $(OBJS)
-
-clean:
-	@rm -f .depend *.So *~
-
-distclean: clean
-

src/mod/console.mod/Makefile

@@ -1,21 +0,0 @@
-# Makefile for src/mod/console.mod/
-
-srcdir = .
-
-OBJS = console.So
-
-include ./.deps/includes
-include $(top_srcdir)/build/build.mk
-
-doofus:
-	@echo ""
-	@echo "Let's try this from the right directory..."
-	@echo ""
-	@cd ../../../ && make
-
-static: $(OBJS)
-
-clean:
-	@rm -f .depend *.So *~
-
-distclean: clean

src/mod/ctcp.mod/Makefile

@@ -1,21 +0,0 @@
-# Makefile for src/mod/ctcp.mod/
-
-srcdir = .
-
-OBJS = ctcp.So
-
-include ./.deps/includes
-include $(top_srcdir)/build/build.mk
-
-doofus:
-	@echo ""
-	@echo "Let's try this from the right directory..."
-	@echo ""
-	@cd ../../../ && make
-
-static: $(OBJS)
-
-clean:
-	@rm -f .depend *.So *~
-
-distclean: clean

src/mod/irc.mod/Makefile

@@ -1,22 +0,0 @@
-# Makefile for src/mod/irc.mod/
-
-srcdir = .
-
-OBJS = irc.So
-
-include ./.deps/includes
-include $(top_srcdir)/build/build.mk
-
-doofus:
-	@echo ""
-	@echo "Let's try this from the right directory..."
-	@echo ""
-	@cd ../../../ && make
-
-static: $(OBJS)
-
-clean:
-	@rm -f .depend *.So *~
-
-distclean: clean
-

src/mod/server.mod/Makefile

@@ -1,21 +0,0 @@
-# Makefile for src/mod/server.mod/
-
-srcdir = .
-
-OBJS = server.So
-
-include ./.deps/includes
-include $(top_srcdir)/build/build.mk
-
-doofus:
-	@echo ""
-	@echo "Let's try this from the right directory..."
-	@echo ""
-	@cd ../../../ && make
-
-static: $(OBJS)
-
-clean:
-	@rm -f .depend *.So *~
-
-distclean: clean

src/mod/share.mod/Makefile

@@ -1,22 +0,0 @@
-# Makefile for src/mod/share.mod/
-
-srcdir = .
-
-OBJS = share.So
-
-include ./.deps/includes
-include $(top_srcdir)/build/build.mk
-
-doofus:
-	@echo ""
-	@echo "Let's try this from the right directory..."
-	@echo ""
-	@cd ../../../ && make
-
-static: $(OBJS)
-
-clean:
-	@rm -f .depend *.So *~
-
-distclean: clean
-

src/mod/transfer.mod/Makefile

@@ -1,22 +0,0 @@
-# Makefile for src/mod/transfer.mod/
-
-srcdir = .
-
-OBJS = transfer.So
-
-include ./.deps/includes
-include $(top_srcdir)/build/build.mk
-
-doofus:
-	@echo ""
-	@echo "Let's try this from the right directory..."
-	@echo ""
-	@cd ../../../ && make
-
-static: $(OBJS)
-
-clean:
-	@rm -f .depend *.So *~
-
-distclean: clean
-

src/mod/update.mod/Makefile

@@ -1,22 +0,0 @@
-# Makefile for src/mod/update.mod/
-
-srcdir = .
-
-OBJS = update.So
-
-include ./.deps/includes
-include $(top_srcdir)/build/build.mk
-
-doofus:
-	@echo ""
-	@echo "Let's try this from the right directory..."
-	@echo ""
-	@cd ../../../ && make
-
-static: $(OBJS)
-
-clean:
-	@rm -f .depend *.So *~
-
-distclean: clean
-