3 files changed, 33 insertions, 15 deletions
diff --git a/cpp/docs/api/Makefile.am b/cpp/docs/api/Makefile.am
index a02e7dd084..2b05622d2d 100644
--- a/cpp/docs/api/Makefile.am
+++ b/cpp/docs/api/Makefile.am
@@ -1,21 +1,30 @@
-html: doxygen.tstamp
+#
+# Run doxygen to generate HTML doc.
+# Generate dependency files so its rebuilt only when needed. 
+#
+
+EXTRA_DIST = html user.doxygen
 
 dist-hook: html
 
-EXTRA_DIST = \
-  html \
-  user.doxygen
+html: doxygen.mk
+	make -f doxygen.mk $@
+
+html-dev: doxygen.mk
+	make -f doxygen.mk $@
+
+doxygen.mk: doxygen.deps
 
-SOURCES = \
-  $(wildcard $(top_srcdir)/gen/*.h) \
-  $(wildcard $(top_srcdir)/lib/common/*.h) \
-  $(wildcard $(top_srcdir)/lib/common/sys/*.h) \
-  $(wildcard $(top_srcdir)/lib/common/framing/*.h) \
-  $(wildcard $(top_srcdir)/lib/client/*.h)
+doxygen.deps: force
+	echo "html: \\" >> $@-t
+	find $(top_srcdir) -name "*.h" -exec echo "  {} \\" \; >> $@-t
+	echo >> $@-t
+	echo "html-dev: html\\" >> $@-t
+	find $(top_srcdir) -name "*.cpp" -exec echo "  {} \\" \; >> $@-t
+	echo >> $@-t
+	mv $@-t $@
 
-doxygen.tstamp: user.doxygen $(SOURCES)
-	doxygen $(srcdir)/user.doxygen
-	touch $@
+force:
 
 clean-local:
-	rm -rf docs.tstamp html man latex doxygen.tstamp xml
+	rm -rf html html-dev *.deps
diff --git a/cpp/docs/api/developer.doxygen b/cpp/docs/api/developer.doxygen
index 4679876d09..46661c14ca 100644
--- a/cpp/docs/api/developer.doxygen
+++ b/cpp/docs/api/developer.doxygen
@@ -635,7 +635,7 @@ GENERATE_HTML          = YES
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = html
+HTML_OUTPUT            = html-dev
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
diff --git a/cpp/docs/api/doxygen.mk b/cpp/docs/api/doxygen.mk
new file mode 100644
index 0000000000..8429eb42b7
--- /dev/null
+++ b/cpp/docs/api/doxygen.mk
@@ -0,0 +1,9 @@
+include doxygen.deps
+
+html: user.doxygen 
+	doxygen user.doxygen
+	touch $@
+
+html-dev: developer.doxygen
+	doxygen developer.doxygen
+	touch $@