From 4312e020f1419864e1c05ecb0e85b4876d01bd08 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Fri, 18 Jan 2008 08:16:51 +0000 Subject: [multiple changes] 2008-01-18 Benjamin Kosnik * docs/*: To... * doc/*: ...here. * testsuite/Makefile.am: Move doc-performance to... * Makefile.am: Add doc to SUBDIRS, move doxygen-* rules to... * doc/Makefile.am: Consolidate documentation creation here. (doc-doxygen-html): New. (doc-doxygen-man): New. (doc-performance): New. * doc/Makefile.in: New. * acinclude.m4 (glibcxx_SUBDIRS): Add doc directory. * doc/doxygen/guide.html: Edit for unified html configuration. * doc/doxygen/mainpage.html: Same. * doc/doxygen/run_doxygen: Same, more namespace fixups for man generation. * doc/doxygen/user.cfg.in: Update for doxygen 1.5.4. * include/tr1_impl/random: Remove maint from doxygen markup. * include/tr1_impl/functional: Same. * include/std/tuple: Same. * include/std/streambuf: Same. * include/std/bitset: Same. * include/std/limits: Same. * include/std/fstream: Same. * include/std/istream: Same. * include/std/sstream: Same. * include/ext/pool_allocator.h: Same. * include/ext/rc_string_base.h: Same. * include/bits/basic_ios.h: Same. * include/bits/stl_list.h: Same. * include/bits/stl_map.h: Same. * include/bits/locale_classes.h: Same. * include/bits/stl_set.h: Same. * include/bits/stl_iterator_base_types.h: Same. * include/bits/basic_string.h: Same. * include/bits/stl_multimap.h: Same. * include/bits/stl_vector.h: Same. * include/bits/ios_base.h: Same. * include/bits/stl_deque.h: Same. * include/bits/postypes.h: Same. * include/bits/stl_multiset.h: Same. * include/bits/stl_algo.h: Same. * include/bits/stl_iterator.h: Same. * include/bits/stl_tempbuf.h: Same. * include/bits/stl_construct.h: Same. * include/bits/stl_relops.h: Same. * include/tr1/tuple: Same. * include/backward/auto_ptr.h: Same. * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Fixups for line number changes. * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/vector/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/deque/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/ constructor_1_neg.cc: Same. * testsuite/23_containers/list/requirements/dr438/ constructor_2_neg.cc: Same. * testsuite/20_util/auto_ptr/assign_neg.cc: Same. * aclocal.m4: Regenerate. * config.h.in: Regenerate. * configure: Regenerate. * Makefile.in: Regenerate. * src/Makefile.in: Regenerate. * po/Makefile.in: Regenerate. * libmath/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * libsupc++/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. * scripts/make_graphs.py: Correct paths for new layout. 2008-01-17 Benjamin Kosnik * acinclude.m4 (AC_LC_MESSAGES): Remove serial. * linkage.m4 (AC_REPLACE_MATHFUNCS): Same. * configure: Regenerate. * aclocal.m4: Regenerate. From-SVN: r131625 --- libstdc++-v3/Makefile.am | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) (limited to 'libstdc++-v3/Makefile.am') diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index 562b3e86a91..c1649e4a383 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -1,6 +1,6 @@ ## Makefile for the toplevel directory of the GNU C++ Standard library. ## -## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2008 ## Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. @@ -25,41 +25,20 @@ include $(top_srcdir)/fragment.am if GLIBCXX_HOSTED - hosted_source = libmath src po testsuite + hosted_source = libmath doc src po testsuite endif ## Keep this list sync'd with acinclude.m4:GLIBCXX_CONFIGURE. SUBDIRS = include libsupc++ $(hosted_source) ACLOCAL_AMFLAGS = -I . -I .. -I ../config -# These rules are messy, but are hella worth it. -doxygen: - -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ - builddir=`${PWD_COMMAND}`; \ - ${SHELL} ${srcdir}/docs/doxygen/run_doxygen \ - --host_alias=${host_alias} \ - --mode=user $${srcdir} $${builddir}) - -doxygen-maint: - -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ - builddir=`${PWD_COMMAND}`; \ - ${SHELL} ${srcdir}/docs/doxygen/run_doxygen \ - --host_alias=${host_alias} \ - --mode=maint $${srcdir} $${builddir}) - -doxygen-man: - -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ - builddir=`${PWD_COMMAND}`; \ - ${SHELL} ${srcdir}/docs/doxygen/run_doxygen \ - --host_alias=${host_alias} \ - --mode=man $${srcdir} $${builddir}) - -.PHONY: doxygen doxygen-maint doxygen-man - # Handy forwarding targets. check-%: cd testsuite && $(MAKE) $@ +doc-%: + cd doc && $(MAKE) $@ + # Multilib support. MAKEOVERRIDES= @@ -110,11 +89,3 @@ AM_MAKEFLAGS = \ # Subdir rules rely on $(FLAGS_TO_PASS) FLAGS_TO_PASS = $(AM_MAKEFLAGS) - -# Installation of distribution html documentation not yet supported -# TODO: Write custom install-html rule. -.PHONY: install-html install-pdf -install-html: - -# No install-pdf support in automake yet -install-pdf: -- cgit v1.2.1