Fix build of m_spanningtree and display of dependency regeneration

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11557 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/.Makefile.inc b/.Makefile.inc
index 2e9b3e635b12787c296772cd0d9dc060df3c9cb5..2d5231eae813997a53f56e8f4fdb042043ae5cad 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -24,6 +24,7 @@ NICEFLAGS += -I$(COMPILE_ROOT)/include
 CC = @CC@
 FLAGS = $(NICEFLAGS) -pedantic
 PICLDFLAGS = -fPIC -DPIC -shared -export-dynamic
+CORE_FLAGS = @CORE_FLAGS@
 LDLIBS = @LDLIBS@
 BASE = "@BASE_DIR@"
 CONPATH = "@CONFIG_DIR@"
@@ -44,7 +45,7 @@ SOCKETENGINE = @SOCKETENGINE@
     RUNCC = $(COMPILE_ROOT)/make/run-cc.pl $(CC)
 @ENDIF
 
-@DO_EXPORT RUNCC FLAGS NICEFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE
+@DO_EXPORT RUNCC FLAGS NICEFLAGS CC LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORE_FLAGS
 
 # Default target
 
@@ -56,7 +57,7 @@ all: finishmessage
 
 alldep: $(HEADER)
        @echo -n "Generating module dependencies..."
-       @$(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-dep.mk all
+       @$(MAKEENV) $(MAKE) -C src -f ../make/$(MAKESTYLE)-dep.mk alldep
        @echo 'done'
 
 allreal: alldep

diff --git a/configure b/configure
index d34c1fd2d72c6cc0492966a226f5f0c338313ea3..eafa871744aa10161c95008d387343a4178120d4 100755 (executable)
--- a/configure
+++ b/configure
@@ -67,35 +67,6 @@ our @immutabledeps = (
 our $install_list = "";
 our $uninstall_list = "";
 
-# This is a list of all files in the core. Each cpp file is mapped to a shared object file,
-# whos file extension is omitted (these can vary from system to system). Auto detected by
-# scanning the src/*.cpp files for files containing /* $Core */ identifiers.
-
-our %filelist = ();
-
-# If you wish for a file to have special dependencies in the makefile, add an entry here.
-# Auto populated by /* $ExtraDeps: */ instruction
-
-our %specialdeps = ();
-
-# If you wish for a file to have extra make lines (in between the compile and link steps)
-# then insert them here.
-# Auto populated by /* $ExtraBuild: */ instruction
-
-our %extrabuildlines = ();
-
-# If you wish for a file to be linked against extra objects or arctives, insert them here.
-# Auto populated by /* $ExtraObjects: */ instruction
-
-our %extraobjects = ();
-
-# If you wish to compile extra cpp sources into an object, define them here.
-# NOTE: Certain cpp files such as the socket engines have a value auto calculated
-# for this table so that their derived class is built.
-# Auto populated by /* $ExtraSources: */ instruction
-
-our %extrasources = ();
-
 our ($opt_use_gnutls, $opt_rebuild, $opt_use_openssl, $opt_nointeractive, $opt_ports,
     $opt_epoll, $opt_kqueue, $opt_noports, $opt_noepoll, $opt_nokqueue,
     $opt_ipv6, $opt_ipv6links, $opt_noipv6links, $opt_maxbuf, $opt_disable_debug,
@@ -1280,10 +1251,9 @@ EOF
 
        # We can actually parse any file starting with . and ending with .inc,
        # but right now we only parse .inspircd.inc to form './inspircd'
+       prepare_dynamic_makefile();
 
-        print "Writing \e[1;32mMakefiles\e[0m\n";
-       write_dynamic_modules_makefile();
-       write_dynamic_makefile();
+    print "Writing \e[1;32mMakefiles\e[0m\n";
 
        opendir(DIRHANDLE, $this);
 
@@ -1302,7 +1272,7 @@ EOF
                        print "Writing \e[1;32m$file\e[0m ...\n";
                        for my $var (qw(
                                CC FLAGS DEVELOPER LDLIBS BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR LIBRARY_DIR
-                               STARTSCRIPT DESTINATION EXTRA_DIR SOCKETENGINE
+                               STARTSCRIPT DESTINATION EXTRA_DIR SOCKETENGINE CORE_FLAGS
                        )) {
                                s/\@$var\@/$config{$var}/g;
                        }
@@ -1348,106 +1318,6 @@ EOF
        chmod 0744, 'inspircd';
 }
 
-sub write_dynamic_modules_makefile {
-       # Modules Makefile..
-       print "Writing \e[1;32msrc/modules/Makefile\e[0m\n";
-       open(FILEHANDLE, ">src/modules/Makefile");
-
-###
-# Module Makefile Header
-###
-       print FILEHANDLE <<EOF;
-###################################################
-# Copyright 2002-2009 The InspIRCd Development Team
-#  http://wiki.inspircd.org/Credits
-#
-# Thanks to Andrew Church <achurch\@achurch.org>
-#   for assisting with making this work right.
-#
-# Automatically Generated by ./configure to add a
-#  modules please run ./configure -modupdate
-###################################################
-
-all: \$(MODULES)
-
-EOF
-
-if ($config{OSNAME} =~ /darwin/) {
-               print FILEHANDLE <<EOCHEESE;
-
-PICLDFLAGS = -twolevel_namespace -undefined dynamic_lookup -bundle
-
-EOCHEESE
-} else {
-               print FILEHANDLE <<EOCHEESE;
-
-PICLDFLAGS = -fPIC -DPIC -shared
-
-EOCHEESE
-}
-
-       ###
-       # End Module Makefile Header
-       ###
-
-       # Create a Modules List..
-       my $modules = "";
-       my $cmflags = "";
-       my $liflags = "";
-       foreach my $i (@modlist) {
-               ###
-               # Write Entry to the MakeFile
-               ###
-               $cmflags = getcompilerflags("src/modules/m_".$i.".cpp");
-               $liflags = getlinkerflags("src/modules/m_".$i.".cpp");
-               my $deps = getdependencies("src/modules/m_".$i.".cpp");
-
-               #print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
-
-
-               if (nopedantic("src/modules/m_".$i.".cpp"))
-               {
-                       print FILEHANDLE "
-m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
-       \$(RUNCC) \$(NICEFLAGS) $cmflags \$(PICLDFLAGS) $liflags $SHARED -o m_$i.so m_$i.cpp
-";
-               }
-               else
-               {
-                       print FILEHANDLE "
-m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
-       \$(RUNCC) \$(FLAGS) $cmflags \$(PICLDFLAGS) $liflags $SHARED -o m_$i.so m_$i.cpp
-";
-               }
-               $install_list = $install_list . "       install -m \$(INSTMODE) src/modules/m_$i.so \$(MODPATH)\n";
-               $uninstall_list = $uninstall_list . "   -rm \$(MODULES)/m_$i.so\n";
-               ###
-               # End Write Entry to the MakeFile
-               ###
-       }
-
-       opendir(DIRHANDLE, "src/modules");
-       foreach my $name (sort readdir(DIRHANDLE)) {
-               if ($name =~ /^m_(.+?)$/) {
-                       $mfrules = "";
-                       $mobjs = "";
-                       $mliflags = "";
-                       $mfcount = 0;
-                       # A module made of multiple files, in a dir, e.g. src/modules/m_spanningtree/
-                       if (defined(opendir(MDIRHANDLE, "src/modules/$name"))) {
-                               read_module_directory("src/modules/$name", $name);
-                               print "Composing Makefile rules for directory \e[1;32m$name\e[0m... (\e[1;32m$mfcount files found\e[0m)\n";
-                               print FILEHANDLE "$name.so: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $mobjs\n";
-                               print FILEHANDLE "      \$(RUNCC) \$(FLAGS) $SHARED $mliflags -o $name.so $mobjs\n";
-                               print FILEHANDLE "\n$mfrules\n";
-                               closedir(MDIRHANDLE);
-                               $install_list = $install_list . "       install -m \$(INSTMODE) src/modules/$name.so \$(MODPATH)\n";
-                       }
-               }
-       }
-       closedir(DIRHANDLE);
-}
-
 sub read_module_directory {
        my ($dpath, $reldpath) = @_;
 
@@ -1513,7 +1383,7 @@ sub calcdeps($)
        return length($immutable) ? $immutable . " " . $retlist : $retlist;
 }
 
-sub write_dynamic_makefile
+sub prepare_dynamic_makefile
 {
        my $i = 0;
        my @cmdlist = ();
@@ -1528,7 +1398,7 @@ sub write_dynamic_makefile
                        $cmdlist[$i++] = $1;
                        $install_list = $install_list . "       -install -m \$(INSTMODE) src/commands/cmd_" . $1 . ".so \$(LIBPATH)\n";
                        $uninstall_list = $uninstall_list . "   -rm \$(LIBPATH)/cmd_$1.so\n";
-               }
+               }
        }
        closedir(DIRHANDLE);
 
