svn commit: samba r26097 - in branches/SAMBA_4_0: . source/build/smb_build source/librpc/rpc

[jelmer at samba.org]

Author: jelmer
Date: 2007-11-21 14:49:35 +0000 (Wed, 21 Nov 2007)
New Revision: 26097

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26097

Log:
Consider python modules special modules rather than special libraries.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/build/smb_build/input.pm
   branches/SAMBA_4_0/source/build/smb_build/main.pl
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc.i


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm	2007-11-21 14:49:32 UTC (rev 26096)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm	2007-11-21 14:49:35 UTC (rev 26097)
@@ -160,7 +160,9 @@
 		$python->{LIBRARY_REALNAME} = "$basename.\$(SHLIBEXT)";
 	}
 
-	check_library($INPUT, $python, ["SHARED_LIBRARY"]);
+	$python->{SUBSYSTEM} = "LIBPYTHON";
+
+	check_module($INPUT, $python, ["SHARED_LIBRARY"]);
 }
 
 sub check_binary($$)

Modified: branches/SAMBA_4_0/source/build/smb_build/main.pl
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pl	2007-11-21 14:49:32 UTC (rev 26096)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pl	2007-11-21 14:49:35 UTC (rev 26097)
@@ -62,14 +62,14 @@
 	$mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
 	$mkenv->PkgConfig($key, $OUTPUT) if $key->{TYPE} eq "LIBRARY" 
 		                    and defined($key->{VERSION});
-	$mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY" or 
-		                            $key->{TYPE} eq "PYTHON") and
+	$mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY") and
 					grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
 	if ($key->{TYPE} eq "LIBRARY" and 
 	    ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") {
 		$shared_libs_used = 1;
 	}
-	$mkenv->SharedModule($key) if $key->{TYPE} eq "MODULE" and
+	$mkenv->SharedModule($key) if ($key->{TYPE} eq "MODULE" or 
+								   $key->{TYPE} eq "PYTHON") and
 					grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
 	$mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}});
 	$mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES});

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2007-11-21 14:49:32 UTC (rev 26096)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2007-11-21 14:49:35 UTC (rev 26097)
@@ -310,6 +310,11 @@
 	my $sane_subsystem = lc($ctx->{SUBSYSTEM});
 	$sane_subsystem =~ s/^lib//;
 	
+	if ($ctx->{TYPE} eq "PYTHON") {
+		push (@{$self->{python_dsos}}, 
+			"$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
+	}
+
 	push (@{$self->{shared_modules}}, "$ctx->{TARGET_SHARED_LIBRARY}");
 	push (@{$self->{plugins}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
 
@@ -396,11 +401,6 @@
 	$self->_prepare_list($ctx, "LINK_FLAGS");
 #	$self->_prepare_list_ex($ctx, "LINK_FLAGS", "-Wl,--whole-archive", "-Wl,--no-whole-archive");
 
-	if ($ctx->{TYPE} eq "PYTHON") {
-		push (@{$self->{python_dsos}}, 
-			"$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
-	}
-
 	push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)");
 
 	my $soarg = "";

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.i
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.i	2007-11-21 14:49:32 UTC (rev 26096)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.i	2007-11-21 14:49:35 UTC (rev 26097)
@@ -41,7 +41,6 @@
 
 %}
 
-%include "samba.i"
 %include "../../lib/talloc/talloc.i"
 %include "../../auth/credentials/credentials.i"