1 files changed, 53 insertions, 55 deletions

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 376d19573..99355efa4 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -19,9 +19,21 @@
 #
 
 
+BEGIN {
+	require 5.10.0;
+	unless (-f 'configure') {
+		print "Error: $0 must be run from the main source directory!\n";
+		exit 1;
+	}
+}
+
 use strict;
-use warnings;
-use POSIX qw(getcwd);
+use warnings FATAL => qw(all);
+
+use constant {
+	BUILDPATH  => $ENV{BUILDPATH},
+	SOURCEPATH => $ENV{SOURCEPATH}
+};
 
 sub find_output;
 sub gendep($);
@@ -36,21 +48,16 @@ run;
 exit 0;
 
 sub run() {
-	my $build = $ENV{BUILDPATH};
-	mkdir $build;
-	chdir $build or die "Could not open build directory: $!";
+	mkdir BUILDPATH;
+	chdir BUILDPATH or die "Could not open build directory: $!";
 	unlink 'include';
-	symlink "$ENV{SOURCEPATH}/include", 'include';
+	symlink "${\SOURCEPATH}/include", 'include';
 	mkdir $_ for qw/bin modules obj/;
-# BSD make has a horribly annoying bug resulting in an extra chdir of the make process
-# Create symlinks to work around it
-	symlink "../$_", "obj/$_" for qw/bin coremods modules obj/;
 
-	$build = getcwd();
 	open MAKE, '>real.mk' or die "Could not write real.mk: $!";
-	chdir "$ENV{SOURCEPATH}/src";
+	chdir "${\SOURCEPATH}/src";
 
-	if ($ENV{PURE_STATIC}) {
+	if ($ENV{INSPIRCD_STATIC}) {
 		run_static();
 	} else {
 		run_dynamic();
@@ -59,7 +66,6 @@ sub run() {
 }
 
 sub run_dynamic() {
-	my $build = $ENV{BUILDPATH};
 	print MAKE <<END;
 # DO NOT EDIT THIS FILE
 # It is autogenerated by make/calcdep.pl, and will be overwritten
@@ -71,64 +77,56 @@ bad-target:
 	\@echo "in order to set the correct environment variables"
 	\@exit 1
 
-all: inspircd coremods modules
+all: inspircd modules
 
 END
-	my(@core_deps, @cmodlist, @modlist);
+	my(@core_deps, @modlist);
 	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/socketengine_$ENV{SOCKETENGINE}.cpp";
-		push @core_deps, $out;
-	}
-
-	opendir my $coremoddir, 'coremods';
-	for my $file (sort readdir $coremoddir) {
-		next if $file =~ /^\./;
-		if ($file =~ /^core_/ && -d "coremods/$file" && dep_dir "coremods/$file", "modules/$file") {
-			mkdir "$build/obj/$file";
-			push @cmodlist, "modules/$file.so";
-		}
-		if ($file =~ /^core_.*\.cpp$/) {
-			my $out = dep_so "coremods/$file";
-			push @cmodlist, $out;
+		# Having a module in the src directory is a bad idea because it will be linked to the core binary
+		if ($file =~ /^(m|core)_.*\.cpp/) {
+			my $correctsubdir = ($file =~ /^m_/ ? "modules" : "coremods");
+			print "Error: module $file is in the src directory, put it in src/$correctsubdir instead!\n";
+			exit 1;
 		}
+		push @core_deps, $out;
 	}
 
-	opendir my $moddir, 'modules';
-	for my $file (sort readdir $moddir) {
-		next if $file =~ /^\./;
-		if (-e "modules/extra/$file" && !-l "modules/$file") {
-			# Incorrect symlink?
-			print "Replacing symlink for $file found in modules/extra\n";
-			rename "modules/$file", "modules/$file~";
-			symlink "extra/$file", "modules/$file";
-		}
-		if ($file =~ /^m_/ && -d "modules/$file" && dep_dir "modules/$file", "modules/$file") {
-			mkdir "$build/obj/$file";
-			push @modlist, "modules/$file.so";
-		}
-		if ($file =~ /^m_.*\.cpp$/) {
-			my $out = dep_so "modules/$file";
-			push @modlist, $out;
+	foreach my $directory (qw(coremods modules)) {
+		opendir(my $moddir, $directory);
+		for my $file (sort readdir $moddir) {
+			next if $file =~ /^\./;
+			if ($directory eq 'modules' && -e "modules/extra/$file" && !-l "modules/$file") {
+				# Incorrect symlink?
+				print "Replacing symlink for $file found in modules/extra\n";
+				rename "modules/$file", "modules/$file~";
+				symlink "extra/$file", "modules/$file";
+			}
+			if ($file =~ /^(?:core|m)_/ && -d "$directory/$file" && dep_dir "$directory/$file", "modules/$file") {
+				mkdir "${\BUILDPATH}/obj/$file";
+				push @modlist, "modules/$file.so";
+			}
+			if ($file =~ /^.*\.cpp$/) {
+				my $out = dep_so "$directory/$file";
+				push @modlist, $out;
+			}
 		}
 	}
 	
 	my $core_mk = join ' ', @core_deps;
-	my $cmods = join ' ', @cmodlist;
 	my $mods = join ' ', @modlist;
 	print MAKE <<END;
 
 bin/inspircd: $core_mk
-	@\$(SOURCEPATH)/make/unit-cc.pl core-ld\$(VERBOSE) \$\@ \$^ \$>
+	@\$(SOURCEPATH)/make/unit-cc.pl core-ld \$\@ \$^ \$>
 
 inspircd: bin/inspircd
 
-coremods: $cmods
-
 modules: $mods
 
-.PHONY: all bad-target inspircd coremods modules
+.PHONY: all bad-target inspircd modules
 
 END
 }
@@ -153,7 +151,7 @@ END
 			<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";
+			mkdir "${\BUILDPATH}/obj/$1";
 		}
 		dep_cpp $file, $out, 'gen-o';
 		next if $file =~ m#^socketengines/# && $file ne "socketengines/socketengine_$ENV{SOCKETENGINE}.cpp";
@@ -166,10 +164,10 @@ END
 	print MAKE <<END;
 
 obj/ld-extra.cmd: $core_src
-	\@\$(SOURCEPATH)/make/unit-cc.pl gen-ld\$(VERBOSE) \$\@ \$^ \$>
+	\@\$(SOURCEPATH)/make/unit-cc.pl gen-ld \$\@ \$^ \$>
 
-bin/inspircd: obj/ld-extra.cmd $core_mk
-	\@\$(SOURCEPATH)/make/unit-cc.pl static-ld\$(VERBOSE) \$\@ \$^ \$>
+bin/inspircd: $core_mk obj/ld-extra.cmd
+	\@\$(SOURCEPATH)/make/unit-cc.pl static-ld \$\@ \$^ \$>
 
 inspircd: bin/inspircd
 
@@ -233,7 +231,7 @@ sub dep_cpp($$$) {
 	gendep $file;
 
 	print MAKE "$out: $file $f2dep{$file}\n";
-	print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl $type\$(VERBOSE) \$\@ \$(SOURCEPATH)/src/$file \$>\n";
+	print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl $type \$\@ \$(SOURCEPATH)/src/$file \$>\n";
 }
 
 sub dep_so($) {
@@ -258,7 +256,7 @@ sub dep_dir($$) {
 	if (@ofiles) {
 		my $ofiles = join ' ', @ofiles;
 		print MAKE "$outdir.so: $ofiles\n";
-		print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl link-dir\$(VERBOSE) \$\@ \$^ \$>\n";
+		print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl link-dir \$\@ ${\SOURCEPATH}/src/$dir \$^ \$>\n";
 		return 1;
 	} else {
 		return 0;