X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fcalcdep.pl;h=f96afee33578e667d5ba7158b4b122bfc8b596c7;hb=aea5500b46890665ccb26d436217cb7014e93a32;hp=3b4ae6b0d7041b3f149489f847504bdcd0330289;hpb=c83ce753688bde7b6106acf2de44c3cf29b30a7e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 3b4ae6b0d..f96afee33 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -20,6 +20,7 @@
 
 
 BEGIN {
+	push @INC, $ENV{SOURCEPATH};
 	require 5.10.0;
 	unless (-f 'configure') {
 		print "Error: $0 must be run from the main source directory!\n";
@@ -32,6 +33,8 @@ use warnings FATAL => qw(all);
 
 use File::Basename qw(basename);
 
+use make::common;
+
 use constant {
 	BUILDPATH  => $ENV{BUILDPATH},
 	SOURCEPATH => $ENV{SOURCEPATH}
@@ -50,7 +53,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 +62,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;
 }
 
@@ -83,7 +82,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";
@@ -116,7 +115,7 @@ END
 			}
 		}
 	}
-	
+
 	my $core_mk = join ' ', @core_deps;
 	my $mods = join ' ', @modlist;
 	print MAKE <<END;
@@ -133,56 +132,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: $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_.*)/#) {