Reorganized the salt.h/conf.h files, again.

Rewrote all makefiles to work correctly
Rewrote all makefiles to hide the commands being parsed
Wrote in some stupid colors into makefiles
Ran autoconf on new aclocal.m4 which now requires a static TCL library for compile.


svn: 101

Makefile.in

@@ -32,7 +32,6 @@ CFLGS =
 
 # defaults
 CC = @CC@
-#CC = gcc-2.95
 LD = @CC@
 STRIP = @STRIP@
 RANLIB = @RANLIB@
@@ -76,35 +75,32 @@ egg_install_msg =  echo "" && \
 		   echo "Now run \"make install\" to install your bot." && \
 		   echo ""
 
-CFLAGS = @CFLAGS@ -I.. @DEFS@ $(CFLGS)
-DEBCFLAGS = @CFLAGS@ -I.. @DEFS@ -DDEBUG_ASSERT -DDEBUG_MEM $(CFLGS)
+DEBCFLAGS = -DDEBUG_ASSERT -DDEBUG_MEM
 
-MAKE_LEAF = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'STRIP=$(STRIP)' \
-'RANLIB=$(RANLIB)' 'CFLAGS=$(CFLAGS) -DSTATIC -DLEAF' 'XREQS=$(XREQS)' \
-'XLIBS=$(XLIBS)' 'EGGEXEC=$(LEAFEXEC)' 'EGGBUILD=(leaf)' 'LD=$(LD)' \
-'MODS=$(MODSALL) $(MODSLEAF)' 'MODOBJS=mod/*.o' 'CFLGS=$(CFLGS) -DLEAF'
+MAKE_LEAF = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
+'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DLEAF' \
+'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
+'XLIBS=$(XLIBS)' 'EGGEXEC=$(LEAFEXEC)' 'EGGBUILD=(leaf)' \
+'MODOBJS=mod/*.o' 
 
-MAKE_HUB = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'STRIP=$(STRIP)' \
-'RANLIB=$(RANLIB)' 'CFLAGS=$(CFLAGS) -DSTATIC -DHUB' 'XREQS=$(XREQS)' \
-'XLIBS=$(XLIBS)' 'EGGEXEC=$(HUBEXEC)' 'EGGBUILD=(hub)' 'LD=$(LD)' \
-'MODS=$(MODSALL) $(MODSHUB)' 'MODOBJS=mod/*.o' 'CFLGS=$(CFLGS) -DHUB'
+MAKE_DLEAF = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD) -g' \
+'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) -DLEAF $(CFLGS)' \
+'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
+'EGGEXEC=$(LEAFEXEC)' 'EGGBUILD=(debug leaf)' 'MODOBJS=mod/*.o'
 
-MAKE_DLEAF = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'STRIP=touch' \
-'RANLIB=$(RANLIB)' 'CFLAGS=-g3 $(DEBCFLAGS) -DSTATIC -DLEAF' 'XREQS=$(XREQS)' \
-'XLIBS=$(XLIBS)' 'EGGEXEC=$(LEAFEXEC)' 'EGGBUILD=(debug leaf)' 'LD=$(LD) -g' \
-'MODS=$(MODSALL) $(MODSLEAF)' 'MODOBJS=mod/*.o' 'CFLGS=$(CFLGS) -DLEAF'
+MAKE_HUB = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
+'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DLEAF' \
+'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
+'XLIBS=$(XLIBS)' 'EGGEXEC=$(HUBEXEC)' 'EGGBUILD=(hub)' \
+'MODOBJS=mod/*.o'
 
-MAKE_DHUB = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'STRIP=touch' \
-'RANLIB=$(RANLIB)' 'CFLAGS=-g3 $(DEBCFLAGS) -DSTATIC -DHUB' 'XREQS=$(XREQS)' \
-'XLIBS=$(XLIBS)' 'EGGEXEC=$(HUBEXEC)' 'EGGBUILD=(debug hub)' 'LD=$(LD) -g' \
-'MODS=$(MODSALL) $(MODSHUB)' 'MODOBJS=mod/*.o' 'CFLGS=$(CFLGS) -DHUB'
+MAKE_DHUB = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD) -g' \
+'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) -DLEAF $(CFLGS)' \
+'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
+'EGGEXEC=$(HUBEXEC)' 'EGGBUILD=(debug hub)' 'MODOBJS=mod/*.o'
 
 MAKE_UTILS = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'STRIP=$(STRIP)' \
