[Ocfs2-tools-commits] manish commits r546 - trunk/ocfs2tool

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-01-07 20:23:40 -0600 (Fri, 07 Jan 2005)
New Revision: 546

Modified:
   trunk/ocfs2tool/Makefile
   trunk/ocfs2tool/ocfs2module.c
Log:
Remove pygtk stuff, add explicit glib references


Modified: trunk/ocfs2tool/Makefile
===================================================================
--- trunk/ocfs2tool/Makefile	2005-01-08 02:21:51 UTC (rev 545)
+++ trunk/ocfs2tool/Makefile	2005-01-08 02:23:40 UTC (rev 546)
@@ -16,7 +16,7 @@
 LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
 
 DEFINES = -DOCFS2_FLAT_INCLUDES -DG_DISABLE_DEPRECATED
-INCLUDES = $(LIBOCFS2_CFLAGS) $(PYTHON_INCLUDES)
+INCLUDES = $(LIBOCFS2_CFLAGS) $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
 
 OPTIMIZE = -O2
 OPTIMIZE = -O0
@@ -58,7 +58,7 @@
 DIST_FILES = $(CFILES) $(HFILES) $(PYSRC) ocfs2tool ocfs2tool.8.in
 
 ocfs2module.so: $(OBJS) $(LIBOCFS2_DEPS)
-	$(LINK) -shared $(LIBOCFS2_LIBS) $(COM_ERR_LIBS)
+	$(LINK) -shared $(LIBOCFS2_LIBS) $(COM_ERR_LIBS) $(GLIB_LIBS)
 
 install-pylib:
 	$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(pyexecdir)/ocfs2tool

Modified: trunk/ocfs2tool/ocfs2module.c
===================================================================
--- trunk/ocfs2tool/ocfs2module.c	2005-01-08 02:21:51 UTC (rev 545)
+++ trunk/ocfs2tool/ocfs2module.c	2005-01-08 02:23:40 UTC (rev 546)
@@ -28,9 +28,6 @@
 
 #include <glib.h>
 
-#include <pygobject.h>
-#include <pygtk/pygtk.h>
-
 #include "ocfs2.h"
 
 #include "ocfsplist.h"
@@ -40,10 +37,6 @@
 #define MIN_CLUSTER_SIZE       4096
 
 
-void cellmap_register_classes (PyObject *d);
-extern PyMethodDef cellmap_functions[];
-
-
 static PyObject *ocfs2_error;
 
 static PyObject *
@@ -206,11 +199,8 @@
 void
 initocfs2 (void)
 {
-  PyObject *m, *d;
+  PyObject *m;
 
-  init_pygobject ();
-  init_pygtk ();
-
   initialize_ocfs_error_table ();
 
   m = Py_InitModule ("ocfs2", ocfs2_methods);
@@ -236,10 +226,6 @@
   PyModule_AddIntConstant (m, "MIN_CLUSTER_SIZE", MIN_CLUSTER_SIZE);
   PyModule_AddIntConstant (m, "MAX_CLUSTER_SIZE", MAX_CLUSTER_SIZE);
 
-  d = PyModule_GetDict (m);
-
-  cellmap_register_classes (d);
-
   if (PyErr_Occurred ())
     Py_FatalError ("can't initialise module ocfs2");
 }