summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2005-07-16 06:28:57 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2005-07-16 06:28:57 +0000
commit66319122ea664fef87cbb78e301ed1637a5cc72b (patch)
tree88a6df57b94cea4a2edd2457b5ccf6a7b931e179
parentab05a20b0f418901a731be025dcf1823ef3fa76b (diff)
fix up $(srcdir) hopefully for the last time
-rw-r--r--ChangeLog1
-rw-r--r--python/Makefile.am17
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 93279419..1011ff47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
* 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
diff --git a/python/Makefile.am b/python/Makefile.am
index 266c08e7..7a8859bd 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -10,12 +10,12 @@ 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 = \
@@ -32,11 +32,14 @@ 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 $@
+ -cp $(srcdir)/dbus_h_wrapper.h ./
+ -$(PYTHON) $(srcdir)/extract.py $(srcdir)/dbus_bindings.pxd.in -I$(srcdir)/$(top_builddir) > $@.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
+ -cp $(srcdir)/dbus_bindings.pyx ./
+ -pyrexc dbus_bindings.pyx
-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
+ -cp $(srcdir)/dbus_glib_bindings.pyx ./
+ -pyrexc dbus_glib_bindings.pyx