-'RANLIB=$(RANLIB)' 'CFLAGS=$(CFLAGS) -DSTATIC -DSTANDALONE' 'XREQS=$(XREQS)' \
-'XLIBS=$(XLIBS)' 'LD=$(LD)'
-
-MAKE_DUTILS = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'STRIP=touch' \
-'RANLIB=$(RANLIB)' 'CFLAGS=-g3 $(DEBCFLAGS) -DSTATIC -DSTANDALONE' 'XREQS=$(XREQS)' \
+'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DSTANDALONE' 'XREQS=$(XREQS)' \
 'XLIBS=$(XLIBS)' 'LD=$(LD)'
 
 MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
@@ -121,13 +117,13 @@ cleanutils:
 	@rm -f stringfix
 
 cleanpack:
-	@rm -f src/settings.c src/salt.h src/conf.h
+	@rm -f src/settings.c
 
 clean:  cleanutils cleanpack
 	@cd src && $(MAKE) clean
 	@cd src/md5 && $(MAKE) clean
 	@cd src/compat && $(MAKE) clean
-	@rm -f $(HUBEXEC) $(LEAFEXEC) *.so *.stamp core DEBUG *~ key configure.temp makesalt 
+	@rm -f $(HUBEXEC) $(LEAFEXEC) *.stamp core DEBUG *~ key configure.temp makesalt 
 	@rm -f $(HUBEXEC).* $(LEAFEXEC).* src/makesalt
 
 distclean: clean clean-modconfig
@@ -157,11 +153,6 @@ salt:
 	@./makesalt
 
 
-packconf:
-	@cp -f pack/settings.c src/settings.c
-	@cp -f pack/salt.h src/salt.h
-	@cp -f pack/conf.h src/conf.h
-
 config:
 	@$(modconf) modules-still-exist
 	@$(modconf) detect-modules
@@ -175,17 +166,21 @@ clean-modconfig:
 
 reconfig: clean-modconfig config
 
+packconf:
+	@cp -f pack/settings.c src/settings.c
+
 utils:  packconf
-	@./misc/maketype utils
+#	@./misc/maketype utils
 	@cd src; $(MAKE_UTILS) ../stringfix
 
-dutils:
-	@./misc/maketype utils
-	@cd src; $(MAKE_DUTILS) ../stringfix
-
-
-
 depleaf:
+	@echo ""
+	@echo ""
+	@echo ""
+	@echo "----------------------------------------WTF?_---------------------------------"
+	@echo ""
+	@echo ""
+	@echo ""
 	@cat /dev/null > lush.h
 	@cd src && $(MAKE_DEPEND) depleaf
 	@cd src/md5 && $(MAKE_DEPEND) depleaf

aclocal.m4

@@ -115,7 +115,6 @@ SHLIB_CC="$CC"
 SHLIB_LD="$CC"
 SHLIB_STRIP="$STRIP"
 NEED_DL=1
-DEFAULT_MAKE=eggdrop
 
 AC_CACHE_CHECK(system type, egg_cv_var_system_type, egg_cv_var_system_type=`$UNAME -s`)
 AC_CACHE_CHECK(system release, egg_cv_var_system_release, egg_cv_var_system_release=`$UNAME -r`)
@@ -125,7 +124,6 @@ case "$egg_cv_var_system_type" in
     case "`echo $egg_cv_var_system_release | cut -d . -f 1`" in
       2)
         NEED_DL=0
-        DEFAULT_MAKE=static
       ;;
       3)
         MOD_CC=shlicc
@@ -167,7 +165,6 @@ case "$egg_cv_var_system_type" in
       ;;
       *)
         NEED_DL=0
-        DEFAULT_MAKE=static
         AC_MSG_WARN(Make sure the directory Eggdrop is installed into is mounted in binary mode.)
       ;;
     esac
@@ -198,24 +195,20 @@ case "$egg_cv_var_system_type" in
     IRIX=yes
     SHLIB_STRIP=touch
     NEED_DL=0
-    DEFAULT_MAKE=static
   ;;
   Ultrix)
     NEED_DL=0
     SHLIB_STRIP=touch
-    DEFAULT_MAKE=static
     SHELL=/bin/sh5
   ;;
   SINIX*)
     NEED_DL=0
     SHLIB_STRIP=touch
-    DEFAULT_MAKE=static
     SHLIB_CC="cc -G"
   ;;
   BeOS)
     NEED_DL=0
     SHLIB_STRIP=strip
-    DEFAULT_MAKE=static
   ;;
   Linux)
     LINUX=yes
@@ -227,12 +220,10 @@ case "$egg_cv_var_system_type" in
   ;;
   Lynx)
     NEED_DL=0
-    DEFAULT_MAKE=static
     SHLIB_STRIP=strip
   ;;
   QNX)
     NEED_DL=0
-    DEFAULT_MAKE=static
     SHLIB_LD="ld -shared"
     SHLIB_STRIP=strip
   ;;
