diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2005-07-16 06:45:53 +0000 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2005-07-16 06:45:53 +0000 |
| commit | 8f854c99d85ea2df9f5e2be100a97ba2466bf988 (patch) | |
| tree | 937e66831e95bb234322243ac95fbfadf3440004 | |
| parent | 3b628f920964f078b9afcde9f218c698ad454e12 (diff) | |
This commit was manufactured by cvs2svn to create branch 'dbus-0.35.2'.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | python/Makefile.am | 16 |
4 files changed, 21 insertions, 11 deletions
@@ -1,7 +1,11 @@ -2005-07-15 Colin Walters <walters@verbum.org> +2005-07-16 John (J5) Palmieri <johnp@redhat.com> - * doc/TODO: Add note about convenience wrappers. + * python/Makefile.am: dbus_binding.pxd.in should be included + in EXTRA_DIST not dbus_binding.pxd + fix up $(srcdir) hopefully for the last time + * NEWS: Update to 0.35.1 + 2005-07-15 John (J5) Palmieri <johnp@redhat.com> * NEWS: Update to 0.35 @@ -1,3 +1,9 @@ +D-BUS 0.35.1 (16 July 2005) +=== +- Fixed dist error where python/dbus_bindings.pxd was being shipped + instead of dbus_bindings.pxd.in +- Use this instead of the 0.35 tarball + D-BUS 0.35 (15 July 2005) === - --with-dbus-user added to the configure scripts for configuring the diff --git a/configure.in b/configure.in index fb5bb657..0bad6d75 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_PREREQ(2.52) AC_INIT(dbus/dbus.h) -AM_INIT_AUTOMAKE(dbus, 0.36) +AM_INIT_AUTOMAKE(dbus, 0.35.1) AM_CONFIG_HEADER(config.h) diff --git a/python/Makefile.am b/python/Makefile.am index 302ed0d2..3621800a 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -10,19 +10,19 @@ 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 -nodist_dbus_bindings_la_SOURCES = $(srcdir)/dbus_bindings.c +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 = $(srcdir)/dbus_glib_bindings.c +nodist_dbus_glib_bindings_la_SOURCES = dbus_glib_bindings.c EXTRA_DIST = \ dbus_h_wrapper.h \ dbus_bindings.pyx \ dbus_glib_bindings.pyx \ - dbus_bindings.pxd \ + dbus_bindings.pxd.in \ extract.py CLEANFILES = \ @@ -32,11 +32,11 @@ CLEANFILES = \ 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 $@ + -$(PYTHON) $(srcdir)/extract.py $(srcdir)/dbus_bindings.pxd.in -I$(srcdir)/$(top_builddir) -I$(srcdir) > $@.tmp && mv $@.tmp $@ -dbus_bindings.c: $(srcdir)/dbus_bindings.pyx $(srcdir)/dbus_bindings.pxd - -pyrexc $(srcdir)/dbus_bindings.pyx +dbus_bindings.c: $(srcdir)/dbus_bindings.pyx dbus_bindings.pxd + -pyrexc $(srcdir)/dbus_bindings.pyx -I. -o ./dbus_bindings.c -dbus_glib_bindings.c: $(srcdir)/dbus_glib_bindings.pyx $(srcdir)/dbus_bindings.pxd - -pyrexc $(srcdir)/dbus_glib_bindings.pyx +dbus_glib_bindings.c: $(srcdir)/dbus_glib_bindings.pyx dbus_bindings.pxd + -pyrexc $(srcdir)/dbus_glib_bindings.pyx -I. -o ./dbus_glib_bindings.c |