From: John (J5) Palmieri Date: Fri, 10 Feb 2006 21:47:10 +0000 (+0000) Subject: 2006-02-10 John (J5) Palmieri X-Git-Tag: dbus-0.61~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ebf7e7700e18dd0f5202d309138b60ea84906ab;p=platform%2Fupstream%2Fdbus.git 2006-02-10 John (J5) Palmieri * mono/doc/Makefile.am: Fix parallel make problem with mono-doc (Bug #4213) Patch from Doug Goldstein --- diff --git a/ChangeLog b/ChangeLog index 2beb2ad..a5c85d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-02-10 John (J5) Palmieri + * mono/doc/Makefile.am: Fix parallel make problem with mono-doc + (Bug #4213) Patch from Doug Goldstein + +2006-02-10 John (J5) Palmieri + * bus/connection.c (bus_connections_expect_reply): Make pending reply limit not common to all connections (Bug #5416) Patch from Kimmo Hämäläinen diff --git a/mono/doc/Makefile.am b/mono/doc/Makefile.am index e98a027..7f87c25 100644 --- a/mono/doc/Makefile.am +++ b/mono/doc/Makefile.am @@ -22,7 +22,9 @@ noinst_DATA = $(TARGETS) ASSEMBLER = $(MONODOC) --assemble UPDATER = $(MONODOC) --update -dbus-sharp-docs.zip dbus-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml +dbus-sharp-docs.zip: dbus-sharp-docs.tree + +dbus-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml $(ASSEMBLER) --ecma $(srcdir)/en -o dbus-sharp-docs update: