diff options
62 files changed, 305 insertions, 563 deletions
diff --git a/.Makefile.inc b/.Makefile.inc index 2e9b3e635..2d5231eae 100644 --- 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 @@ -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 5fe31e89f..4d2f8e1dc 100644 --- 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 ea3e1482c..4ae834329 100644 --- 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 2b6742be3..bcbb7cbd0 100755 --- 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 e8c70c0cd..f0ebb4d59 100644 --- 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 263467038..c868aa933 100644 --- 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 93599c4d4..304a23001 100644 --- 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 a137d22f6..d58af5caf 100644 --- 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 157d7a09d..7168e9eed 100644 --- 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 7981bc2a5..aa4ab5e03 100644 --- 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 6a62394c1..fc0a51ce8 100644 --- 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 6902c63e0..c1f8081c8 100644 --- 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 3337a9cba..f2d5a3888 100644 --- 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 28a922c0f..4367186b9 100644 --- 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 2d9c37339..880f25086 100644 --- 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 3bb62555f..656b68363 100644 --- 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 99816e64a..8ba5f90ab 100644 --- 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 14b27472c..1b3b1dd22 100644 --- 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 50b7db9df..62cf5c114 100644 --- 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 ea5cca6fe..798524221 100644 --- 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 45aea56ec..94f084125 100644 --- 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 2fb962446..72aff0012 100644 --- 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 e19dd3326..70709eb40 100644 --- 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 41fd951e8..66de93e18 100644 --- 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 6d26f13fc..1601cd6e6 100644 --- 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 827befeaa..9661200db 100644 --- 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 caf91f767..bbaa2cb62 100644 --- 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 18f3a6f9c..54d4127b3 100644 --- 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 42c9251dd..d9649ff9c 100644 --- 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 63e60f07a..b49417f8a 100644 --- 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 598750aa2..154b4684c 100644 --- 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 686fef448..23e835f78 100644 --- 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 c82db3bed..829c69880 100644 --- 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 0f1e2bd6c..4bde25fbe 100644 --- 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 8f5f3aa7f..bd1c5d489 100644 --- 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 a68cdc42f..9302ac50f 100644 --- 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 1e1c3611f..e268be7ac 100644 --- 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 9354caa2e..8e1c08e98 100644 --- 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 d05d42d80..2bf252cc0 100644 --- 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 6b88c07d1..86b31143e 100644 --- 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 c1fedcd69..b9b62ad00 100644 --- 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 748666259..722b7c543 100644 --- 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 b25a50921..01e2481bb 100644 --- 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 b31797675..3275d057e 100644 --- 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 b4b476909..51197cb11 100644 --- 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 046d4aa54..0b82bfd99 100644 --- 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 cd671350d..e64a262ca 100644 --- 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 fcf3bbfa0..cb6e6dcda 100644 --- 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 4ab084374..7c9efecde 100644 --- 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 38ba687cc..40aa80392 100644 --- 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 14e078710..cb4977740 100644 --- 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 527a44f0d..8d95395ed 100644 --- 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 fb88f0a41..006260a89 100644 --- 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 a9f61221d..b6ec7a305 100644 --- 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 ed408b008..de9c78fef 100644 --- 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 8b6ffb60e..e98246a35 100644 --- 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 735a4d31e..b117ebe82 100644 --- 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 72fd66f95..f8efbfd24 100644 --- 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 46769a6f4..116ac741f 100644 --- 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 e8af0af35..4f8391148 100644 --- 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 ee316ff5e..85f186c40 100644 --- 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 */ |