Fix null dereference caused by tracking dummy

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

diff --git a/make/calcdep.pl b/make/calcdep.pl
index d9242b098a8de05b951f16a326e5568841b2d4ec..2a0ea5d92a7390112b8935810c2c481abf0bb1cd 100755 (executable)
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -33,21 +33,21 @@ sub run() {
 # Autogenerated by calcdep
 VPATH = \$(SOURCEPATH)/src
 
-all: bin/inspircd modules
+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 +71,7 @@ END
        }
        
        my $core_mk = join ' ', @core_deps;
+       my $cmds = join ' ', @cmdlist;
        my $mods = join ' ', @modlist;
        print MAKE <<END;
 
@@ -78,9 +79,12 @@ bin/inspircd: $core_mk
        \$(RUNCC) -o \$\@ \$(CORELDFLAGS) \$(LDLIBS) \$^ \$>
 
 inspircd: bin/inspircd
+
+commands: $cmds
+
 modules: $mods
 
-.PHONY: inspircd modules
+.PHONY: inspircd commands modules
 
 END
 }