X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fcalcdep.pl;h=5ef736f4668e908445a56595524813608ab5d8ff;hb=e94b673532f7833aaa4789f834e61d68e0b4fc56;hp=f3ed04725b011f57e99d6d82bb48d517e0d945a8;hpb=35b70631f0532a5828b04a8e0c02092a285f331a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/calcdep.pl b/make/calcdep.pl
index f3ed04725..5ef736f46 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -1,8 +1,10 @@
 #!/usr/bin/env perl
-
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
+#   Copyright (C) 2014-2015 Attila Molnar <attilamolnar@hush.com>
+#   Copyright (C) 2013, 2015-2019, 2021 Sadie Powell <sadie@witchery.services>
+#   Copyright (C) 2012 Robby <robby@chatbelgie.be>
 #   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
 #
 # This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -19,18 +21,14 @@
 #
 
 
-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 FATAL => qw(all);
 
-use File::Basename qw(basename);
+use File::Basename qw(basename dirname);
+use FindBin        qw($RealDir);
+
+use lib dirname $RealDir;
+use make::common;
 
 use constant {
 	BUILDPATH  => $ENV{BUILDPATH},
@@ -50,7 +48,7 @@ run;
 exit 0;
 
 sub run() {
-	mkdir BUILDPATH;
+	create_directory(BUILDPATH, 0770) or die "Could not create build directory: $!";
 	chdir BUILDPATH or die "Could not open build directory: $!";
 	unlink 'include';
 	symlink "${\SOURCEPATH}/include", 'include';
@@ -59,11 +57,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;
 }
 
@@ -96,7 +90,7 @@ END
 		push @core_deps, $out;
 	}
 
-	foreach my $directory (qw(coremods modules)) {
+	for my $directory (qw(coremods modules)) {
 		opendir(my $moddir, $directory);
 		for my $file (sort readdir $moddir) {
 			next if $file =~ /^\./;
@@ -116,7 +110,7 @@ END
 			}
 		}
 	}
-	
+
 	my $core_mk = join ' ', @core_deps;
 	my $mods = join ' ', @modlist;
 	print MAKE <<END;
@@ -133,56 +127,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>, <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: $core_mk obj/ld-extra.cmd
-	\@\$(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_.*)/#) {