summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-10-09 12:26:21 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2007-10-09 12:26:21 +0100
commit4fdbc65e42d940ba6cc4445a8a83af90dc3d3a34 (patch)
tree1a7a8ca660e0052c14f8a48341968e2958902cad
parent09611c45b3301e93a34a03366e058c3edc184e47 (diff)
downloaddbus-python-4fdbc65e42d940ba6cc4445a8a83af90dc3d3a34.tar.gz
Revert "Make sure extensions are built before docs; get rid of strange inter-directory dependency"
This reverts commit 5321d836844f3bc06a6d5796c9ca902e0bd6f4cc.
-rw-r--r--Makefile.am7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index cea958b..fff5e2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
# the api, doc, include subdirs don't need their own Makefile.am
# the dbus subdir is handled with non-recursive make because of #12741
-SUBDIRS = _dbus_bindings _dbus_glib_bindings examples m4 test tools .
+SUBDIRS = _dbus_bindings _dbus_glib_bindings examples m4 test tools
CLEANFILES =
EXTRA_DIST = \
@@ -105,6 +105,11 @@ all: api/index.html
clean-local:
rm -rf api
+_dbus_bindings/_dbus_bindings.la:
+ $(MAKE) -C _dbus_bindings
+_dbus_glib_bindings/_dbus_glib_bindings.la:
+ $(MAKE) -C _dbus_glib_bindings
+
APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/_dbus_bindings/.libs:$(abs_top_builddir)/_dbus_glib_bindings/.libs
api api/index.html: $(nobase_python_PYTHON) \