Add parameters to OnSendWhoLine hook, fixes "/who * o" returning opers with +H

[user/henk/code/inspircd.git] / make / calcdep.pl

diff --git a/make/calcdep.pl b/make/calcdep.pl
index e042c49d8c62bd59047d35cde8ed6f3a2f08597a..55e0630fc80da3497470661fdd98a7dfde843282 100755 (executable)
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use POSIX qw(getcwd);
 
-sub find_output($);
+sub find_output;
 sub gendep($);
 sub dep_cpp($$);
 sub dep_dir($);
@@ -28,26 +28,42 @@ sub run() {
        open MAKE, '>real.mk' or die "Could not write real.mk: $!";
        chdir "$ENV{SOURCEPATH}/src";
 
+       if ($ENV{PURE_STATIC}) {
+               run_static();
+       } else {
+               run_dynamic();
+       }
+       close MAKE;
+}
+
+sub run_dynamic() {
+       my $build = $ENV{BUILDPATH};
        print MAKE <<END;
-# DO NOT EDIT
-# Autogenerated by calcdep
+# DO NOT EDIT THIS FILE
+# It is autogenerated by make/calcdep.pl, and will be overwritten
+# every time you rerun make in the main directory
 VPATH = \$(SOURCEPATH)/src
 
-all: bin/inspircd modules
+bad-target:
+       \@echo "This Makefile must be run by a sub-make from the source"
+       \@echo "in order to set the correct environment variables"
+       \@exit 1
+
+all: inspircd commands modules
 
 END
-       my @core_deps;
-       for my $file (<*.cpp>, <modes/*.cpp>, "socketengines/$ENV{SOCKETENGINE}.cpp", "threadengines/threadengine_pthread.cpp") {
+       my(@core_deps, @cmdlist, @modlist);
+       for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, "threadengines/threadengine_pthread.cpp") {
                my $out = find_output $file;
                dep_cpp $file, $out;
+               next if $file =~ m#^socketengines/# && $file ne "socketengines/$ENV{SOCKETENGINE}.cpp";
                push @core_deps, $out;
        }
-       
-       my @modlist;
+
        for my $file (<commands/*.cpp>) {
                my $out = find_output $file;
                dep_cpp $file, $out;
-               push @modlist, $out;
+               push @cmdlist, $out;
        }
 
        opendir my $moddir, 'modules';
@@ -71,6 +87,7 @@ END
        }
        
        my $core_mk = join ' ', @core_deps;
+       my $cmds = join ' ', @cmdlist;
        my $mods = join ' ', @modlist;
        print MAKE <<END;
 
@@ -78,18 +95,66 @@ bin/inspircd: $core_mk
        \$(RUNCC) -o \$\@ \$(CORELDFLAGS) \$(LDLIBS) \$^ \$>
 
 inspircd: bin/inspircd
+
+commands: $cmds
+
 modules: $mods
 
-.PHONY: inspircd modules
+.PHONY: all bad-target inspircd commands modules
+
+END
+}
+
+sub run_static() {
+       print MAKE <<END;
+# DO NOT EDIT THIS FILE
+# It is autogenerated by make/calcdep.pl, and will be overwritten
+# every time you rerun make in the main directory
+VPATH = \$(SOURCEPATH)/src
+
+bad-target:
+       \@echo "This Makefile must be run by a sub-make from the source"
+       \@echo "in order to set the correct environment variables"
+       \@exit 1
+
+all: inspircd
+
+END
+       my(@deps, @srcs);
+       for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, <commands/*.cpp>,
+                       <modules/*.cpp>, <modules/m_*/*.cpp>, "threadengines/threadengine_pthread.cpp") {
+               my $out = find_output $file, 1;
+               if ($out =~ m#obj/([^/]+)/[^/]+.o$#) {
+                       mkdir "$ENV{BUILDPATH}/obj/$1";
+               }
+               dep_cpp $file, $out;
+               next if $file =~ m#^socketengines/# && $file ne "socketengines/$ENV{SOCKETENGINE}.cpp";
+               push @deps, $out;
+               push @srcs, $file;
+       }
+
+       my $core_mk = join ' ', @deps;
+       my $core_src = join ' ', @srcs;
+       print MAKE <<END;
+
+obj/ld-extra.cmd: $core_src
+       \@\$(SOURCEPATH)/make/unit-cc.pl -f\$(VERBOSE) \$\@ \$^ \$>
+
+bin/inspircd: obj/ld-extra.cmd $core_mk
+       \@\$(SOURCEPATH)/make/unit-cc.pl -l\$(VERBOSE) \$\@ \$^ \$>
+
+inspircd: bin/inspircd
+
+.PHONY: all bad-target inspircd
 
 END
 }
 
-sub find_output($) {
-       my $file = shift;
+sub find_output {
+       my($file, $static) = @_;
        my($path,$base) = $file =~ m#^((?:.*/)?)([^/]+)\.cpp# or die "Bad file $file";
        if ($path eq 'modules/' || $path eq 'commands/') {
-               return "modules/$base.so";
+               return $static ? "obj/$base.o" : "modules/$base.so";
        } elsif ($path eq '' || $path eq 'modes/' || $path =~ /^[a-z]+engines\/$/) {
                return "obj/$base.o";
        } elsif ($path =~ m#modules/(m_.*)/#) {
@@ -147,7 +212,7 @@ sub dep_dir($) {
        my($dir) = @_;
        my @ofiles;
        opendir DIR, $dir;
-       for my $file (readdir DIR) {
+       for my $file (sort readdir DIR) {
                next unless $file =~ /(.*)\.cpp$/;
                my $ofile = find_output "$dir/$file";
                dep_cpp "$dir/$file", $ofile;