From 38cb3e9fb603b437a4ef5771fa1a29c88381ab11 Mon Sep 17 00:00:00 2001 From: brain Date: Thu, 18 Jan 2007 18:56:47 +0000 Subject: Change stuff around git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6380 e03df62e-2008-0410-955e-edbf42e46eb7 --- configure | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 67a808845..4f6cf9a35 100755 --- a/configure +++ b/configure @@ -1251,32 +1251,28 @@ EOCHEESE foreach $name (sort readdir(DIRHANDLE)) { if ($name =~ /^m_(.+?)$/) { $crapola = ""; - $crap2 = "ar r $name.a "; $crap3 = ""; # A module made of multiple files, in a dir, e.g. src/modules/m_spanningtree/ if (opendir(MDIRHANDLE, "src/modules/$name") != 0) { print "Composing Makefile rules for directory \033[1;32m$name\033[0m... "; my $i = 0; - print FILEHANDLE "$name.a: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps"; + print FILEHANDLE "$name.so: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps"; foreach $fname (sort readdir(MDIRHANDLE)) { if ($fname =~ /\.cpp$/) { $cmflags = getcompilerflags("src/modules/$name/$fname"); $liflags = getlinkerflags("src/modules/$name/$fname"); $deps = getdependencies("src/modules/$name/$fname"); print FILEHANDLE " $name/$fname"; - $crapola = $crapola . " \$(CC) -pipe -I../../include -I. \$(FLAGS) $cmflags -export-dynamic -c $name/$fname\n"; $oname = $fname; $oname =~ s/\.cpp$/.o/g; - $crap2 = $crap2 . " $oname"; + $crapola = $crapola . " \$(CC) -pipe -I../../include -I. \$(FLAGS) $cmflags -export-dynamic -o $name/$oname -c $name/$fname\n"; $crap3 = $crap3 . " $name/$oname"; $i++; } } print "(\033[1;32m$i files found\033[0m)\n"; - print FILEHANDLE "\n$crapola $crap2\n\n"; - print FILEHANDLE "$name.so: $name.a ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h\n"; - print FILEHANDLE " ranlib $name.a\n"; - print FILEHANDLE " \$(CC) -pipe $liflags -shared -o $name.so $name.a\n"; + print FILEHANDLE "\n$crapola"; + print FILEHANDLE " \$(CC) -pipe $liflags -shared -o $name.so $crap3\n\n"; closedir(MDIRHANDLE); $crud = $crud . " install -m \$(INSTMODE) $name.so \$(MODPATH)\n"; } -- cgit v1.2.3