Write out the permchannels database on a timer, not on every mode change

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

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 587bd64dea63d48858606359345a71801dda8f0c..2ae03cc364c22681e3bfd9d02c42817ed4d8c22b 100755 (executable)
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 use strict;
 use warnings;
 use POSIX qw(getcwd);
@@ -100,7 +100,7 @@ commands: $cmds
 
 modules: $mods
 
-.PHONY: inspircd commands modules
+.PHONY: all bad-target inspircd commands modules
 
 END
 }
@@ -120,20 +120,28 @@ bad-target:
 all: inspircd
 
 END
-       my @deps;
+       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;
 
-bin/inspircd: $core_mk
-       \$(RUNCC) -o \$\@ \$(CORELDFLAGS) \$(LDLIBS) \$^ \$>
+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