1.1 --- a/doc/Makefile.am	Tue Jan 22 10:59:14 2008 +0000
     1.2 +++ b/doc/Makefile.am	Wed Jan 23 16:26:41 2008 +0100
     1.3 @@ -1,56 +1,53 @@
     1.4 -htmldir = $(datadir)/doc/$(PACKAGE)/html
     1.5 -
     1.6  EXTRA_DIST += \
     1.7  	doc/Makefile \
     1.8 -	doc/Doxyfile.in
     1.9 +	doc/Doxyfile.in \
    1.10 +	doc/coding_style.dox \
    1.11 +	doc/dirs.dox \
    1.12 +	doc/groups.dox \
    1.13 +	doc/license.dox \
    1.14 +	doc/mainpage.dox \
    1.15 +	doc/namespaces.dox \
    1.16 +	doc/html
    1.17  
    1.18 -doc:
    1.19 +doc/html:
    1.20 +	$(MAKE) $(AM_MAKEFLAGS) html
    1.21 +
    1.22 +html-local:
    1.23  	if test ${doxygen_found} = yes; then \
    1.24  	  cd doc; \
    1.25  	  doxygen Doxyfile; \
    1.26  	  cd ..; \
    1.27 -	fi
    1.28 -
    1.29 -doc-clean:
    1.30 -	if test ${doxygen_found} = yes; then \
    1.31 -	  rm -rf doc/html; \
    1.32 -	  rm -f doc/doxygen.log; \
    1.33 -	  cd doc; \
    1.34 -	  doxygen Doxyfile; \
    1.35 -	  cd ..; \
    1.36 +	else \
    1.37 +	  echo; \
    1.38 +	  echo "Doxygen not found."; \
    1.39 +	  echo; \
    1.40 +	  exit 1; \
    1.41  	fi
    1.42  
    1.43  clean-local:
    1.44  	-rm -rf doc/html
    1.45  	-rm -f doc/doxygen.log
    1.46  
    1.47 -doc/html:
    1.48 -	$(MAKE) $(AM_MAKEFLAGS) doc-clean
    1.49 -
    1.50  update-external-tags:
    1.51  	wget -O doc/libstdc++.tag.tmp http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag && \
    1.52  	mv doc/libstdc++.tag.tmp doc/libstdc++.tag || \
    1.53  	rm doc/libstdc++.tag.tmp
    1.54  
    1.55 -if WANT_DOC
    1.56 -
    1.57 -install-data-local: doc/html
    1.58 +install-html-local: doc/html
    1.59  	@$(NORMAL_INSTALL)
    1.60 -	$(mkinstalldirs) $(DESTDIR)$(htmldir)
    1.61 -	@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 \
    1.62 +	$(mkinstalldirs) $(DESTDIR)$(htmldir)/docs
    1.63 +	for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
    1.64  	  f="`echo $$p | sed -e 's|^.*/||'`"; \
    1.65 -	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f"; \
    1.66 -	  $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f; \
    1.67 +	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f"; \
    1.68 +	  $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f; \
    1.69  	done
    1.70  
    1.71 -uninstall-local: doc/html
    1.72 +uninstall-local:
    1.73  	@$(NORMAL_UNINSTALL)
    1.74 -	@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 \
    1.75 +	for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
    1.76  	  f="`echo $$p | sed -e 's|^.*/||'`"; \
    1.77 -	  echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \
    1.78 -	  rm -f $(DESTDIR)$(htmldir)/$$f; \
    1.79 +	  echo " rm -f $(DESTDIR)$(htmldir)/docs/$$f"; \
    1.80 +	  rm -f $(DESTDIR)$(htmldir)/docs/$$f; \
    1.81  	done
    1.82  
    1.83 -endif WANT_DOC
    1.84 -
    1.85 -.PHONY: doc doc-clean
    1.86 +.PHONY: update-external-tags