Makefile.am (doxygen): Assume script is missing execute perms.

2001-04-19  Phil Edwards  <pme@sources.redhat.com>

	* Makefile.am (doxygen):  Assume script is missing execute perms.
	* Makefile.in:  Regenerated.
	* docs/doxygen/user.cfg.in:  Add class diagrams and source browsing.

From-SVN: r41432

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 13010ef87a87da9d740974163ef3a2c2954fd609..3c8fbd7d0b6abee12137031315e3d0b8458c3150 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-19  Phil Edwards  <pme@sources.redhat.com>
+
+       * Makefile.am (doxygen):  Assume script is missing execute perms.
+       * Makefile.in:  Regenerated.
+       * docs/doxygen/user.cfg.in:  Add class diagrams and source browsing.
+
 2001-04-17  Loren J. Rittle  <ljrittle@acm.org>
 
        * testsuite/27_io/istream_seeks.cc: Inform DejaGnu of required files.

diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am
index 1205bfd4baa9fd181d6be798a97156ae5c82eefc..0f32f384aa998bc0990b8fd4204425178eacfbc2 100644 (file)
--- a/libstdc++-v3/Makefile.am
+++ b/libstdc++-v3/Makefile.am
@@ -48,7 +48,8 @@ check-script-install: $(top_builddir)/mkcheck
 doxygen:
        -(srcdir=`cd ${top_srcdir}; pwd`; \
          outdir=`pwd`; \
-         ${srcdir}/docs/doxygen/run_doxygen --mode=user $${srcdir} $${outdir})
+         /bin/sh ${srcdir}/docs/doxygen/run_doxygen \
+                   --mode=user $${srcdir} $${outdir})
 
 doxygen-maint:
        -(srcdir=`cd ${top_srcdir}; pwd`; \

diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index c53bbcbca82c57b1ba1bc4db3fcdc6df3239dc77..8f0c6cc7f16c1e6358b90c003d93bbc2dd143ad9 100644 (file)
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -136,7 +136,43 @@ MULTICLEAN = true
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
 # friends when we are called from the top level Makefile.
-AM_MAKEFLAGS =         "AR_FLAGS=$(AR_FLAGS)"  "CC_FOR_BUILD=$(CC_FOR_BUILD)"  "CC_FOR_TARGET=$(CC_FOR_TARGET)"        "CFLAGS=$(CFLAGS)"      "CXXFLAGS=$(CXXFLAGS)"  "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)"  "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)"        "INSTALL=$(INSTALL)"    "INSTALL_DATA=$(INSTALL_DATA)"  "INSTALL_PROGRAM=$(INSTALL_PROGRAM)"    "INSTALL_SCRIPT=$(INSTALL_SCRIPT)"      "LDFLAGS=$(LDFLAGS)"    "LIBCFLAGS=$(LIBCFLAGS)"        "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)"  "MAKE=$(MAKE)"  "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)"         "PICFLAG=$(PICFLAG)"    "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)"      "SHELL=$(SHELL)"        "exec_prefix=$(exec_prefix)"    "infodir=$(infodir)"    "libdir=$(libdir)"      "includedir=$(includedir)"      "prefix=$(prefix)"      "tooldir=$(tooldir)"    "AR=$(AR)"      "AS=$(AS)"      "LD=$(LD)"      "LIBCFLAGS=$(LIBCFLAGS)"        "PICFLAG=$(PICFLAG)"    "RANLIB=$(RANLIB)"      "NM=$(NM)"      "NM_FOR_BUILD=$(NM_FOR_BUILD)"  "NM_FOR_TARGET=$(NM_FOR_TARGET)"        "DESTDIR=$(DESTDIR)"    "WERROR=$(WERROR)" 
+AM_MAKEFLAGS = \
+       "AR_FLAGS=$(AR_FLAGS)" \
+       "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+       "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
+       "CFLAGS=$(CFLAGS)" \
+       "CXXFLAGS=$(CXXFLAGS)" \
+       "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+       "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "INSTALL=$(INSTALL)" \
+       "INSTALL_DATA=$(INSTALL_DATA)" \
+       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+       "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+       "LDFLAGS=$(LDFLAGS)" \
+       "LIBCFLAGS=$(LIBCFLAGS)" \
+       "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+       "MAKE=$(MAKE)" \
+       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+       "PICFLAG=$(PICFLAG)" \
+       "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+       "SHELL=$(SHELL)" \
+       "exec_prefix=$(exec_prefix)" \
+       "infodir=$(infodir)" \
+       "libdir=$(libdir)" \
+       "includedir=$(includedir)" \
+       "prefix=$(prefix)" \
+       "tooldir=$(tooldir)" \
+       "AR=$(AR)" \
+       "AS=$(AS)" \
+       "LD=$(LD)" \
+       "LIBCFLAGS=$(LIBCFLAGS)" \
+       "PICFLAG=$(PICFLAG)" \
+       "RANLIB=$(RANLIB)" \
+       "NM=$(NM)" \
+       "NM_FOR_BUILD=$(NM_FOR_BUILD)" \
+       "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
+       "DESTDIR=$(DESTDIR)" \
+       "WERROR=$(WERROR)" 
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 CONFIG_HEADER = config.h
@@ -429,7 +465,8 @@ check-script-install: $(top_builddir)/mkcheck
 doxygen:
        -(srcdir=`cd ${top_srcdir}; pwd`; \
          outdir=`pwd`; \
-         ${srcdir}/docs/doxygen/run_doxygen --mode=user $${srcdir} $${outdir})
+         /bin/sh ${srcdir}/docs/doxygen/run_doxygen \
+                   --mode=user $${srcdir} $${outdir})
 
 doxygen-maint:
        -(srcdir=`cd ${top_srcdir}; pwd`; \