@@ -1545,12 +1415,9 @@ sub write_dynamic_makefile
                $config{USE_PORTS} = 0;
        }
 
-       # formerly generated below this foreach, now it's not! magic.
-       my $all_core = "";
-
-       foreach my $dir (("src","src/commands","src/modes","src/socketengines","src/modules"))
+       foreach my $dir ("src/modules")
        {
-               print "Scanning \e[1;32m$dir\e[0m for core files ";
+               print "Scanning \e[1;32m$dir\e[0m for installation files ";
                opendir(DIRHANDLE, $dir);
                foreach my $name (sort readdir(DIRHANDLE))
                {
@@ -1561,22 +1428,7 @@ sub write_dynamic_makefile
                                while (defined(my $line = <CPP>))
                                {
                                        chomp($line);
-                                       if ($line =~ /\/\* \$Core \*\//i)
-                                       {
-                                               my $sname = $name;
-                                               $sname =~ s/\.cpp$/.o/;
-
-                                               # append it to list to be built
-                                               $all_core = $all_core . $sname . " ";
-                                               $filelist{$name} = $sname;
-
-                                               # mark it as a core file, so it won't get shared object cflags
-                                               if (!exists($core_files_list{$name}))
-                                               {
-                                                       $core_files_list{$name} = 1;
-                                               }
-                                       }
-                                       elsif ($line =~ /\/\* \$CopyInstall: (.*?) \*\//i)
+                                       if ($line =~ /\/\* \$CopyInstall: (.*?) \*\//i)
                                        {
                                                if (!exists($existing_install_list{$1}))
                                                {
@@ -1596,133 +1448,13 @@ sub write_dynamic_makefile
                print " done!\n";
        }
 
-       # modes need to be compiled in too
-       $all_core = $all_core . "modes/modeclasses.a";
-
-       my $freebsd4libs = (defined $config{CRAQ} ? $config{CRAQ} : "");
-
-       my $libraryext = "";
-       my $binary_rule = "";
-
        if ($config{IS_DARWIN} eq "YES")
        {
-               $libraryext = "dylib";
-               $binary_rule = "        \$(RUNCC) -dynamic -bind_at_load -L. -o inspircd \$(LDLIBS) inspircd.o "
+               $config{CORE_FLAGS} = '-dynamic -bind_at_load -L.';
        }
        else
        {
-               $libraryext = "so";
-               $binary_rule = "        \$(RUNCC) \$(FLAGS) $freebsd4libs -rdynamic -L. -o inspircd \$(LDLIBS) ";
-       }
-
-       open(FH,">src/Makefile") or die("Could not write src/Makefile");
-       print FH <<'EOM';
-
-CXXFLAGS = ${FLAGS}
-CPPFILES = $(shell /bin/ls -l modes/ | grep '\.cpp' | sed 's/^.* //' | grep -v svn)
-RELCPPFILES = $(shell /bin/ls -l modes/ | grep '\.cpp' | sed 's/^.* /modes\//' | grep -v svn)
-
-all:
-       @echo "Don't run make here! Run it in the parent directory"
-       false
-
-EOM
-
-       my $buildstring = "";
-       my $deps = "";
-
-       foreach my $cpp (sort keys %filelist)
-       {
-               my $objs = $cpp;
-               my $rawcpp = $cpp;
-               $objs =~ s/\.cpp$/.o/;
-               if (exists($extraobjects{$cpp}))
-               {
-                       $objs = $objs . " " . $extraobjects{$cpp};
-                       $all_core = $all_core . " " . $extraobjects{$cpp};
-               }
-               if (exists($extrasources{$cpp}))
-               {
-                       $rawcpp = $rawcpp . " " . $extrasources{$cpp};
-               }
-
-               $deps = calcdeps("src/$cpp");
-               if (exists($extrasources{$cpp}))
-               {
-                       foreach my $seperate (sort split(' ',$extrasources{$cpp}))
-                       {
-                               my $d = calcdeps("src/$extrasources{$cpp}") . " ";
-                               if ($d ne "")
-                               {
-                                       $deps = $deps . $d . " ";
-                               }
-                       }
-               }
-               $buildstring = $buildstring . $objs . ": $cpp $deps ". (defined($specialdeps{$cpp}) ? $specialdeps{$cpp} : "") . "\n";
-
-               if (exists($core_files_list{$cpp}))
-               {
-                       # core files are statically linked into the binary and do not require $SHARED shared libs switches
-                       $buildstring = $buildstring . " \$(RUNCC) \$(FLAGS) -c $rawcpp\n";
-               }
-               else
-               {
-                       $buildstring = $buildstring . " \$(RUNCC) \$(FLAGS) $SHARED -c $rawcpp\n";
-               }
-
-               if (exists($extrabuildlines{$cpp}))
-               {
-                       $buildstring = $buildstring . " " . $extrabuildlines{$cpp} . "\n";
-               }
-       }
-
-       print FH "inspircd: $all_core\n";
-       print FH "$binary_rule $all_core\n\n";
-
-       print FH $buildstring;
-       print FH <<'EOM';
-
-.PHONY: all commands
-
-commands:
-       @${MAKE} -C commands $(MAKEARGS) commands
-
-modes/modeclasses.a: $(RELCPPFILES) ../include/inspircd.h ../include/inspircd_config.h
-       @${MAKE} -C modes $(MAKEARGS) CPPFILES="$(CPPFILES)" modeclasses.a
-
-EOM
-
-       # close main makefile
-       close(FH);
-
-       my $cmdobjs = "";
-       # generate a list of .so
-       foreach my $cmd (@cmdlist) {
-               $cmdobjs = $cmdobjs . "cmd_$cmd.so ";
-       }
-
-       # and now reopen the commands makefile
-       open(FH,">src/commands/Makefile") or die("Could not write src/commands/Makefile");
-       print FH <<ITEM;
-CXXFLAGS = \${FLAGS}
-
-all:
-       \@echo "Don't run make here! Run it in the root directory"
-       false
-
-.PHONY: all commands
-
-commands: $cmdobjs
-
-ITEM
-
-       # now print the command file detail
-       foreach my $cmd (@cmdlist) {
-               print FH <<ITEM;
-cmd_$cmd.so: cmd_$cmd.cpp ../../include/base.h ../../include/modules.h ../../include/inspircd.h ../../include/channels.h ../../include/users.h ../../include/inspircd_config.h ../../include/commands/cmd_$cmd.h
-       \$(RUNCC) \$(FLAGS) $SHARED -o cmd_$cmd.so cmd_$cmd.cpp
-
-ITEM
+               $config{CORE_FLAGS} = (defined $config{CRAQ} ? $config{CRAQ}. ' ' : "").'-rdynamic -L.'
        }
 }
 

diff --git a/make/bsd-dep.mk b/make/bsd-dep.mk
index 5fe31e89f55bb2688a911bad0b312cffd12772f3..4d2f8e1dc8ef0032064eda7f913c56b6efabc3e0 100644 (file)
--- a/make/bsd-dep.mk
+++ b/make/bsd-dep.mk
@@ -1,7 +1,7 @@
-DFILES != perl -e 'print join " ", grep s/\.cpp/.d/, <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>'
+DFILES != perl -e 'print join " ", grep s/\.cpp/.d/, <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_spanningtree/*.cpp>'
 DFILES += socketengines/$(SOCKETENGINE).d threadengines/threadengine_pthread.d
 
-all: $(DFILES)
+alldep: $(DFILES)
 
 .SUFFIXES: .d .cpp
 

diff --git a/make/bsd-real.mk b/make/bsd-real.mk
index ea3e1482c2cacdfe64bc3b8ae8f10228b4e2b06a..4ae8343296c4a8c8c466d5506fdbd4d960fd6715 100644 (file)
--- a/make/bsd-real.mk
+++ b/make/bsd-real.mk
@@ -2,10 +2,13 @@ CORE_TARGS != perl -e 'print join " ", grep s/\.cpp/.o/, <*.cpp>'
 MODE_TARGS != perl -e 'print join " ", grep s/\.cpp/.o/, <modes/*.cpp>'
 CMD_TARGS != perl -e 'print join " ", grep s/\.cpp/.so/, <commands/*.cpp>'
 MOD_TARGS != perl -e 'print join " ", grep s/\.cpp/.so/, <modules/*.cpp>'
+SPANNINGTREE_TARGS != perl -e 'print join " ", grep s/\.cpp/.o/, <modules/m_spanningtree/*.cpp>'
+
 CORE_TARGS += modeclasses.a threadengines/threadengine_pthread.o
 CORE_TARGS += socketengines/$(SOCKETENGINE).o
+MOD_TARGS += modules/m_spanningtree.so
 
-DFILES != perl -e 'print join " ", grep s/\.cpp/.d/, <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>'
+DFILES != perl -e 'print join " ", grep s/\.cpp/.d/, <*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_spanningtree/*.cpp>'
 DFILES += socketengines/$(SOCKETENGINE).d threadengines/threadengine_pthread.d
 
 all: inspircd commands modules
@@ -17,8 +20,11 @@ modules: $(MOD_TARGS)
 modeclasses.a: $(MODE_TARGS)
        @../make/run-cc.pl ar crs modeclasses.a $(MODE_TARGS)
 
+modules/m_spanningtree.so: $(SPANNINGTREE_TARGS)
+       $(RUNCC) $(FLAGS) -shared -export-dynamic -o $@ $(SPANNINGTREE_TARGS)
+
 inspircd: $(CORE_TARGS)
-       $(RUNCC) $(FLAGS) -rdynamic -L. -o inspircd $(LDLIBS) $(CORE_TARGS)
+       $(RUNCC) $(FLAGS) $(CORE_FLAGS) -o inspircd $(LDLIBS) $(CORE_TARGS)
 
 .for FILE in $(DFILES)
 .include "$(FILE)"

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 2b6742be3d30720a9fe7423e43fa95ab409bd421..bcbb7cbd04f9c3a8374b56c575673333766efb8a 100755 (executable)
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -16,8 +16,10 @@ open OUT, '>', $out or die "Could not write $out: $!";
 my $cc_deps = qx($ENV{CC} $ENV{FLAGS} -MM $file);
 $cc_deps =~ s/.*?:\s*//;
 
-my $ext = $file =~ m#(modules|commands)/# ? '.so' : '.o';
+my $ext = $file =~ m#(modules|commands)/[^/]+$# ? '.so' : '.o';
 print OUT "$base$ext: $cc_deps";
 print OUT "\t@../make/unit-cc.pl \$(VERBOSE) $file $base$ext\n";
 print OUT "$base.d: $cc_deps";
+print OUT "\t\@\$(VDEP_IN)\n";
 print OUT "\t../make/calcdep.pl $file\n";
+print OUT "\t\@\$(VDEP_OUT)\n";

diff --git a/make/gnu-dep.mk b/make/gnu-dep.mk
index e8c70c0cd41ab38707de2f0c47eb7ed6b24a1399..f0ebb4d59b26a78c2aa71df970337928eb7c3c19 100644 (file)
--- a/make/gnu-dep.mk
+++ b/make/gnu-dep.mk
@@ -1,11 +1,3 @@
-DFILES = $(patsubst %.cpp,%.d,$(wildcard *.cpp))
-DFILES += $(patsubst %.cpp,%.d,$(wildcard commands/*.cpp))
-DFILES += $(patsubst %.cpp,%.d,$(wildcard modes/*.cpp))
-DFILES += $(patsubst %.cpp,%.d,$(wildcard modules/*.cpp))
-DFILES += socketengines/$(SOCKETENGINE).d threadengines/threadengine_pthread.d
+VDEP_OUT = echo -n .
 
-all: $(DFILES)
-
-%.d: %.cpp
-       @../make/calcdep.pl $<
-       @echo -n .
+include ../make/gnu-real.mk

diff --git a/make/gnu-real.mk b/make/gnu-real.mk
index 263467038694784f15c6c4f63cdb79e4699aebf6..c868aa93386668088a2d125b064dc5adab8609c6 100644 (file)
--- a/make/gnu-real.mk
+++ b/make/gnu-real.mk
@@ -2,17 +2,21 @@ CORE_TARGS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 MODE_TARGS = $(patsubst %.cpp,%.o,$(wildcard modes/*.cpp))
 CMD_TARGS = $(patsubst %.cpp,%.so,$(wildcard commands/*.cpp))
 MOD_TARGS = $(patsubst %.cpp,%.so,$(wildcard modules/*.cpp))
+SPANNINGTREE_TARGS = $(patsubst %.cpp,%.o,$(wildcard modules/m_spanningtree/*.cpp))
 
 CORE_TARGS += modeclasses.a threadengines/threadengine_pthread.o
 CORE_TARGS += socketengines/$(SOCKETENGINE).o
+MOD_TARGS += modules/m_spanningtree.so
 
 DFILES = $(patsubst %.cpp,%.d,$(wildcard *.cpp))
 DFILES += $(patsubst %.cpp,%.d,$(wildcard commands/*.cpp))
 DFILES += $(patsubst %.cpp,%.d,$(wildcard modes/*.cpp))
 DFILES += $(patsubst %.cpp,%.d,$(wildcard modules/*.cpp))
+DFILES += $(patsubst %.cpp,%.d,$(wildcard modules/m_spanningtree/*.cpp))
 DFILES += socketengines/$(SOCKETENGINE).d threadengines/threadengine_pthread.d
 
 all: inspircd commands modules
+alldep: $(DFILES)
 
 commands: $(CMD_TARGS)
 
@@ -21,12 +25,17 @@ modules: $(MOD_TARGS)
 modeclasses.a: $(MODE_TARGS)
        @../make/run-cc.pl ar crs modeclasses.a $(MODE_TARGS)
 
+modules/m_spanningtree.so: $(SPANNINGTREE_TARGS)
+       $(RUNCC) $(FLAGS) -shared -export-dynamic -o $@ $(SPANNINGTREE_TARGS)
+
 inspircd: $(CORE_TARGS)
-       $(RUNCC) $(FLAGS) -rdynamic -L. -o inspircd $(LDLIBS) $(CORE_TARGS)
+       $(RUNCC) $(FLAGS) $(CORE_FLAGS) -o inspircd $(LDLIBS) $(CORE_TARGS)
 
 %.d: %.cpp
+       @$(VDEP_IN)
        @../make/calcdep.pl $<
+       @$(VDEP_OUT)
 
-.PHONY: all commands modules
+.PHONY: all alldep commands modules
 
 -include $(DFILES)

diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index 93599c4d4dbe40a89cb3e2e99a8d753adc8236e8..304a230010817a69ea675ba0e2efe28c3ad067b4 100644 (file)
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/admin.cpp b/src/modules/m_spanningtree/admin.cpp
index a137d22f6978444d98aeb4705cefc03ea684ef2e..d58af5caf0448fb842df3b7bc9bc163abe0a8f28 100644 (file)
--- a/src/modules/m_spanningtree/admin.cpp
+++ b/src/modules/m_spanningtree/admin.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/cachetimer.cpp b/src/modules/m_spanningtree/cachetimer.cpp
index 157d7a09da005b1910f1bba5eadf25ba5952dd9b..7168e9eed9f1c085cfe48208e9ecd695f8c1dc7f 100644 (file)
--- a/src/modules/m_spanningtree/cachetimer.cpp
+++ b/src/modules/m_spanningtree/cachetimer.cpp
@@ -16,14 +16,14 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/cachetimer.h"
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
+#include "cachetimer.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/cachetimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 7981bc2a5ca7ad3a7541116463fd788878c50d86..aa4ab5e0354d6aaf3aa54613924354cb1bf2b0f8 100644 (file)
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -14,10 +14,10 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/main.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
+#include "main.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/delline.cpp b/src/modules/m_spanningtree/delline.cpp
index 6a62394c1458d9ee60743ee5f4dd65c78fe9f22e..fc0a51ce899d47beaebeb6410989d45e73926803 100644 (file)
--- a/src/modules/m_spanningtree/delline.cpp
+++ b/src/modules/m_spanningtree/delline.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 6902c63e0bd82fd26fc287e232b614711c6563df..c1f8081c898328be4ecec0c33494126a746cf1ed 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/fhost.cpp b/src/modules/m_spanningtree/fhost.cpp
index 3337a9cbaaca7acc2e9992ce99d385ff241979ac..f2d5a38880148a6f90b374f51037e14855805d3d 100644 (file)
--- a/src/modules/m_spanningtree/fhost.cpp
+++ b/src/modules/m_spanningtree/fhost.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 28a922c0f56de341f52d7c8141d112dda27b87e1..4367186b9e5ccf2fba4cd776cf3e63380c10385a 100644 (file)
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index 2d9c37339820903cf935f062eb6a5dc0af9b166b..880f250860a2d120f4524764bfe98f3c99571db5 100644 (file)
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/fname.cpp b/src/modules/m_spanningtree/fname.cpp
index 3bb62555f79bca814e93483cbbd7799b3b62dc11..656b6836319b5024691109f8c6ec96278e80329a 100644 (file)
--- a/src/modules/m_spanningtree/fname.cpp
+++ b/src/modules/m_spanningtree/fname.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index 99816e64acaf2f17fa265ebc3a26b8e4c997338d..8ba5f90ab177e43f47850b694d60684adad1eb84 100644 (file)
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/handshaketimer.cpp b/src/modules/m_spanningtree/handshaketimer.cpp
index 14b27472c1724f59222955d7e65f03ff6e156a4a..1b3b1dd2227ba16176fa6de18d78f167fcdd0480 100644 (file)
--- a/src/modules/m_spanningtree/handshaketimer.cpp
+++ b/src/modules/m_spanningtree/handshaketimer.cpp
@@ -16,14 +16,14 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "handshaketimer.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index 50b7db9df64ba5ce39999a3b3e2f5a91f5bca0ec..62cf5c114177445f05ad9e94d71939c224aaf446 100644 (file)
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -16,17 +16,17 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
-#include "m_hash.h"
+#include "../transport.h"
+#include "../m_hash.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "resolvers.h"
+#include "handshaketimer.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.h */
 

diff --git a/src/modules/m_spanningtree/kill.cpp b/src/modules/m_spanningtree/kill.cpp
index ea5cca6fe88fe1c71b44cbca2fd7d602e19e767a..79852422110298d6a0d5aab9582f4303343ac578 100644 (file)
--- a/src/modules/m_spanningtree/kill.cpp
+++ b/src/modules/m_spanningtree/kill.cpp
@@ -15,9 +15,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 45aea56ecaff11096f3b55aff12166e595e238a1..94f0841257dc7afccb93e4d7e05eade36100eea7 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -18,18 +18,18 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
-
-#include "m_spanningtree/cachetimer.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/rconnect.h"
-#include "m_spanningtree/rsquit.h"
-#include "m_spanningtree/protocolinterface.h"
+#include "../transport.h"
+
+#include "cachetimer.h"
+#include "resolvers.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "rconnect.h"
+#include "rsquit.h"
+#include "protocolinterface.h"
 
 /* $ModDep: m_spanningtree/cachetimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h m_spanningtree/protocolinterface.h */
 

diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index 2fb9624468e7d7247ec6d71fd59d734d67f7569c..72aff001279b4db4e72b648ea35acd1f90dfda0a 100644 (file)
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/modules.cpp b/src/modules/m_spanningtree/modules.cpp
index e19dd3326781709a9ac71b97be7022dde1515724..70709eb40890976192fedc6446f776e121818f8f 100644 (file)
--- a/src/modules/m_spanningtree/modules.cpp
+++ b/src/modules/m_spanningtree/modules.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/motd.cpp b/src/modules/m_spanningtree/motd.cpp
index 41fd951e869076b7945b145915a40be831f2ef67..66de93e187e9e103863a9628a3e8b8fbcb89049e 100644 (file)
--- a/src/modules/m_spanningtree/motd.cpp
+++ b/src/modules/m_spanningtree/motd.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index 6d26f13fc8f656cdb7452f3cd9e8990154f2c621..1601cd6e653d61386d597f944794af909d62bd6e 100644 (file)
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 827befeaa55506a58c1a67214ee7f80ab3923c04..9661200db7f73215dc7dfc3c14a36f5e29748d06 100644 (file)
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/operquit.cpp b/src/modules/m_spanningtree/operquit.cpp
index caf91f7671fc24ad038524aeef7d75f95b06dc8e..bbaa2cb628f110cedbbca75f849e7699f3d3d58d 100644 (file)
--- a/src/modules/m_spanningtree/operquit.cpp
+++ b/src/modules/m_spanningtree/operquit.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 18f3a6f9c07c505a7ea710972641bb02edaf9b4e..54d4127b3b6dc8c8f5c61110ccefe6ff39b8db7c 100644 (file)
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/override_admin.cpp b/src/modules/m_spanningtree/override_admin.cpp
index 42c9251dd868ed6eae7a69074d2d8ab9535a7f1f..d9649ff9cf1f63979af42af3338901546392a1f9 100644 (file)
--- a/src/modules/m_spanningtree/override_admin.cpp
+++ b/src/modules/m_spanningtree/override_admin.cpp
@@ -18,12 +18,12 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index 63e60f07ad207990fe864b283c18530eacf19669..b49417f8a9220de06aecf6546d9987662499d9b9 100644 (file)
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -15,10 +15,10 @@
 
 #include "inspircd.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/override_modules.cpp b/src/modules/m_spanningtree/override_modules.cpp
index 598750aa29adfc987abe11c5ba9d92cf4970d9c4..154b4684c26b65f8d82847b061726132a5387a48 100644 (file)
--- a/src/modules/m_spanningtree/override_modules.cpp
+++ b/src/modules/m_spanningtree/override_modules.cpp
@@ -18,12 +18,12 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/override_motd.cpp b/src/modules/m_spanningtree/override_motd.cpp
index 686fef44873ca4385d64fc4b57bdd69832ee7e30..23e835f785945141e7da9d787f85c2e1fd71337d 100644 (file)
--- a/src/modules/m_spanningtree/override_motd.cpp
+++ b/src/modules/m_spanningtree/override_motd.cpp
@@ -18,12 +18,12 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp
index c82db3bed274d83f6e0bcba4343607749c41d5eb..829c698808ac0ed2960ffbcb91824307e90fdd23 100644 (file)
--- a/src/modules/m_spanningtree/override_squit.cpp
+++ b/src/modules/m_spanningtree/override_squit.cpp
@@ -18,12 +18,12 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/override_stats.cpp b/src/modules/m_spanningtree/override_stats.cpp
index 0f1e2bd6c8746bb8b43be46e966e769912a6078f..4bde25fbe60c05e806c6617199b33f64c816dabd 100644 (file)
--- a/src/modules/m_spanningtree/override_stats.cpp
+++ b/src/modules/m_spanningtree/override_stats.cpp
@@ -18,13 +18,13 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/override_time.cpp b/src/modules/m_spanningtree/override_time.cpp
index 8f5f3aa7f911dc3a48882d0752d1fa8b5bcab594..bd1c5d48903a85df7195793f6d828bf218cb85da 100644 (file)
--- a/src/modules/m_spanningtree/override_time.cpp
+++ b/src/modules/m_spanningtree/override_time.cpp
@@ -18,12 +18,12 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/override_whois.cpp b/src/modules/m_spanningtree/override_whois.cpp
index a68cdc42f78812cdcee192568489ab128734cb57..9302ac50fccd71a33c3f76aa88fdc9ff00225355 100644 (file)
--- a/src/modules/m_spanningtree/override_whois.cpp
+++ b/src/modules/m_spanningtree/override_whois.cpp
@@ -18,12 +18,12 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/ping.cpp b/src/modules/m_spanningtree/ping.cpp
index 1e1c3611f57e557684bc62454797a53e914066ab..e268be7acba3bddd9a54ba4ecb29f3a175bcf68a 100644 (file)
--- a/src/modules/m_spanningtree/ping.cpp
+++ b/src/modules/m_spanningtree/ping.cpp
@@ -16,13 +16,13 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/pong.cpp b/src/modules/m_spanningtree/pong.cpp
index 9354caa2e020d8041dd9129d3b49dc22ece710b3..8e1c08e984c2ed7b9a76b9de3d34e650d0929a64 100644 (file)
--- a/src/modules/m_spanningtree/pong.cpp
+++ b/src/modules/m_spanningtree/pong.cpp
@@ -16,13 +16,13 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index d05d42d802aa9db2edf6c450de17e286a12f3370..2bf252cc034d7fb2a167920d0b228feec334109e 100644 (file)
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -18,12 +18,12 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/precommand.cpp b/src/modules/m_spanningtree/precommand.cpp
index 6b88c07d1b3a51bb1f104c01880c81469e76f5da..86b31143eaae38a61db74df8bab422904b9a515d 100644 (file)
--- a/src/modules/m_spanningtree/precommand.cpp
+++ b/src/modules/m_spanningtree/precommand.cpp
@@ -18,12 +18,12 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/privmsg.cpp b/src/modules/m_spanningtree/privmsg.cpp
index c1fedcd69c73d5b307b7477e1ccce3ef6fa0c84a..b9b62ad006df4ad89038b9f950fe2215e85bbb1f 100644 (file)
--- a/src/modules/m_spanningtree/privmsg.cpp
+++ b/src/modules/m_spanningtree/privmsg.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index 7486662592a1855330bd784218311724988ec9e5..722b7c543994ff5b62517144b992b059962aded6 100644 (file)
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -1,9 +1,9 @@
 #include "inspircd.h"
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/protocolinterface.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
+#include "protocolinterface.h"
 
 /*
  * For documentation on this class, see include/protocol.h.

diff --git a/src/modules/m_spanningtree/push.cpp b/src/modules/m_spanningtree/push.cpp
index b25a509219cc54832e4f48db0b82b8d2a0d7bfdc..01e2481bbb589c6ad9c8c7db8040a87bef75fa49 100644 (file)
--- a/src/modules/m_spanningtree/push.cpp
+++ b/src/modules/m_spanningtree/push.cpp
@@ -16,13 +16,13 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp
index b31797675155c0fe9b6e7665623d606dff0a6c0e..3275d057e2b3a587a714f1376603e5b8e2922036 100644 (file)
--- a/src/modules/m_spanningtree/rconnect.cpp
+++ b/src/modules/m_spanningtree/rconnect.cpp
@@ -16,15 +16,15 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/rconnect.h"
+#include "resolvers.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "rconnect.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h */
 

diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index b4b476909e809b3f618f9cedc1583b54e48e04bd..51197cb11f908eb193f784c657ce5a14a9c7dbfe 100644 (file)
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -16,14 +16,14 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
+#include "resolvers.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h
index 046d4aa540a4c6c4b0fda2114350a78e4f61bf2f..0b82bfd99c1c85c108f9b5932d55b88e68112cca 100644 (file)
--- a/src/modules/m_spanningtree/resolvers.h
+++ b/src/modules/m_spanningtree/resolvers.h
@@ -19,10 +19,10 @@
 #include "socket.h"
 #include "inspircd.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/link.h"
+#include "utils.h"
+#include "link.h"
 
 /** Handle resolving of server IPs for the cache
  */

diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index cd671350daf4ebd71af68d76b325c4c766505d57..e64a262ca02fbf79f13b84fa66510e9f51d5bd86 100644 (file)
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -16,13 +16,13 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/rsquit.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
+#include "rsquit.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h m_spanningtree/rsquit.h */
 

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index fcf3bbfa06761584cdd30f7d49d44c1d64189d6c..cb6e6dcda81b4f4b822d92875aa1c33397a29c08 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -16,14 +16,14 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "link.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h m_spanningtree/link.h */
 

diff --git a/src/modules/m_spanningtree/stats.cpp b/src/modules/m_spanningtree/stats.cpp
index 4ab084374cfcd905e677d19cd5325830b4affda3..7c9efecde3d34621c9196940c400c3884a0c1507 100644 (file)
--- a/src/modules/m_spanningtree/stats.cpp
+++ b/src/modules/m_spanningtree/stats.cpp
@@ -16,14 +16,14 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/svsjoin.cpp b/src/modules/m_spanningtree/svsjoin.cpp
index 38ba687ccb747b5588ae7c7f063a9648ed8fcdf9..40aa80392ba159f84eb3a0174f38ee55c280944c 100644 (file)
--- a/src/modules/m_spanningtree/svsjoin.cpp
+++ b/src/modules/m_spanningtree/svsjoin.cpp
@@ -16,13 +16,13 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index 14e078710e82a56ee3a9f8fb33d4d416648196b2..cb4977740f66768d305d26d279a9db3880971f9e 100644 (file)
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -16,13 +16,13 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/svspart.cpp b/src/modules/m_spanningtree/svspart.cpp
index 527a44f0d48221f6663bdea49eb05b023ea1b96a..8d95395ed18555b4d4e9190e191c52f701e627c6 100644 (file)
--- a/src/modules/m_spanningtree/svspart.cpp
+++ b/src/modules/m_spanningtree/svspart.cpp
@@ -16,13 +16,13 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/time.cpp b/src/modules/m_spanningtree/time.cpp
index fb88f0a41658a046da8302a2030fe08132cb05e2..006260a8951d5adb7b9984d95882f3842f67ed3a 100644 (file)
--- a/src/modules/m_spanningtree/time.cpp
+++ b/src/modules/m_spanningtree/time.cpp
@@ -16,13 +16,13 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index a9f61221d5f7639124abe4b7ab4a03598488678a..b6ec7a3055577691c669c3a9dbaee2b732525867 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -16,10 +16,10 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
+#include "utils.h"
+#include "treeserver.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h */
 

diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index ed408b008a249a206cb0fe86cbe489c47e5385de..de9c78fef42bd48d9c62e066f1f411493321dd67 100644 (file)
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -19,10 +19,10 @@
 #include "socket.h"
 #include "inspircd.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "utils.h"
+#include "handshaketimer.h"
 
 /*
  * The server list in InspIRCd is maintained as two structures

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 8b6ffb60e9c7b30303cf0590ee20bf1929c6dcf0..e98246a3559de58c5b2fe03dfc2d1aa604ffc6e2 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -16,17 +16,17 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
-#include "m_hash.h"
+#include "../transport.h"
+#include "../m_hash.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "resolvers.h"
+#include "handshaketimer.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.h m_spanningtree/handshaketimer.h */
 

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 735a4d31e0e1cdb1bbf81e9d5a5f2889fbd94edb..b117ebe822fc34c8c14ea28c5387ae36124d1dd8 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -16,16 +16,16 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "resolvers.h"
+#include "handshaketimer.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/handshaketimer.h */
 

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 72fd66f95d8d03e268083945490a877ee366eb58..f8efbfd2400f5be935940d8a8760893bfa89666f 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -13,13 +13,13 @@
 
 #include "inspircd.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "resolvers.h"
+#include "handshaketimer.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.h m_spanningtree/handshaketimer.h */
 

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 46769a6f44438601fa3263b7692cfd13667483e6..116ac741fff050617dc21d16498540c1ff490648 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -16,15 +16,15 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "resolvers.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/version.cpp b/src/modules/m_spanningtree/version.cpp
index e8af0af35ae1723512af2569130e6bd0fced6557..4f8391148194f9cf66dc376286dca5c927338f64 100644 (file)
--- a/src/modules/m_spanningtree/version.cpp
+++ b/src/modules/m_spanningtree/version.cpp
@@ -16,13 +16,13 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 

diff --git a/src/modules/m_spanningtree/whois.cpp b/src/modules/m_spanningtree/whois.cpp
index ee316ff5eb4e3eb110775aca638fb58cd29eba08..85f186c40ed695c6180b7e7161ab82396e846f47 100644 (file)
--- a/src/modules/m_spanningtree/whois.cpp
+++ b/src/modules/m_spanningtree/whois.cpp
@@ -16,13 +16,13 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */