Merge of removal of py_samba.c

diff --git a/source/python/py_samba.c b/source/python/py_samba.c
deleted file mode 100644 (file)
index c0ade12..0000000
--- a/source/python/py_samba.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* 
-   Python wrappers for DCERPC/SMB client routines.
-
-   Copyright (C) Tim Potter, 2002
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "Python.h"
-#include "python/py_common.h"
-
-/*
- * Module initialisation 
- */
-
-static PyObject *lsa_open_policy(PyObject *self, PyObject *args, 
-                               PyObject *kw) 
-{
-       return NULL;
-}
-
-static PyMethodDef samba_methods[] = {
-       { NULL }
-};
-
-static PyMethodDef cheepy_methods[] = {
-       { "open_policy", (PyCFunction)lsa_open_policy, METH_VARARGS|METH_KEYWORDS,
-         "Foo"},
-       { NULL }
-};
-
-void initsamba(void)
-{
-       PyObject *module, *new_module, *dict;
-
-       /* Initialise module */
-
-       module = Py_InitModule("samba", samba_methods);
-       dict = PyModule_GetDict(module);
-
-       /* Do samba initialisation */
-
-       py_samba_init();
-}

diff --git a/source/python/setup.py b/source/python/setup.py
index 48487fee4d0408185fb8c4ef19977ceec2f7b987..8bc8868a70cbd9ce9ccda1af1738b06c3d65e523 100755 (executable)
--- a/source/python/setup.py
+++ b/source/python/setup.py
@@ -177,20 +177,9 @@ setup(
               extra_compile_args = flags_list,
               extra_objects = obj_list),
 
-    # Moving to merge all individual extensions in to one big
-    # extension.  This is to avoid the fact that each extension is 3MB
-    # in size due to the lack of proper depedency management in Samba.
-
-    Extension(name = "samba",
-              sources = [samba_srcdir + "python/py_samba.c",
-                         samba_srcdir + "python/py_common.c"],
-              libraries = lib_list,
-              library_dirs = ["/usr/kerberos/lib"],
-              extra_compile_args = flags_list,
-              extra_objects = obj_list),
-
     # tdbpack/unpack extensions.  Does not actually link to any Samba
     # code, although it implements a compatible data format.
+    
     Extension(name = "tdbpack",
               sources = [os.path.join(samba_srcdir, "python", "py_tdbpack.c")],
               extra_compile_args = ["-I."])