2003-04-14 Paolo Carlini <pcarlini@unitus.it>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / Makefile.am

diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am
index c8c1df1..97fcfa8 100644 (file)
--- 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
+## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
 ## Free Software Foundation, Inc.
 ##
 ## This file is part of the libstdc++ version 3 distribution.
@@ -50,8 +50,8 @@ check-script-install: $(top_builddir)/mkcheck
 # 'check-abi' to test for changes against that file.
 baseline_file = @baseline_file@
 check-abi: $(top_builddir)/testsuite/abi_check
-       -(cd testsuite; \
-         ${top_srcdir}/config/abi/extract_symvers \
+       -@(cd testsuite; \
+         @glibcpp_srcdir@/config/abi/extract_symvers \
             ../src/.libs/libstdc++.so \
             ./current_symbols.txt && \
          ./abi_check --check ./current_symbols.txt ${baseline_file})
@@ -63,7 +63,7 @@ new-abi-baseline:
            t=`echo $${output} | sed 's=.*config/abi/=='`; \
            echo "Baseline file already exists, writing to $${t} instead."; \
          fi; \
-         ${top_srcdir}/config/abi/extract_symvers \
+         @glibcpp_srcdir@/config/abi/extract_symvers \
             src/.libs/libstdc++.so $${output})
 
 # These rules are messy, but are hella worth it.
@@ -90,7 +90,7 @@ doxygen-man:
 # Multilib support.
 MAKEOVERRIDES=
 
-# Multilib variables.
+# Multilib support variables.
 MULTISRCTOP =
 MULTIBUILDTOP =
 MULTIDIRS =
@@ -98,16 +98,16 @@ MULTISUBDIR =
 MULTIDO = true
 MULTICLEAN = true
 
-# Multilib Makefile bits.
+# Multilib support.
 .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
        maintainer-clean-multi
 
-all-am: all-multi
-install-am: install-multi
-mostlyclean-am: mostlyclean-multi
-clean-am: clean-multi
-distclean-am: distclean-multi
-maintainer-clean-am: maintainer-clean-multi
+all-recursive: all-multi
+install-recursive: install-multi
+mostlyclean-recursive: mostlyclean-multi
+clean-recursive: clean-multi
+distclean-recursive: distclean-multi
+maintainer-clean-recursive: maintainer-clean-multi
 
 all-multi:
        : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
@@ -156,6 +156,7 @@ AM_MAKEFLAGS = \
        "includedir=$(includedir)" \
        "prefix=$(prefix)" \
        "tooldir=$(tooldir)" \
+       "gxx_include_dir=$(gxx_include_dir)" \
        "AR=$(AR)" \
        "AS=$(AS)" \
        "LD=$(LD)" \