summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2005-07-14 20:44:15 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2005-07-14 20:44:15 +0000
commit075945f611290f2b9db9a4ed6cf5433f2fd85785 (patch)
tree4430967edcace655eabbc4689299b1ad45aa3a61 /python
parent955cc78770c03edd9b88d5d73ba53901016ddf60 (diff)
downloaddbus-075945f611290f2b9db9a4ed6cf5433f2fd85785.tar.gz
Checking in Rodrigo's patch along with my fixes to the patch
2005-07-14 John (J5) Palmieri <johnp@redhat.com> * bus/activation.c: clean up all tabs to be 8 spaces (bus_activation_activate_service): make sure we clean up if activation fails * bus/dispatch.c: clean up all tabs to be 8 spaces (check_shell_fail_service_auto_start): New function tests to make sure we get fail properly when trying to auto start a service with a faulty command line (check_shell_service_success_auto_start): New function tests to make sure auto started services get the arguments on the command line * test/test-shell-service.c: Added service for testing auto-starting with command line arguments * test/data/valid-service-files/debug-shell-echo-fail.service.in, test/data/valid-service-files/debug-shell-echo-success.service.in: Added service files for testing auto-starting with command line arguments * */.cvsignore: added a bunch of generated files to various .cvsignore files 2005-07-14 Rodrigo Moya <rodrigo@novell.com> * dbus/dbus-shell.[ch]: copy/pasted code from GLib. * dbus/Makefile.am: added new files to build. * bus/activation.c (bus_activation_activate_service): support activation commands with parameters. * test/shell-test.c: added test program for the shell parsing code.
Diffstat (limited to 'python')
-rw-r--r--python/.cvsignore1
-rw-r--r--python/Makefile.am14
2 files changed, 8 insertions, 7 deletions
diff --git a/python/.cvsignore b/python/.cvsignore
index 9c73bb7a..cce7eeaf 100644
--- a/python/.cvsignore
+++ b/python/.cvsignore
@@ -5,5 +5,6 @@ dbus_bindings.pxd
*.lo
*.la
dbus_bindings.c
+dbus_glib_bindings.c
*.pyc
.libs
diff --git a/python/Makefile.am b/python/Makefile.am
index 81a8367a..7bedfd0d 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -31,12 +31,12 @@ CLEANFILES = \
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.pxd: $(srcdir)/dbus_bindings.pxd.in $(srcdir)/extract.py
+ -$(PYTHON) $(srcdir)/extract.py $(srcdir)/dbus_bindings.pxd.in -I$(top_builddir) > $@.tmp && mv $@.tmp $@
-dbus_bindings.c: dbus_bindings.pyx dbus_bindings.pxd
- -pyrexc dbus_bindings.pyx
+dbus_bindings.c: $(srcdir)/dbus_bindings.pyx dbus_bindings.pxd
+ -pyrexc $(srcdir)/dbus_bindings.pyx
+
+dbus_glib_bindings.c: $(srcdir)/dbus_glib_bindings.pyx dbus_bindings.pxd
+ -pyrexc $(srcdir)/dbus_glib_bindings.pyx
-dbus_glib_bindings.c: dbus_glib_bindings.pyx dbus_bindings.pxd
- -pyrexc dbus_glib_bindings.pyx
-