2008-04-10 Benjamin Kosnik <bkoz@redhat.com>

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

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 4195801..e6c0aad 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -112,8 +112,7 @@ atomicity.cc: ${atomicity_file}
 # Source files linked in via configuration/make substitution for a
 # particular host, but with ad hoc naming rules.
 host_sources_extra = \
-       basic_file.cc \
-       c++locale.cc
+       basic_file.cc c++locale.cc ${ldbl_compat_sources} ${parallel_sources}
 
 c++locale.cc: ${glibcxx_srcdir}/$(CLOCALE_CC)
        $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_CC) ./$@ || true
@@ -121,6 +120,12 @@ c++locale.cc: ${glibcxx_srcdir}/$(CLOCALE_CC)
 basic_file.cc: ${glibcxx_srcdir}/$(BASIC_FILE_CC)
        $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_CC) ./$@ || true
 
+if ENABLE_PARALLEL
+parallel_sources = parallel_list.cc parallel_settings.cc
+else
+parallel_sources =
+endif
+
 if GLIBCXX_LDBL_COMPAT
 ldbl_compat_sources = compatibility-ldbl.cc
 else
@@ -129,6 +134,7 @@ endif
 
 # Sources present in the src directory.
 sources = \
+       atomic.cc \
        bitmap_allocator.cc \
        pool_allocator.cc \
        mt_allocator.cc \
@@ -136,18 +142,21 @@ sources = \
        compatibility.cc \
        complex_io.cc \
        ctype.cc \
+       date_time.cc \
        debug.cc \
-       debug_list.cc \
        functexcept.cc \
        hash.cc \
        hash_c++0x.cc \
        globals_io.cc \
+       hashtable.cc \
+       hashtable_c++0x.cc \
        ios.cc \
        ios_failure.cc \
        ios_init.cc \
        ios_locale.cc \
        limits.cc \
        list.cc \
+       debug_list.cc \
        locale.cc \
        locale_init.cc \
        locale_facets.cc \
@@ -175,10 +184,10 @@ sources = \
        wlocale-inst.cc \
        wstring-inst.cc \
        ${host_sources} \
-       ${host_sources_extra} \
-       ${ldbl_compat_sources}
+       ${host_sources_extra} 
 
-VPATH = $(top_srcdir)/src:$(top_srcdir)
+vpath % $(top_srcdir)/src
+vpath % $(top_srcdir)
 
 libstdc___la_SOURCES = $(sources)
 
@@ -207,6 +216,18 @@ concept-inst.lo: concept-inst.cc
 concept-inst.o: concept-inst.cc
        $(CXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $<
 
+# Use special rules for parallel mode compilation.
+PARALLEL_FLAGS = -fopenmp -D_GLIBCXX_PARALLEL -I$(glibcxx_builddir)/../libgomp
+parallel_list.lo: parallel_list.cc
+       $(LTCXXCOMPILE) $(PARALLEL_FLAGS) -c $<
+parallel_list.o: parallel_list.cc
+       $(CXXCOMPILE) $(PARALLEL_FLAGS) -c $<
+
+parallel_settings.lo: parallel_settings.cc
+       $(LTCXXCOMPILE) $(PARALLEL_FLAGS) -c $<
+parallel_settings.o: parallel_settings.cc
+       $(CXXCOMPILE) $(PARALLEL_FLAGS) -c $<
+
 # Use special rules for the C++0x sources so that the proper flags are passed.
 system_error.lo: system_error.cc
        $(LTCXXCOMPILE) -std=gnu++0x -c $<
@@ -218,6 +239,21 @@ hash_c++0x.lo: hash_c++0x.cc
 hash_c++0x.o: hash_c++0x.cc
        $(CXXCOMPILE) -std=gnu++0x -c $<
 
+hashtable_c++0x.lo: hashtable_c++0x.cc
+       $(LTCXXCOMPILE) -std=gnu++0x -c $<
+hashtable_c++0x.o: hashtable_c++0x.cc
+       $(CXXCOMPILE) -std=gnu++0x -c $<
+
+date_time.lo: date_time.cc
+       $(LTCXXCOMPILE) -std=gnu++0x -c $<
+date_time.o: date_time.cc
+       $(CXXCOMPILE) -std=gnu++0x -c $<
+
+atomic.lo: atomic.cc
+       $(LTCXXCOMPILE) -x c++ -std=gnu++0x -c $<
+atomic.o: atomic.cc
+       $(CXXCOMPILE) -x c++ -std=gnu++0x -c $<
+
 if GLIBCXX_LDBL_COMPAT
 # Use special rules for compatibility-ldbl.cc compilation, as we need to
 # pass -mlong-double-64.