diff -r e1055232c670 -r f2c532541730 doc/Makefile.am
--- a/doc/Makefile.am	Thu Jun 22 15:16:11 2006 +0000
+++ b/doc/Makefile.am	Thu Jun 22 18:20:25 2006 +0000
@@ -1,50 +1,66 @@
 htmldir = $(datadir)/doc/$(PACKAGE)/html
 
-EXTRA_DIST = \
-	html \
-	icons/geom/ftv2doc.png \
-	icons/geom/ftv2folderclosed.png \
-	icons/geom/ftv2folderopen.png \
-	coding_style.dox \
-	developers_interface.dox \
-	dirs.dox \
-	getstart.dox \
-	graph-adaptors.dox \
-	graph_io.dox \
-	graphs.dox \
-	groups.dox \
-	license.dox \
-	mainpage.dox \
-	maps.dox \
-	named-param.dox \
-	namespaces.dox \
-	quicktour.dox \
-	ugraphs.dox
+EXTRA_DIST += \
+	doc/html \
+	doc/icons/geom/ftv2doc.png \
+	doc/icons/geom/ftv2folderclosed.png \
+	doc/icons/geom/ftv2folderopen.png \
+	doc/coding_style.dox \
+	doc/developers_interface.dox \
+	doc/dirs.dox \
+	doc/getstart.dox \
+	doc/graph-adaptors.dox \
+	doc/graph_io.dox \
+	doc/graphs.dox \
+	doc/groups.dox \
+	doc/license.dox \
+	doc/mainpage.dox \
+	doc/maps.dox \
+	doc/named-param.dox \
+	doc/namespaces.dox \
+	doc/quicktour.dox \
+	doc/ugraphs.dox
 
-html/index.html:
+doc:
 	if test ${doxygen_found} = yes; then \
+	  cd doc; \
 	  doxygen Doxyfile; \
-	  cp $(srcdir)/icons/geom/ftv2* html; \
+	  cd ..; \
+	  cp $(srcdir)/doc/icons/geom/ftv2* doc/html; \
 	fi
 
-html: html/index.html
+doc-clean:
+	if test ${doxygen_found} = yes; then \
+	  rm -rf doc/html; \
+	  rm -f doc/doxygen.log; \
+	  cd doc; \
+	  doxygen Doxyfile; \
+	  cd ..; \
+	  cp $(srcdir)/doc/icons/geom/ftv2* doc/html; \
+	fi
 
 clean-local:
-	-rm -rf html
+	-rm -rf doc/html
+	-rm -f doc/doxygen.log
 
-install-data-local: html/index.html
+doc/html:
+	$(MAKE) $(AM_MAKEFLAGS) doc-clean
+
+install-data-local: doc/html
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
-	@dir='html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
+	@dir='doc/html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f"; \
 	  $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f; \
 	done
 
-uninstall-local: html/index.html
+uninstall-local: doc/html
 	@$(NORMAL_UNINSTALL)
-	@dir='html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
+	@dir='doc/html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \
 	  rm -f $(DESTDIR)$(htmldir)/$$f; \
 	done
+
+.PHONY: doc doc-clean