X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fcalcdep.pl;h=99355efa40f1b9843781f0290dcd1c9c450a4b96;hb=bb4aa10ed82612624da45d0c9592ddf7f2f51ab5;hp=2348edcebdd9f043ba121300281068e39548ae7a;hpb=6b2438f548aa8b2b2c26b94a8f782a11e87370be;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 2348edceb..99355efa4 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -57,7 +57,7 @@ sub run() {
 	open MAKE, '>real.mk' or die "Could not write real.mk: $!";
 	chdir "${\SOURCEPATH}/src";
 
-	if ($ENV{PURE_STATIC}) {
+	if ($ENV{INSPIRCD_STATIC}) {
 		run_static();
 	} else {
 		run_dynamic();
@@ -85,6 +85,12 @@ END
 		my $out = find_output $file;
 		dep_cpp $file, $out, 'gen-o';
 		next if $file =~ m#^socketengines/# && $file ne "socketengines/socketengine_$ENV{SOCKETENGINE}.cpp";
+		# 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;
 	}
 
@@ -114,7 +120,7 @@ END
 	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
 
@@ -158,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
 
@@ -225,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($) {
@@ -250,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) \$\@ ${\SOURCEPATH}/src/$dir \$^ \$>\n";
+		print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl link-dir \$\@ ${\SOURCEPATH}/src/$dir \$^ \$>\n";
 		return 1;
 	} else {
 		return 0;