X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fcalcdep.pl;h=55e0630fc80da3497470661fdd98a7dfde843282;hb=23e62cef071f8d037b2d163d60bcc85f5887776c;hp=05199569c029177f9f74cdc00c207f01cafdec97;hpb=05b111d6a245725c81a314794fb95e8375fb6720;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 05199569c..55e0630fc 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use POSIX qw(getcwd);
 
-sub find_output($);
+sub find_output;
 sub gendep($);
 sub dep_cpp($$);
 sub dep_dir($);
@@ -18,65 +18,143 @@ sub run() {
 	my $build = $ENV{BUILDPATH};
 	mkdir $build;
 	chdir $build or die "Could not open build directory: $!";
-	mkdir 'bin';
-	mkdir 'obj';
-	mkdir 'modules';
 	symlink "$ENV{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 modules obj/;
+
 	$build = getcwd();
 	open MAKE, '>real.mk' or die "Could not write real.mk: $!";
 	chdir "$ENV{SOURCEPATH}/src";
 
+	if ($ENV{PURE_STATIC}) {
+		run_static();
+	} else {
+		run_dynamic();
+	}
+	close MAKE;
+}
+
+sub run_dynamic() {
+	my $build = $ENV{BUILDPATH};
 	print MAKE <<END;
-# DO NOT EDIT
-# Autogenerated by calcdep
+# 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
 
-all: bin/inspircd modules
+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 commands modules
 
 END
-	my @core_deps;
-	for my $file (<*.cpp>, <modes/*.cpp>, "socketengines/$ENV{SOCKETENGINE}.cpp", "threadengines/threadengine_pthread.cpp") {
+	my(@core_deps, @cmdlist, @modlist);
+	for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, "threadengines/threadengine_pthread.cpp") {
 		my $out = find_output $file;
 		dep_cpp $file, $out;
+		next if $file =~ m#^socketengines/# && $file ne "socketengines/$ENV{SOCKETENGINE}.cpp";
 		push @core_deps, $out;
 	}
-	
-	my @modlist;
-	for my $file (<commands/*.cpp>, <modules/*.cpp>) {
+
+	for my $file (<commands/*.cpp>) {
 		my $out = find_output $file;
 		dep_cpp $file, $out;
-		push @modlist, $out;
+		push @cmdlist, $out;
 	}
 
 	opendir my $moddir, 'modules';
-	for my $dir (readdir $moddir) {
-		next unless $dir =~ /^m_/ && -d "modules/$dir";
-		if (dep_dir "modules/$dir") {
-			mkdir "$build/obj/$dir";
-			push @modlist, "modules/$dir.so";
+	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") {
+			mkdir "$build/obj/$file";
+			push @modlist, "modules/$file.so";
+		}
+		if ($file =~ /^m_.*\.cpp$/) {
+			my $out = find_output "modules/$file";
+			dep_cpp "modules/$file", $out;
+			push @modlist, $out;
 		}
 	}
 	
 	my $core_mk = join ' ', @core_deps;
+	my $cmds = join ' ', @cmdlist;
 	my $mods = join ' ', @modlist;
 	print MAKE <<END;
 
 bin/inspircd: $core_mk
-	\$(RUNCC) -o \$\@ \$(CORELDFLAGS) \$(LDLIBS) \$^
+	\$(RUNCC) -o \$\@ \$(CORELDFLAGS) \$(LDLIBS) \$^ \$>
 
 inspircd: bin/inspircd
+
+commands: $cmds
+
 modules: $mods
 
-.PHONY: inspircd modules
+.PHONY: all bad-target inspircd commands modules
+
+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>, <commands/*.cpp>,
+			<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";
+		}
+		dep_cpp $file, $out;
+		next if $file =~ m#^socketengines/# && $file ne "socketengines/$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 -f\$(VERBOSE) \$\@ \$^ \$>
+
+bin/inspircd: obj/ld-extra.cmd $core_mk
+	\@\$(SOURCEPATH)/make/unit-cc.pl -l\$(VERBOSE) \$\@ \$^ \$>
+
+inspircd: bin/inspircd
+
+.PHONY: all bad-target inspircd
 
 END
 }
 
-sub find_output($) {
-	my $file = shift;
+sub find_output {
+	my($file, $static) = @_;
 	my($path,$base) = $file =~ m#^((?:.*/)?)([^/]+)\.cpp# or die "Bad file $file";
 	if ($path eq 'modules/' || $path eq 'commands/') {
-		return "modules/$base.so";
+		return $static ? "obj/$base.o" : "modules/$base.so";
 	} elsif ($path eq '' || $path eq 'modes/' || $path =~ /^[a-z]+engines\/$/) {
 		return "obj/$base.o";
 	} elsif ($path =~ m#modules/(m_.*)/#) {
@@ -127,14 +205,14 @@ sub dep_cpp($$) {
 	gendep $file;
 
 	print MAKE "$out: $file $f2dep{$file}\n";
-	print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl \$(VERBOSE) \$< \$\@\n";
+	print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl \$(VERBOSE) \$\@ \$< \$>\n";
 }
 
 sub dep_dir($) {
 	my($dir) = @_;
 	my @ofiles;
 	opendir DIR, $dir;
-	for my $file (readdir DIR) {
+	for my $file (sort readdir DIR) {
 		next unless $file =~ /(.*)\.cpp$/;
 		my $ofile = find_output "$dir/$file";
 		dep_cpp "$dir/$file", $ofile;
@@ -143,7 +221,7 @@ sub dep_dir($) {
 	closedir DIR;
 	if (@ofiles) {
 		my $ofiles = join ' ', @ofiles;
-		print MAKE "$dir.so: $ofiles\n\t\$(RUNCC) \$(PICLDFLAGS) -o \$\@ \$^\n";
+		print MAKE "$dir.so: $ofiles\n\t\$(RUNCC) \$(PICLDFLAGS) -o \$\@ \$^ \$>\n";
 		return 1;
 	} else {
 		return 0;