Fix a bunch of harmless compiler warnings on recent GCC releases.

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

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 882e75f22ea9611172aeab133a7ea8936bec182e..5dc0f687821094c8b8e5cadbcb6d67b93ea22fa3 100755 (executable)
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -30,6 +30,8 @@ BEGIN {
 use strict;
 use warnings FATAL => qw(all);
 
+use File::Basename qw(basename);
+
 use constant {
        BUILDPATH  => $ENV{BUILDPATH},
        SOURCEPATH => $ENV{SOURCEPATH}
@@ -57,11 +59,7 @@ sub run() {
        open MAKE, '>real.mk' or die "Could not write real.mk: $!";
        chdir "${\SOURCEPATH}/src";
 
-       if ($ENV{INSPIRCD_STATIC}) {
-               run_static();
-       } else {
-               run_dynamic();
-       }
+       run_dynamic();
        close MAKE;
 }
 
@@ -81,7 +79,7 @@ all: inspircd modules
 
 END
        my(@core_deps, @modlist);
-       for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, "threadengines/threadengine_pthread.cpp") {
+       for my $file (<*.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/socketengine_$ENV{SOCKETENGINE}.cpp";
@@ -131,56 +129,11 @@ modules: $mods
 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>, <coremods/*.cpp>, <coremods/core_*/*.cpp>,
-                       <modules/*.cpp>, <modules/m_*/*.cpp>, "threadengines/threadengine_pthread.cpp") {
-               my $out = find_output $file, 1;
-               if ($out =~ m#obj/([^/]+)/[^/]+.o$#) {
-                       mkdir "${\BUILDPATH}/obj/$1";
-               }
-               dep_cpp $file, $out, 'gen-o';
-               next if $file =~ m#^socketengines/# && $file ne "socketengines/socketengine_$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 gen-ld \$\@ \$^ \$>
-
-bin/inspircd: obj/ld-extra.cmd $core_mk
-       \@\$(SOURCEPATH)/make/unit-cc.pl static-ld \$\@ \$^ \$>
-
-inspircd: bin/inspircd
-
-.PHONY: all bad-target inspircd
-
-END
-}
-
 sub find_output {
-       my($file, $static) = @_;
+       my $file = shift;
        my($path,$base) = $file =~ m#^((?:.*/)?)([^/]+)\.cpp# or die "Bad file $file";
        if ($path eq 'modules/' || $path eq 'coremods/') {
-               return $static ? "obj/$base.o" : "modules/$base.so";
+               return "modules/$base.so";
        } elsif ($path eq '' || $path eq 'modes/' || $path =~ /^[a-z]+engines\/$/) {
                return "obj/$base.o";
        } elsif ($path =~ m#modules/(m_.*)/# || $path =~ m#coremods/(core_.*)/#) {
@@ -238,6 +191,10 @@ sub dep_so($) {
        my($file) = @_;
        my $out = find_output $file;
 
+       my $name = basename $out, '.so';
+       print MAKE ".PHONY: $name\n";
+       print MAKE "$name: $out\n";
+
        dep_cpp $file, $out, 'gen-so';
        return $out;
 }
@@ -255,6 +212,9 @@ sub dep_dir($$) {
        closedir DIR;
        if (@ofiles) {
                my $ofiles = join ' ', @ofiles;
+               my $name = basename $outdir;
+               print MAKE ".PHONY: $name\n";
+               print MAKE "$name: $outdir.so\n";
                print MAKE "$outdir.so: $ofiles\n";
                print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl link-dir \$\@ ${\SOURCEPATH}/src/$dir \$^ \$>\n";
                return 1;