From d06bfe528bb8d5e2ad2b4844c36fe43155739b3d Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Tue, 12 Jul 2005 18:16:07 +0000 Subject: * python/dbus_bindings.pyx.in: removed * python/dbus_bindings.pyx: Added. - Fixed some memleaks (patch from Sean Meiners ) - Broke out the #include "dbus_h_wrapper.h" and put it in its own pxd file (Pyrex definition) - Broke out glib dependancies into its own pyx module * python/dbus_bindings.pdx: Added. - Defines C class Connection for exporting to other modules * python/dbus_glib_bindings.pyx: Added. - New module to handle lowlevel dbus-glib mainloop integration * python/glib.py: Added. - Registers the glib mainloop when you import this module * python/services.py: Removed (renamed to service.py) * python/service.py: Added. - (class Server): renamed Name * python/__init__.py: Bump ro version (0,41,0) - don't import the decorators or service module by default. These now reside in the dbus.service namespace * python/_dbus.py (Bus::__init__): Add code run the main loop setup function on creation * python/examples/example-service.py, python/examples/example-signal-emitter.py: update examples * python/examples/gconf-proxy-service.py, python/examples/gconf-proxy-service2.py: TODO fix these up * doc/TODO: Addition - Added a Python Bindings 1.0 section - added "Add match on args or match on details to match rules" --- python/Makefile.am | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) (limited to 'python/Makefile.am') diff --git a/python/Makefile.am b/python/Makefile.am index b5ee4243..81a8367a 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -1,30 +1,42 @@ SUBDIRS=examples -INCLUDES=-I$(top_builddir) -I$(top_builddir)/dbus $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) $(PYTHON_INCLUDES) -DDBUS_COMPILATION=1 +INCLUDES=-I$(top_builddir) -I$(top_builddir)/dbus $(DBUS_CLIENT_CFLAGS) $(PYTHON_INCLUDES) -DDBUS_COMPILATION=1 dbusdir = $(pythondir)/dbus -dbus_PYTHON = __init__.py _dbus.py decorators.py exceptions.py services.py proxies.py _util.py types.py matchrules.py +dbus_PYTHON = __init__.py _dbus.py decorators.py exceptions.py service.py proxies.py _util.py types.py matchrules.py glib.py dbusbindingsdir = $(pyexecdir)/dbus -dbusbindings_LTLIBRARIES = dbus_bindings.la +dbusbindings_LTLIBRARIES = dbus_bindings.la dbus_glib_bindings.la dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings -dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la +dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la nodist_dbus_bindings_la_SOURCES = dbus_bindings.c +dbus_glib_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_glib_bindings +dbus_glib_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la +dbus_glib_bindings_la_CFLAGS = $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) +nodist_dbus_glib_bindings_la_SOURCES = dbus_glib_bindings.c + EXTRA_DIST = \ dbus_h_wrapper.h \ - dbus_bindings.pyx.in \ + dbus_bindings.pyx \ + dbus_glib_bindings.pyx \ + dbus_bindings.pxd \ extract.py CLEANFILES = \ - dbus_bindings.pyx \ - dbus_bindings.c + dbus_bindings.pxd \ + dbus_bindings.c \ + dbus_glib_bindings.c + +dbus_bindings.pxd: dbus_bindings.pxd.in extract.py + -$(PYTHON) extract.py dbus_bindings.pxd.in -I$(top_builddir) > dbus_bindings.pxd -dbus_bindings.pyx: dbus_bindings.pyx.in extract.py - -$(PYTHON) extract.py dbus_bindings.pyx.in -I$(top_builddir) > dbus_bindings.pyx +dbus_bindings.c: dbus_bindings.pyx dbus_bindings.pxd + -pyrexc dbus_bindings.pyx -dbus_bindings.c: dbus_bindings.pyx - -pyrexc dbus_bindings.pyx +dbus_glib_bindings.c: dbus_glib_bindings.pyx dbus_bindings.pxd + -pyrexc dbus_glib_bindings.pyx + -- cgit