[Galago-commits] r2610 - in trunk/galago-python: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-03-18 13:46:12 -0800 (Sat, 18 Mar 2006)
New Revision: 2610

Added:
   trunk/galago-python/src/__init__.py
Modified:
   trunk/galago-python/
   trunk/galago-python/ChangeLog
   trunk/galago-python/configure.ac
   trunk/galago-python/src/Makefile.am
   trunk/galago-python/src/galagomodule.c
Log:
Properly set up the module to live inside the pygtk/galago directory.  Set up a __init__.py to import the module. This allows for galago-gtk-python to provide galago.gtk and galago.gdk modules.



Property changes on: trunk/galago-python
___________________________________________________________________
Name: svn:ignore
   - ABOUT-NLS
Doxyfile
Makefile.in
Makefile
aclocal.m4
autom4te*.cache
confdefs.h
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
depcomp
install-sh
intl
galago-python.pc
galago-python.spec
libtool
ltconfig
ltmain.sh
m4
missing
mkinstalldirs
stamp-h
stamp-h1
stamp-h.in
tags
.todo.*
.*.swp
.*.swo
*.diff

   + ABOUT-NLS
Doxyfile
Makefile.in
Makefile
aclocal.m4
autom4te*.cache
confdefs.h
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
depcomp
install-sh
intl
galago-python.pc
galago-python.spec
libtool
ltconfig
ltmain.sh
m4
missing
mkinstalldirs
py-compile
stamp-h
stamp-h1
stamp-h.in
tags
.todo.*
.*.swp
.*.swo
*.diff


Modified: trunk/galago-python/ChangeLog
===================================================================
--- trunk/galago-python/ChangeLog	2006-03-17 09:39:26 UTC (rev 2609)
+++ trunk/galago-python/ChangeLog	2006-03-18 21:46:12 UTC (rev 2610)
@@ -1,3 +1,13 @@
+Sat Mar 18 13:44:47 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	A src/__init__.py:
+	* src/galagomodule.c:
+	* src/Makefile.am:
+	* configure.ac:
+	  - Properly set up the module to live inside the pygtk/galago directory.
+	    Set up a __init__.py to import the module. This allows for
+	    galago-gtk-python to provide galago.gtk and galago.gdk modules.
+
 Thu Mar 16 22:12:13 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/galago.defs:

Modified: trunk/galago-python/configure.ac
===================================================================
--- trunk/galago-python/configure.ac	2006-03-17 09:39:26 UTC (rev 2609)
+++ trunk/galago-python/configure.ac	2006-03-18 21:46:12 UTC (rev 2610)
@@ -16,7 +16,7 @@
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
-#AM_CHECK_PYTHON_HEADERS
+AM_PATH_PYTHON(2.3.5)
 AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 
 PKG_CHECK_MODULES(GALAGO_PYTHON, [pygtk-2.0 >= $PYGTK_REQUIRED

Modified: trunk/galago-python/src/Makefile.am
===================================================================
--- trunk/galago-python/src/Makefile.am	2006-03-17 09:39:26 UTC (rev 2609)
+++ trunk/galago-python/src/Makefile.am	2006-03-18 21:46:12 UTC (rev 2610)
@@ -11,10 +11,15 @@
 pkgpythondir = $(pyexecdir)/gtk-2.0
 pkgpyexecdir = $(pyexecdir)/gtk-2.0
 
-pkgpyexec_LTLIBRARIES = galago.la
-galago_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgalago
-galago_la_LIBADD = $(GALAGO_PYTHON_LIBS)
-galago_la_SOURCES = galagomodule.c galago.c
+pkgpygalagodir = $(pkgpythondir)/galago
+pkgpygalago_PYTHON = __init__.py
+
+pygalagodir = $(pkgpyexecdir)/galago
+pygalago_LTLIBRARIES = _galago.la
+
+_galago_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_galago
+_galago_la_LIBADD = $(GALAGO_PYTHON_LIBS)
+_galago_la_SOURCES = galagomodule.c galago.c
 #nodist_galago_la_SOURCES = galago.c
 
 CLEANFILES = galago.c

Added: trunk/galago-python/src/__init__.py
===================================================================
--- trunk/galago-python/src/__init__.py	2006-03-17 09:39:26 UTC (rev 2609)
+++ trunk/galago-python/src/__init__.py	2006-03-18 21:46:12 UTC (rev 2610)
@@ -0,0 +1 @@
+from _galago import *

Modified: trunk/galago-python/src/galagomodule.c
===================================================================
--- trunk/galago-python/src/galagomodule.c	2006-03-17 09:39:26 UTC (rev 2609)
+++ trunk/galago-python/src/galagomodule.c	2006-03-18 21:46:12 UTC (rev 2610)
@@ -4,13 +4,13 @@
 extern PyMethodDef pygalago_functions[];
 
 DL_EXPORT(void)
-initgalago(void)
+init_galago(void)
 {
 	PyObject *m, *d;
 
 	init_pygobject();
 
-	m = Py_InitModule("galago", pygalago_functions);
+	m = Py_InitModule("galago._galago", pygalago_functions);
 	d = PyModule_GetDict(m);
 
 	pygalago_register_classes(d);