From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 25 Feb 2011 15:49:19 +0000 (+0000)
Subject: Merge branch 'doxygenate' into dbus-1.4
X-Git-Tag: dbus-1.4.8~14^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ba52066cadb90edb192ea93d55ba775bdb73d7;p=thirdparty%2Fdbus.git

Merge branch 'doxygenate' into dbus-1.4

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Conflicts:
	configure.ac
	doc/Makefile.am
---

f1ba52066cadb90edb192ea93d55ba775bdb73d7
diff --cc doc/Makefile.am
index 7fe0dc108,28b2ddfa8..adac743c7
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@@ -1,8 -1,8 +1,10 @@@
+ apidir = @htmldir@/api
+ 
 -man_MANS = \
 +# automake normally assumes that man pages are generated files;
 +# these ones aren't, so we need the dist_ prefix to say that they're
 +# their own source code
 +dist_man1_MANS = \
  	dbus-cleanup-sockets.1 \
 -	dbus-daemon.1 \
  	dbus-launch.1 \
  	dbus-monitor.1 \
  	dbus-send.1 \
@@@ -40,8 -36,9 +42,9 @@@ STATIC_DOCS = 
  
  EXTRA_DIST = \
  	file-boilerplate.c \
+ 	doxygen_to_devhelp.xsl \
  	$(STATIC_DOCS) \
 -	$(MAN_IN_FILES) $(man_MANS)
 +	$(MAN_IN_FILES)
  
  HTML_FILES=					\
  	dbus-faq.html				\