@@ -265,7 +256,6 @@ case "$egg_cv_var_system_type" in
       ;;
       *)
         NEED_DL=0
-        DEFAULT_MAKE=static
       ;;
     esac
     AC_DEFINE(STOP_UAC)dnl
@@ -303,7 +293,6 @@ case "$egg_cv_var_system_type" in
     then
       AC_MSG_RESULT(yes)
       NEED_DL=0
-      DEFAULT_MAKE=static
       AC_DEFINE(BORGCUBES)dnl
     else
       AC_MSG_RESULT(no)
@@ -313,13 +302,11 @@ case "$egg_cv_var_system_type" in
         AC_MSG_RESULT(yes)
         SHLIB_STRIP=touch
         NEED_DL=0
-        DEFAULT_MAKE=static
       else
         AC_MSG_RESULT(no)
         AC_MSG_RESULT(Something unknown!)
         AC_MSG_RESULT([If you get dynamic modules to work, be sure to let the devel team know HOW :)])
         NEED_DL=0
-        DEFAULT_MAKE=static
       fi
     fi
   ;;
@@ -330,7 +317,6 @@ AC_SUBST(MOD_STRIP)dnl
 AC_SUBST(SHLIB_LD)dnl
 AC_SUBST(SHLIB_CC)dnl
 AC_SUBST(SHLIB_STRIP)dnl
-AC_SUBST(DEFAULT_MAKE)dnl
 ])dnl
 
 
@@ -995,24 +981,17 @@ then
 else
 if test ! "$TCLLIBEXT" = ".a"
 then
-  TCL_REQS="$TCLLIB/lib$TCLLIBFN"
-  TCL_LIBS="-L$TCLLIB -l$TCLLIBFNS $EGG_MATH_LIB"
-else
-
-  # Set default make as static for unshared Tcl library
-  if test ! "$DEFAULT_MAKE" = "static"
-  then
     cat << 'EOF' >&2
 configure: warning:
 
-  Your Tcl library is not a shared lib.
-  configure will now set default make type to static...
+  Your Tcl library is not compiled statically.
+  You will need to compile Tcl statically to successfully compile wraith.
 
 EOF
-    DEFAULT_MAKE=static
-    AC_SUBST(DEFAULT_MAKE)dnl
-  fi
-
+  exit 1
+#  TCL_REQS="$TCLLIB/lib$TCLLIBFN"
+#  TCL_LIBS="-L$TCLLIB -l$TCLLIBFNS $EGG_MATH_LIB"
+else
   # Are we using a pre 7.4 Tcl version ?
   TCL_VER_PRE74=`echo $egg_cv_var_tcl_version | $AWK '{split([$]1, i, "."); if (((i[[1]] == 7) && (i[[2]] < 4)) || (i[[1]] < 7)) print "yes"; else print "no"}'`
   if test "$TCL_VER_PRE74" = "no"
@@ -1079,7 +1058,6 @@ EOF
   static bot (I'll default your make to this version).
 
 EOF
-      DEFAULT_MAKE=static
     fi
   else
     cat << 'EOF' >&2
@@ -1090,7 +1068,6 @@ configure: warning:
   make to static linking.
 
 EOF
-    DEFAULT_MAKE=static
   fi
 fi
 ])dnl

build

@@ -93,19 +93,11 @@ TCLDIR=`cat pack/conf.h 2>&1 | grep "//" | awk '/TCLDIR/ {print $2}' |  sed -e '
 if test -z ${TCLDIR}
 then
   echo "[*] Searching for TCL in default dirs (edit $packname to change)"
-  ./configure --disable-tcl-threads > /dev/null 2>configure.temp
+  ./configure --silent --disable-tcl-threads
 else
   echo "[*] Searching for TCL in: $TCLDIR"
-  ./configure --disable-tcl-threads --with-tcllib=${TCLDIR}/lib/libtcl8.4.a --with-tclinc=${TCLDIR}/include/tcl.h > /dev/null 2>configure.temp
+  ./configure --silent --disable-tcl-threads --with-tcllib=${TCLDIR}/lib/libtcl8.4.a --with-tclinc=${TCLDIR}/include/tcl.h
 fi
-#if test "`cat configure.temp`"
-#then
-#  echo "Configure error'd"
-#  cat configure.temp
-#
-#  exit 1
-#fi
-#rm -f configure.temp
 
 # make clean, just in case
 if [ $clean = "1" ]; then
@@ -116,7 +108,7 @@ fi
 if [ $leaf = "1" ]; then
  # Build leaf and check
  echo "[*] Building ${d}leaf..."
- make ${d}leaf > /dev/null
+ make ${d}leaf -s
  if ! test -f leaf
  then
    echo "[!] ${d}leaf build failed"
@@ -126,7 +118,7 @@ fi
 if [ $hub = "1" ]; then
  # Build hub and check
  echo "[*] Building ${d}hub..."
- make ${d}hub > /dev/null
+ make ${d}hub -s
  if ! test -f hub
  then
    echo "[!] ${d}hub build failed"

misc/maketype

@@ -13,7 +13,7 @@ then
 #elif [ $1 = "binary" ]; then
       mod="`echo $s | cut -d / -f 3`";
       os="`echo src/mod/$mod | sed s/\\\.mod/\\\.o/g`";
-     echo "deleting $os"
+#     echo "deleting $os"
      rm -f $os
 #    fi
     else
@@ -22,12 +22,12 @@ then
       then
         if test "`file $os | grep ELF`"
         then
-          echo "Deleting $os"
+#          echo "Deleting $os"
   	  rm -f $os
         else
           if test "`file $os | grep object`"
           then
-            echo "Deleting $os"
+#            echo "Deleting $os"
     	    rm -f $os
           fi
         fi

misc/modconfig

@@ -26,7 +26,7 @@ mc_top_srcdir=
 mc_srcdir=
 mc_bindir=.
 
-mc_flag_quiet=no
+mc_flag_quiet=yes
 mc_flag_onlynew=no
 
 
@@ -301,7 +301,6 @@ xMakefile)
 	fi
 
 	mc_mod_objs=`echo ${mc_sel_modules} | sed -e 's/\.mod/.mod_o/g'`
-	mc_mod_libs=`echo ${mc_sel_modules} | sed -e 's/\.mod/.mod_so/g'`
 
 	if test ! -f ${mc_fMakefile}; then
 		echo "failed." 1>&6
@@ -314,7 +313,6 @@ xMakefile)
 	if (cat "${mc_fMakefile}" | \
 	    sed -e "s/^\(mods =\).*$/\1 ${mc_sel_modules}/g"  \
 		-e "s/^\(mod_objs =\).*$/\1 ${mc_mod_objs}/g" \
-		-e "s/^\(mod_libs =\).*$/\1 ${mc_mod_libs}/g" \
 	    1> "${mc_fMakefile}_new"); then
 		mv "${mc_fMakefile}_new" "${mc_fMakefile}"
 	else

src/Makefile.in

@@ -14,10 +14,11 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 CC = @CC@
 LD = @CC@
 STRIP = @STRIP@
-CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
+CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
 
-eggdrop_objs = pcrypt.o settings.o bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o \
+eggdrop_objs = pcrypt.o settings.o \
+bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o \
 dcc.o dccutil.o dns.o flags.o main.o mem.o misc.o \
 misc_file.o modules.o net.o rfc1459.o tcl.o tcldcc.o tclhash.o \
 tclmisc.o tcluser.o userent.o userrec.o users.o
@@ -32,42 +33,44 @@ doofus:
 	@cd .. && $(MAKE)
 
 ../stringfix:
-	$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) stringfix.c -o ../stringfix
-	$(STRIP) ../stringfix
+	@echo -e "Compiling: \033[1mstringfix\033[0m"
+	@$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) stringfix.c -o ../stringfix
+	@$(STRIP) ../stringfix
 
 ../$(EGGEXEC): build_msg $(eggdrop_objs) $(XREQS) compile_md5 compatability
 	@echo ""
-	@echo "Linking eggdrop... $(EGGBUILD)"
+	@echo "Linking wraith... $(EGGBUILD)"
 	@echo ""
 	@touch mod/mod.xlibs
-	$(LD) -static -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
-	$(STRIP) ../$(EGGEXEC)
+	@$(LD) -static -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
+	@$(STRIP) ../$(EGGEXEC)
 	@echo "Successful compile: $(EGGEXEC)"
 	@echo ""
 
 $(EGGEXEC): ../stringfix ../$(EGGEXEC)
 
 depend:
-	$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) -MM $(srcdir)/*.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/*.c > .depend
 
 clean:
 	@rm -f .depend *.o *.a *~ x*.c
 
 depleaf:
-	$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) -DLEAF -MM *.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -DLEAF -MM *.c > .depend
 
 dephub:
-	$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) -DHUB -MM *.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -DHUB -MM *.c > .depend
 
 
 build_msg:
-	@echo "(This may take a while.  Go get some runts.)"
+	@echo "[*] Compiling core components"
 
 
 main.o: ../stringfix
 	@cp -f main.c xmain.c
-	../stringfix xmain.c
-	$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) '-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \
+	@echo -e "Compiling: \033[1mmain\033[0m"
+	@../stringfix xmain.c
+	@$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) '-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \
 	'-DLDFLAGS="$(LD)"' '-DSTRIPFLAGS="$(STRIP)"' -c $(srcdir)/xmain.c -o main.o
 
 compatability:
@@ -79,10 +82,10 @@ compile_md5:
 
 libtcle.a: $(TCLLIB)/lib$(TCLLIBFN)
 	@echo "[ Fixing lib$(TCLLIBFN) -> libtcle.a ]"
-	cp $(TCLLIB)/lib$(TCLLIBFN) libtcle.a
-	chmod u+rw libtcle.a
-	ar d libtcle.a tclMain.o
-	$(RANLIB) libtcle.a
+	@cp $(TCLLIB)/lib$(TCLLIBFN) libtcle.a
+	@chmod u+rw libtcle.a
+	@ar d libtcle.a tclMain.o
+	@$(RANLIB) libtcle.a
 
 eggdrop.h:
 	@echo "You do not have the eggdrop source!"
@@ -94,137 +97,136 @@ eggdrop.h:
 
 .c.o:   ../stringfix
 	@cp -f $< x$<
-	../stringfix x$<
-	$(CC) $(CFLAGS) -I$(top_srcdir) $(CPPFLAGS) '-DCCFLAGS="$(CC) $(CFLAGS) -I$(top_srcdir) \
-        $(CPPFLAGS)"' '-DLDFLAGS="$(LD)"' \
-        '-DSTRIPFLAGS="$(STRIP)"' -c x$< -o `basename $< .c`.o
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@../stringfix x$<
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -c x$< -o `basename $< .c`.o
 
 #safety hash
 ../stringfix: stringfix.c
-bg.o: ./bg.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
+bg.o: ./bg.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  bg.h
-botcmd.o: ./botcmd.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+botcmd.o: ./botcmd.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h modules.h mod/modvals.h
-botmsg.o: ./botmsg.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+botmsg.o: ./botmsg.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h
-botnet.o: ./botnet.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+botnet.o: ./botnet.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h
-chanprog.o: ./chanprog.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+chanprog.o: ./chanprog.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h
-cmds.o: ./cmds.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
+cmds.o: ./cmds.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  tandem.h modules.h mod/modvals.h
-dcc.o: ./dcc.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
+dcc.o: ./dcc.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  modules.h mod/modvals.h tandem.h md5/md5.h
-dccutil.o: ./dccutil.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+dccutil.o: ./dccutil.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h
-dns.o: ./dns.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
+dns.o: ./dns.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  dns.h
-flags.o: ./flags.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
+flags.o: ./flags.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
-main.o: ./main.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
+main.o: ./main.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  modules.h mod/modvals.h tandem.h bg.h md5/md5.h
 match.o: ./match.c ./main.h
-mem.o: ./mem.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
+mem.o: ./mem.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  mod/modvals.h
-misc.o: ./misc.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
+misc.o: ./misc.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  stat.h
-misc_file.o: ./misc_file.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+misc_file.o: ./misc_file.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h stat.h
-modules.o: ./modules.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+modules.o: ./modules.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h
-net.o: ./net.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
+net.o: ./net.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
-rfc1459.o: ./rfc1459.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+rfc1459.o: ./rfc1459.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
 stringfix.o: stringfix.c
-tcl.o: ./tcl.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
+tcl.o: ./tcl.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
-tcldcc.o: ./tcldcc.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+tcldcc.o: ./tcldcc.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h modules.h mod/modvals.h
-tclhash.o: ./tclhash.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+tclhash.o: ./tclhash.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h match.c
-tclmisc.o: ./tclmisc.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+tclmisc.o: ./tclmisc.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h md5/md5.h
-tcluser.o: ./tcluser.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+tcluser.o: ./tcluser.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h
-userent.o: ./userent.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+userent.o: ./userent.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
-userrec.o: ./userrec.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
+userrec.o: ./userrec.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h
-users.o: ./users.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
+users.o: ./users.c main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  modules.h mod/modvals.h tandem.h
 settings.o: ./settings.c eggdrop.h ../src/main.h
-pcrypt.o: ./pcrypt.c salt.h
+pcrypt.o: ./pcrypt.c ../pack/salt.h
 

src/compat/Makefile.in

@@ -26,7 +26,7 @@ doofus:
 	@cd ../.. && $(MAKE)
 
 depend:
-	$(CC) $(CFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -MM $(srcdir)/*.c > .depend
+	@$(CC) $(CFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -MM $(srcdir)/*.c > .depend
 
 clean:
 	@rm -f .depend *.o *~
@@ -37,11 +37,12 @@ compat: $(OBJS)
 .SUFFIXES: .c .o .h
 
 .c.o:
-	$(CC) $(CFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $<
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@$(CC) $(CFLAGS) -I../.. -I$(top_srcdir) -I$(top_srcdir)/src $(CPPFLAGS) -c $<
 
 #safety hash
 gnu_strftime.o: ./gnu_strftime.c
-inet_aton.o: ./inet_aton.c ../../src/main.h ../../config.h ../../src/conf.h \
+inet_aton.o: ./inet_aton.c ../../src/main.h ../../config.h ../../pack/conf.h \
  ../../src/lang.h ../../src/eggdrop.h ../../src/flags.h \
  ../../src/proto.h ../../lush.h ../../src/misc_file.h ../../src/cmdt.h \
  ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
@@ -49,7 +50,7 @@ inet_aton.o: ./inet_aton.c ../../src/main.h ../../config.h ../../src/conf.h \
  ../../src/compat/inet_aton.h ../../src/compat/snprintf.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
  ../../src/compat/strcasecmp.h ../../src/compat/strftime.h inet_aton.h
-memcpy.o: ./memcpy.c ../../src/main.h ../../config.h ../../src/conf.h ../../src/lang.h \
+memcpy.o: ./memcpy.c ../../src/main.h ../../config.h ../../pack/conf.h ../../src/lang.h \
  ../../src/eggdrop.h ../../src/flags.h ../../src/proto.h ../../lush.h \
  ../../src/misc_file.h ../../src/cmdt.h ../../src/tclegg.h \
  ../../src/tclhash.h ../../src/chan.h ../../src/users.h \
@@ -57,7 +58,7 @@ memcpy.o: ./memcpy.c ../../src/main.h ../../config.h ../../src/conf.h ../../src/
  ../../src/compat/snprintf.h ../../src/compat/memset.h \
  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
  ../../src/compat/strftime.h memcpy.h
-memset.o: ./memset.c ../../src/main.h ../../config.h ../../src/conf.h ../../src/lang.h \
+memset.o: ./memset.c ../../src/main.h ../../config.h ../../pack/conf.h ../../src/lang.h \
  ../../src/eggdrop.h ../../src/flags.h ../../src/proto.h ../../lush.h \
  ../../src/misc_file.h ../../src/cmdt.h ../../src/tclegg.h \
  ../../src/tclhash.h ../../src/chan.h ../../src/users.h \
@@ -65,7 +66,7 @@ memset.o: ./memset.c ../../src/main.h ../../config.h ../../src/conf.h ../../src/
  ../../src/compat/snprintf.h ../../src/compat/memset.h \
  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
  ../../src/compat/strftime.h memset.h
-snprintf.o: ./snprintf.c ../../src/main.h ../../config.h ../../src/conf.h \
+snprintf.o: ./snprintf.c ../../src/main.h ../../config.h ../../pack/conf.h \
  ../../src/lang.h ../../src/eggdrop.h ../../src/flags.h \
  ../../src/proto.h ../../lush.h ../../src/misc_file.h ../../src/cmdt.h \
  ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
@@ -73,7 +74,7 @@ snprintf.o: ./snprintf.c ../../src/main.h ../../config.h ../../src/conf.h \
  ../../src/compat/inet_aton.h ../../src/compat/snprintf.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
  ../../src/compat/strcasecmp.h ../../src/compat/strftime.h snprintf.h
-strcasecmp.o: ./strcasecmp.c ../../src/main.h ../../config.h ../../src/conf.h \
+strcasecmp.o: ./strcasecmp.c ../../src/main.h ../../config.h ../../pack/conf.h \
  ../../src/lang.h ../../src/eggdrop.h ../../src/flags.h \
  ../../src/proto.h ../../lush.h ../../src/misc_file.h ../../src/cmdt.h \
  ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
@@ -81,7 +82,7 @@ strcasecmp.o: ./strcasecmp.c ../../src/main.h ../../config.h ../../src/conf.h \
  ../../src/compat/inet_aton.h ../../src/compat/snprintf.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
  ../../src/compat/strcasecmp.h ../../src/compat/strftime.h memcpy.h
-strftime.o: ./strftime.c ../../src/main.h ../../config.h ../../src/conf.h \
+strftime.o: ./strftime.c ../../src/main.h ../../config.h ../../pack/conf.h \
  ../../src/lang.h ../../src/eggdrop.h ../../src/flags.h \
  ../../src/proto.h ../../lush.h ../../src/misc_file.h ../../src/cmdt.h \
  ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \

src/main.h

@@ -12,7 +12,7 @@
 #  include "config.h"
 #endif
 
-#include "conf.h"
+#include "pack/conf.h"
 
 #include "lush.h" /* We seem to need this everywhere... */
 

src/makesalt.c

@@ -54,13 +54,13 @@ int main(void)
     srand(time(NULL));
     saltlen1=(rand()&20)+5;
     saltlen2=(rand()&20)+5;
-    if ( (salt=fopen("src/salt.h","r"))!=NULL) {
+    if ( (salt=fopen("pack/salt.h","r"))!=NULL) {
 	fclose(salt);
 	printf("Using existent Salt-File\n");
 	exit(0x0);
     }
     printf("Creating Salt File\n");
-    if ( (salt=fopen("src/salt.h","w"))==NULL) {
+    if ( (salt=fopen("pack/salt.h","w"))==NULL) {
 	printf("Cannot created Salt-File.. aborting\n");
 	exit(0x1);
     }

src/mod/Makefile.in

@@ -18,7 +18,7 @@ STRIP = @STRIP@
 CFLAGS = @CFLAGS@ -I../.. -I$(top_srcdir) @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
 MOD_CFLAGS = @CFLAGS@ -I. -I../../.. -I$(MOD_UPDIR)$(top_srcdir) \
-  -I$(MOD_UPDIR)$(top_srcdir)/src/mod @DEFS@ $(CFLGS)
+  -I$(MOD_UPDIR)$(top_srcdir)/src/mod -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
 MOD_CPPFLAGS = @CPPFLAGS@
 XLIBS = @XLIBS@
 
@@ -26,7 +26,6 @@ XLIBS = @XLIBS@
 #       misc/modconfig. They have to be present here.
 mods =
 mod_objs =
-mod_libs =
 
 modconfig = $(top_srcdir)/misc/modconfig --bindir=../.. \
   --top_srcdir=$(top_srcdir)
@@ -43,10 +42,6 @@ doofus:
 	@echo ""
 	@cd ../.. && $(MAKE)
 
-modules: $(mod_libs)
-	@echo "All modules compiled."
-	@echo ""
-
 static: $(mod_objs)
 	@$(modconfig) static.h
 
@@ -84,7 +79,7 @@ config:
 			echo "Configuring module $${modname} ..."; \
 			echo ""; \
 			if test ! -d $$i; then mkdir $$i; fi; \
-			(cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \
+			(cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) --silent --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \
 		fi; \
 	done; \
 	echo ""

src/mod/channels.mod/Makefile

@@ -12,12 +12,13 @@ doofus:
 static: ../channels.o
 
 ../channels.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/channels.c
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/channels.c
 	@rm -f ../channels.o
-	mv channels.o ../
+	@mv channels.o ../
 
 depend:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/channels.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/channels.c > .depend
 
 clean:
 	@rm -f .depend *.o *~
@@ -25,7 +26,7 @@ distclean: clean
 
 #safety hash
 ../channels.o: .././channels.mod/channels.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/main.h ../../../config.h ../../../pack/conf.h \
  ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \

src/mod/compress.mod/Makefile.in

@@ -14,12 +14,13 @@ static: ../compress.o
 	@echo "$(ZLIB)" >> ../mod.xlibs
 
 ../compress.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/compress.c
-	rm -f ../compress.o
-	mv compress.o ../
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/compress.c
+	@rm -f ../compress.o
+	@mv compress.o ../
 
 depend:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/compress.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/compress.c > .depend
 
 clean:
 	@rm -f .depend *.o *~
@@ -29,7 +30,7 @@ distclean: clean
 
 #safety hash
 ../compress.o: .././compress.mod/compress.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/main.h ../../../config.h ../../../pack/conf.h \
  ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \

src/mod/console.mod/Makefile

@@ -12,12 +12,13 @@ doofus:
 static: ../console.o
 
 ../console.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/console.c
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/console.c
 	@rm -f ../console.o
-	mv console.o ../
+	@mv console.o ../
 
 depend:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/console.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/console.c > .depend
 
 clean:
 	@rm -f .depend *.o *~
@@ -25,7 +26,7 @@ distclean: clean
 
 #safety hash
 ../console.o: .././console.mod/console.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/main.h ../../../config.h ../../../pack/conf.h \
  ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \

src/mod/ctcp.mod/Makefile

@@ -12,12 +12,13 @@ doofus:
 static: ../ctcp.o
 
 ../ctcp.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/ctcp.c
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/ctcp.c
 	@rm -f ../ctcp.o
-	mv ctcp.o ../
+	@mv ctcp.o ../
 
 depend:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/ctcp.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/ctcp.c > .depend
 
 clean:
 	@rm -f .depend *.o *~
@@ -26,7 +27,7 @@ distclean: clean
 #safety hash
 ../ctcp.o: .././ctcp.mod/ctcp.c ../ctcp.mod/ctcp.h \
  ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/main.h ../../../config.h ../../../pack/conf.h \
  ../../../src/lang.h ../../../src/eggdrop.h ../../../src/flags.h \
  ../../../src/proto.h ../../../lush.h ../../../src/misc_file.h \
  ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \

src/mod/dns.mod/Makefile.in

@@ -15,12 +15,13 @@ static: ../dns.o
 	@echo "$(RESLIB)" >> ../mod.xlibs
 
 ../dns.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(RESINCLUDE) -DMAKING_MODS -c $(srcdir)/dns.c
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@$(CC) $(CFLAGS) $(CPPFLAGS) $(RESINCLUDE) -DMAKING_MODS -c $(srcdir)/dns.c
 	@rm -f ../dns.o
-	mv dns.o ../
+	@mv dns.o ../
 
 depend:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/dns.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/dns.c > .depend
 
 clean:
 	@rm -f .depend *.o *~
@@ -30,7 +31,7 @@ distclean: clean
 
 #safety hash
 ../dns.o: .././dns.mod/dns.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/main.h ../../../config.h ../../../pack/conf.h \
  ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \

src/mod/irc.mod/Makefile

@@ -12,12 +12,13 @@ doofus:
 static: ../irc.o
 
 ../irc.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/irc.c
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/irc.c
 	@rm -f ../irc.o
-	mv irc.o ../
+	@mv irc.o ../
 
 depend:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/irc.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/irc.c > .depend
 
 clean:
 	@rm -f .depend *.o *~
@@ -25,7 +26,7 @@ distclean: clean
 
 #safety hash
 ../irc.o: .././irc.mod/irc.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/main.h ../../../config.h ../../../pack/conf.h \
  ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \

src/mod/notes.mod/Makefile

@@ -12,12 +12,13 @@ doofus:
 static: ../notes.o
 
 ../notes.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/notes.c
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/notes.c
 	@rm -f ../notes.o
-	mv notes.o ../
+	@mv notes.o ../
 
 depend:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/notes.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/notes.c > .depend
 
 clean:
 	@rm -f .depend *.o *~
@@ -25,7 +26,7 @@ distclean: clean
 
 #safety hash
 ../notes.o: .././notes.mod/notes.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/main.h ../../../config.h ../../../pack/conf.h \
  ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \

src/mod/server.mod/Makefile

@@ -12,12 +12,13 @@ doofus:
 static: ../server.o
 
 ../server.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/server.c
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/server.c
 	@rm -f ../server.o
-	mv server.o ../
+	@mv server.o ../
 
 depend:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/server.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/server.c > .depend
 
 clean:
 	@rm -f .depend *.o *~
@@ -25,7 +26,7 @@ distclean: clean
 
 #safety hash
 ../server.o: .././server.mod/server.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/main.h ../../../config.h ../../../pack/conf.h \
  ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \

src/mod/share.mod/Makefile

@@ -12,12 +12,13 @@ doofus:
 static: ../share.o
 
 ../share.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/share.c
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/share.c
 	@rm -f ../share.o
-	mv share.o ../
+	@mv share.o ../
 
 depend:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/share.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/share.c > .depend
 
 clean:
 	@rm -f .depend *.o *~
@@ -25,7 +26,7 @@ distclean: clean
 
 #safety hash
 ../share.o: .././share.mod/share.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/main.h ../../../config.h ../../../pack/conf.h \
  ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \

src/mod/transfer.mod/Makefile

@@ -12,12 +12,13 @@ doofus:
 static: ../transfer.o
 
 ../transfer.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/transfer.c
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/transfer.c
 	@rm -f ../transfer.o
-	mv transfer.o ../
+	@mv transfer.o ../
 
 depend:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/transfer.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/transfer.c > .depend
 
 clean:
 	@rm -f .depend *.o *~
@@ -25,7 +26,7 @@ distclean: clean
 
 #safety hash
 ../transfer.o: .././transfer.mod/transfer.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/main.h ../../../config.h ../../../pack/conf.h \
  ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \

src/mod/update.mod/Makefile

@@ -12,12 +12,13 @@ doofus:
 static: ../update.o
 
 ../update.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/update.c
+	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/update.c
 	@rm -f ../update.o
-	mv update.o ../
+	@mv update.o ../
 
 depend:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/update.c > .depend
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(srcdir)/update.c > .depend
 
 clean:
 	@rm -f .depend *.o *~
@@ -25,7 +26,7 @@ distclean: clean
 
 #safety hash
 ../update.o: .././update.mod/update.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/main.h ../../../config.h ../../../pack/conf.h \
  ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \