2001-11-01 Phil Edwards <pme@gcc.gnu.org>

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

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 202cbca..4fa5f82 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -21,8 +21,6 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-## $Id: Makefile.am,v 1.89 2001/06/26 21:22:57 bkoz Exp $
-
 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
 
@@ -63,11 +61,11 @@ INCLUDES = \
 
 sources = \
        basic_file.cc bitset.cc c++locale.cc cmath.cc codecvt.cc \
-       complex_io.cc functexcept.cc globals.cc ios.cc limitsMEMBERS.cc \
-       locale.cc locale-inst.cc localename.cc misc-inst.cc stdexcept.cc \
-       stl-inst.cc string-inst.cc strstream.cc valarray-inst.cc \
-       wstring-inst.cc
-
+       complex_io.cc functexcept.cc globals.cc ios.cc limits.cc \
+       locale.cc locale-inst.cc localename.cc \
+       collate.cc messages.cc moneypunct.cc numpunct.cc time.cc \
+       misc-inst.cc stdexcept.cc stl-inst.cc string-inst.cc strstream.cc \
+       valarray-inst.cc wstring-inst.cc concept-inst.cc
 
 VPATH = $(top_srcdir):$(top_srcdir)/src
 
@@ -77,7 +75,7 @@ libstdc___la_LIBADD = \
        ../libmath/libmath.la @libio_la@ \
        ../libsupc++/libsupc++convenience.la
 
-libstdc___la_LDFLAGS = -version-info 3:0:0 -lm
+libstdc___la_LDFLAGS = -version-info @libtool_VERSION@ -lm
 
 libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
 
@@ -90,16 +88,20 @@ strstream.lo: strstream.cc
 strstream.o: strstream.cc
        $(CXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -c $<
 
+# Use special rules for the concept-checking instantiations so that all
+# the generated template functions are also instantiated.  Force the checks
+# to be on so that the instantiations are actually seen.
+concept-inst.lo: concept-inst.cc
+       $(LTCXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
+concept-inst.o: concept-inst.cc
+       $(CXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -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
 # set this option because CONFIG_CXXFLAGS has to be after
 # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
 # as the occasion call for it. (ie, --enable-debug)
-#
-# The no-implicit-templates flag will generate unresolved references to
-# the concept-checking symbols.  So we must disable the checks while
-# actually building the library.
 AM_CXXFLAGS = \
        -fno-implicit-templates \
        $(LIBSUPCXX_CXXFLAGS) \