diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 21:24:48 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 21:24:48 +0200 |
commit | 2914b0ca04355f6f175b603a1de6030b20ce0830 (patch) | |
tree | bc9885a4c2e852422ebf8849a7715b91b02ba258 /source4/build/smb_build | |
parent | 4a8212c9550257d2fe3796a3e9f98e4e0367c38b (diff) | |
download | samba-2914b0ca04355f6f175b603a1de6030b20ce0830.tar.gz samba-2914b0ca04355f6f175b603a1de6030b20ce0830.tar.bz2 samba-2914b0ca04355f6f175b603a1de6030b20ce0830.zip |
Remove support for .py files from smb_build - deal with it only in the makefiles.
(This used to be commit b865249efaa58d0fc87fa25491fda3b970af81c3)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r-- | source4/build/smb_build/input.pm | 1 | ||||
-rw-r--r-- | source4/build/smb_build/main.pl | 1 | ||||
-rw-r--r-- | source4/build/smb_build/makefile.pm | 9 |
3 files changed, 0 insertions, 11 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 7028d2ab17..75a02ca8c2 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -146,7 +146,6 @@ sub check_python($$$) $dirname = "" if $dirname eq "./"; $python->{LIBRARY_REALNAME} = "_$basename.\$(SHLIBEXT)"; - $python->{PYTHON_FILES} = ["$dirname$basename.py"]; push (@{$python->{CFLAGS}}, "\$(CFLAG_NO_UNUSED_MACROS)"); push (@{$python->{CFLAGS}}, "\$(CFLAG_NO_CAST_QUAL)"); $python->{INIT_FUNCTION} = "{ (char *)\"_$basename\", init_$basename }"; diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index b31bfaa1f2..88289af26d 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -70,7 +70,6 @@ foreach my $key (values %$OUTPUT) { ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") { $shared_libs_used = 1; } - $mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES}); if ($key->{TYPE} eq "MODULE" and @{$key->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ" and defined($key->{INIT_FUNCTION})) { $mkenv->output("$key->{SUBSYSTEM}_INIT_FUNCTIONS += $key->{INIT_FUNCTION},\n"); } diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index a0fee2736b..0269cfe8a3 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -214,15 +214,6 @@ $self->output("\$(call binary_link_template, $ctx->{RESULT_BINARY}, \$($ctx->{NA } } -sub PythonFiles($$) -{ - my ($self,$ctx) = @_; - - foreach (@{$ctx->{PYTHON_FILES}}) { - $self->output("\$(eval \$(call python_py_module_template," . basename($_) . ",\$(addprefix $ctx->{BASEDIR}/, $_)))\n"); - } -} - sub write($$) { my ($self, $file) = @_; |