[Python-gtkextra-commits] CVS: python-gtkextra2/gtkextra Makefile.am,1.6,1.7 gtkextramodule.c,1.5,1.6

[<pyt...@li...>]

Update of /cvsroot/python-gtkextra/python-gtkextra2/gtkextra
In directory sc8-pr-cvs1:/tmp/cvs-serv31396/gtkextra

Modified Files:
	Makefile.am gtkextramodule.c 
Log Message:
install and rpms fixes. cleanups

Index: Makefile.am
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	30 Dec 2002 20:42:13 -0000	1.6
--- Makefile.am	7 Jan 2003 17:06:19 -0000	1.7
***************
*** 4,13 ****
    _config.py
  
  pygtkextraexecdir = $(pyexecdir)/gtkextra
  
  # FIXME: Do we want to drop files in the pygtk directory or in our own pkg directory
  defsdir = $(PYGTK_DEFSDIR)
! defs_DATA =
! EXTRA_DIST = $(defs_DATA)
  CLEANFILES =
  
--- 4,20 ----
    _config.py
  
+ EXTRA_DIST = \
+   mycodegen.py
+ 
  pygtkextraexecdir = $(pyexecdir)/gtkextra
  
  # FIXME: Do we want to drop files in the pygtk directory or in our own pkg directory
  defsdir = $(PYGTK_DEFSDIR)
! defs_DATA = \
!  gtkextra.defs \
!  gtkextra-types.defs \
!  gtkextra-addons.defs 
! 
! EXTRA_DIST += $(defs_DATA)
  CLEANFILES =
  
***************
*** 15,19 ****
  pkginclude_HEADERS = 
  
! INCLUDES = -I$(top_srcdir) $(PYTHON_INCLUDES) -Wall
  #COMMONDEFS = $(srcdir)/gtkextra-types.defs 
  COMMONDEFS = 
--- 22,26 ----
  pkginclude_HEADERS = 
  
! INCLUDES = -I$(top_srcdir) $(PYTHON_INCLUDES)
  #COMMONDEFS = $(srcdir)/gtkextra-types.defs 
  COMMONDEFS = 
***************
*** 22,26 ****
  pygtkextraexec_LTLIBRARIES = _gtkextramodule.la
  _gtkextramodule_la_CFLAGS = $(PYGTK_CFLAGS) $(GTK_CFLAGS) $(GTKEXTRA_CFLAGS)
! _gtkextramodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgtkextra
  _gtkextramodule_la_LIBADD =  $(GTKEXTRA_LIBS) $(PYGTK_LIBS) $(GTK_LIBS)
  _gtkextramodule_la_SOURCES = gtkextramodule.c
--- 29,33 ----
  pygtkextraexec_LTLIBRARIES = _gtkextramodule.la
  _gtkextramodule_la_CFLAGS = $(PYGTK_CFLAGS) $(GTK_CFLAGS) $(GTKEXTRA_CFLAGS)
! _gtkextramodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gtkextra
  _gtkextramodule_la_LIBADD =  $(GTKEXTRA_LIBS) $(PYGTK_LIBS) $(GTK_LIBS)
  _gtkextramodule_la_SOURCES = gtkextramodule.c

Index: gtkextramodule.c
===================================================================
RCS file: /cvsroot/python-gtkextra/python-gtkextra2/gtkextra/gtkextramodule.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gtkextramodule.c	24 Dec 2002 18:49:10 -0000	1.5
--- gtkextramodule.c	7 Jan 2003 17:06:21 -0000	1.6
***************
*** 15,20 ****
  extern PyMethodDef pygtkextra_functions[];
  
- PyTypeObject *_PyArray_Type;
- 
  DL_EXPORT(void)
  init_gtkextra(void)
--- 15,18 ----
***************
*** 46,60 ****
      PyModule_AddIntConstant(m, "ICON_LIST_TEXT_RIGHT", GTK_ICON_LIST_TEXT_RIGHT);
      PyModule_AddIntConstant(m, "ICON_LIST_TEXT_BELOW", GTK_ICON_LIST_TEXT_BELOW);
- 
- 
-     if ((module = PyImport_ImportModule("array")) != NULL) {
-         PyObject *moddict = PyModule_GetDict(module);
-         _PyArray_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "ArrayType");
-     } 
-     else {
-         Py_FatalError("could not import array");
-         return;
-     }
-     
  
      if (PyErr_Occurred())
--- 44,47 ----