Rename <options:moronbanner> to <options:xlinemessage>.

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

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 873b228cab0c531727394727439c0a94e1d3b928..26be367f5b974896097f201ad661053f34934a00 100755 (executable)
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -78,7 +78,7 @@ END
        for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, "threadengines/threadengine_pthread.cpp") {
                my $out = find_output $file;
                dep_cpp $file, $out, 'gen-o';
-               next if $file =~ m#^socketengines/# && $file ne "socketengines/$ENV{SOCKETENGINE}.cpp";
+               next if $file =~ m#^socketengines/# && $file ne "socketengines/socketengine_$ENV{SOCKETENGINE}.cpp";
                push @core_deps, $out;
        }
 
@@ -148,7 +148,7 @@ END
                        mkdir "$ENV{BUILDPATH}/obj/$1";
                }
                dep_cpp $file, $out, 'gen-o';
-               next if $file =~ m#^socketengines/# && $file ne "socketengines/$ENV{SOCKETENGINE}.cpp";
+               next if $file =~ m#^socketengines/# && $file ne "socketengines/socketengine_$ENV{SOCKETENGINE}.cpp";
                push @deps, $out;
                push @srcs, $file;
        }
@@ -199,7 +199,7 @@ sub gendep($) {
        while (<$in>) {
                if (/^\s*#\s*include\s*"([^"]+)"/) {
                        my $inc = $1;
-                       next if $inc eq 'inspircd_version.h' && $f eq '../include/inspircd.h';
+                       next if $inc eq 'config.h' && $f eq '../include/inspircd.h';
                        my $found = 0;
                        for my $loc ("$basedir/$inc", "../include/$inc") {
                                next unless -e $loc;
@@ -225,7 +225,7 @@ sub dep_cpp($$$) {
        gendep $file;
 
        print MAKE "$out: $file $f2dep{$file}\n";
-       print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl $type\$(VERBOSE) \$\@ \$< \$>\n";
+       print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl $type\$(VERBOSE) \$\@ \$(SOURCEPATH)/src/$file \$>\n";
 }
 
 sub dep_so($) {
@@ -236,7 +236,7 @@ sub dep_so($) {
        if ($ENV{SPLIT_CC}) {
                dep_cpp $file, $split, 'gen-o';
                print MAKE "$out: $split\n";
-               print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl link-so\$(VERBOSE) \$\@ \$< \$>\n";
+               print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl link-so\$(VERBOSE) \$\@ \$(SOURCEPATH)/src/$file \$>\n";
        } else {
                dep_cpp $file, $out, 'gen-so';
        }