2003-06-26 Paolo Carlini <pcarlini@unitus.it>

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

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 534d58c..a3aabfc 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile for the src subdirectory 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.
@@ -52,7 +52,7 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
 # These bits are all figured out from configure. Look in acinclude.m4
 # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
 CONFIG_CXXFLAGS = \
-       @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@
+       @SECTION_FLAGS@ @EXTRA_CXX_FLAGS@
 
 # Warning flags to use.
 WARN_CXXFLAGS = \
@@ -62,13 +62,12 @@ WARN_CXXFLAGS = \
 GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
 LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
-LIBIO_INCLUDES = @LIBIO_INCLUDES@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 
 INCLUDES = \
        -nostdinc++ \
        $(GLIBCPP_INCLUDES) \
-       $(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \
+       $(LIBSUPCXX_INCLUDES) $(LIBMATH_INCLUDES) \
        $(TOPLEVEL_INCLUDES)
 
 # Source files linked in via configuration/make substitution for a
@@ -117,13 +116,13 @@ basic_file.cc: ${glibcpp_srcdir}/@BASIC_FILE_CC@
 
 # Sources present in the src directory.
 sources = \
-       bitset.cc \
+       allocator-inst.cc \
        codecvt.cc \
        complex_io.cc \
        concept-inst.cc \
        ctype.cc \
+       demangle.cc \
        ext-inst.cc \
-       fstream.cc \
        fstream-inst.cc \
        functexcept.cc \
        globals.cc \
@@ -138,7 +137,6 @@ sources = \
        ostream-inst.cc \
        sstream-inst.cc \
        stdexcept.cc \
-       stl-inst.cc \
        streambuf-inst.cc \
        string-inst.cc \
        strstream.cc \
@@ -152,7 +150,7 @@ VPATH = $(top_srcdir)/src:$(top_srcdir)
 libstdc___la_SOURCES = $(sources)
 
 libstdc___la_LIBADD = \
-       $(top_builddir)/libmath/libmath.la @libio_la@ \
+       $(top_builddir)/libmath/libmath.la \
        $(top_builddir)/libsupc++/libsupc++convenience.la
 
 libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD)
@@ -178,6 +176,13 @@ concept-inst.lo: concept-inst.cc
 concept-inst.o: concept-inst.cc
        $(CXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
 
+# Use special rules for the demangler, so that an additional implicit
+# instantiation file is not necessary.
+demangle.lo: demangle.cc
+       $(LTCXXCOMPILE) -fimplicit-templates -c $<
+demangle.o: demangle.cc
+       $(CXXCOMPILE) -fimplicit-templates -c $<
+
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
 # modified in a per-library or per-sub-library way.  Need to manually
@@ -239,13 +244,12 @@ stamp-debug:
        if test ! -d ${debugdir}; then \
          mkdir -p ${debugdir}; \
          (cd ${debugdir}; \
-         cp ../Makefile .; \
-         sed 's/top_builddir = ../top_builddir = ..\/../g' \
-         < Makefile > temp.1; \
-         sed 's/all-local: build_debug/all-local:/g' < temp.1 > temp.2; \
-         sed 's/install-data-local: install_debug/install-data-local:/g' \
-         < temp.2 > temp.3; \
-          mv temp.3 Makefile) ; \
+         sed -e 's/top_builddir = \.\./top_builddir = ..\/../' \
+             -e 's/srcdir = \.\./srcdir = ..\/../' \
+             -e 's/glibcpp_basedir = \.\./glibcpp_basedir = ..\/../' \
+             -e 's/all-local: build_debug/all-local:/' \
+             -e 's/install-data-local: install_debug/install-data-local:/' \
+         < ../Makefile > Makefile) ; \
        fi; \
        echo `date` > stamp-debug;