X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Fsrc%2FMakefile.in;h=ac851820d9b0631f32b914be9055b60a11422916;hb=c8b03b9e2b93c433de53d0a391aede3733fbdc52;hp=cf7385742f2ae79f8602a4bf2f064114ac2b3af6;hpb=733bc4d9482c8c2238ecb3e0be7f21c9806227cc;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index cf7385742f2..ac851820d9b 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -64,13 +64,10 @@ target_alias = @target_alias@
 target_triplet = @target@
 AR = @AR@
 AS = @AS@
-BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
 CC = @CC@
 CPP = @CPP@
 CPU_FLAGS = @CPU_FLAGS@
 CSHADOWFLAGS = @CSHADOWFLAGS@
-CSTDIO_CC = @CSTDIO_CC@
-CSTDIO_H = @CSTDIO_H@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 DEBUG_FLAGS = @DEBUG_FLAGS@
@@ -103,6 +100,7 @@ WFMT_FLAGS = @WFMT_FLAGS@
 cpu_include_dir = @cpu_include_dir@
 ctype_include_dir = @ctype_include_dir@
 glibcpp_basedir = @glibcpp_basedir@
+ifGNUmake = @ifGNUmake@
 libinst_wstring_la = @libinst_wstring_la@
 
 AUTOMAKE_OPTIONS = 1.3 gnits
@@ -123,7 +121,7 @@ EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
 # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
 AC_CXXFLAGS = \
 	$(WERROR) @WFMT_FLAGS@ @CPU_FLAGS@ @EXTRA_CXX_FLAGS@ \
-	@SECTION_FLAGS@ @SECTION_LDFLAGS@ @DEBUG_FLAGS@ 
+	@SECTION_FLAGS@ @DEBUG_FLAGS@ 
 
 
 # Need to manually set this option because AC_CXXFLAGS has to be at
@@ -137,10 +135,13 @@ AM_CXXFLAGS = \
 
 # Passed down for cross compilers, canadian crosses.
 TOPLEVEL_INCLUDES = -I$(includedir)
-
-LIBIO_INCLUDES = @BUILD_LIBIO_INCLUDE@ -I$(top_srcdir)/libio 
-
-CSHADOW_INCLUDES = @CSHADOWFLAGS@ @CSHADOW_INCLUDES@
+@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_INCLUDES = @GLIBCPP_NEED_LIBIO_TRUE@\
+@GLIBCPP_NEED_LIBIO_TRUE@	-I$(top_builddir)/libio -I$(top_srcdir)/libio 
+@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_INCLUDES = @GLIBCPP_NEED_LIBIO_FALSE@-I$(top_srcdir)/libio
+#CSHADOW_INCLUDES = \
+#	@CSHADOWFLAGS@ -I$(top_srcdir)/shadow -I$(top_builddir)/cshadow
+@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_INCLUDES = 
+@GLIBCPP_USE_CSHADOW_FALSE@CSHADOW_INCLUDES = 
 
 CONFIG_INCLUDES = \
 	-I$(top_srcdir)/@cpu_include_dir@ \
@@ -148,9 +149,9 @@ CONFIG_INCLUDES = \
 
 
 INCLUDES = \
-	-nostdinc++ -I$(top_srcdir) \
-	$(LIBIO_INCLUDES) $(CONFIG_INCLUDES) $(CSHADOW_INCLUDES) \
-	$(TOPLEVEL_INCLUDES)	
+	-D_GNU_SOURCE -nostdinc++ -I$(top_srcdir) \
+	$(CSHADOW_INCLUDES) $(LIBIO_INCLUDES) \
+	$(CONFIG_INCLUDES) $(TOPLEVEL_INCLUDES)	
 
 
 # Need to explicitly set this so that AM_CXXFLAGS is last. (That way,
@@ -168,7 +169,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) \
 # rules automake generates would be used.  We cannot allow CXX to be used
 # in libtool since this would add -lstdc++ to the link line which of
 # course is impossible.
-CXXLINK = $(LIBTOOL) --mode=link "$(CC)" $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --mode=link "$(CC)" -Wl,-O1 @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
 
 headers = \
 	bits/cpp_type_traits.h \
@@ -220,7 +221,8 @@ headers = \
 	bits/stl_stack.h bits/stl_string_fwd.h bits/stl_tempbuf.h \
 	bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h \
 	bits/type_traits.h bits/stl_range_errors.h bits/std_algorithm.h \
-	bits/std_strstream.h \
+	bits/concept_checks.h bits/container_concepts.h \
+	bits/sequence_concepts.h bits/std_strstream.h \
 	ext/ropeimpl.h ext/stl_rope.h \
 	ext/stl_bvector.h bits/stl_config.h bits/stl_construct.h \
 	ext/stl_hashtable.h ext/stl_hash_fun.h \
@@ -254,7 +256,7 @@ std_headers = \
 	streambuf string strstream typeinfo utility valarray vector 
 
 @GLIBCPP_NEED_LIBIO_TRUE@libio_headers = @GLIBCPP_NEED_LIBIO_TRUE@\
-@GLIBCPP_NEED_LIBIO_TRUE@	$(top_builddir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
+@GLIBCPP_NEED_LIBIO_TRUE@	$(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
 @GLIBCPP_NEED_LIBIO_FALSE@libio_headers = 
 
 generated_headers = \
@@ -267,10 +269,11 @@ cpu_headers = \
 
 
 sources = \
-	limitsMEMBERS.cc c++io.cc \
+	limitsMEMBERS.cc \
 	cmath.cc \
 	complex.cc complexf.cc complexl.cc complex_io.cc \
-	stdexcept.cc ios.cc stdstreams.cc strstream.cc \
+	stdexcept.cc \
+	c++io.cc ios.cc stdstreams.cc strstream.cc \
 	locale.cc localename.cc  \
 	locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
 
@@ -319,8 +322,8 @@ libinst_string_la_OBJECTS =  libinst-string.la.lo
 libinst_wstring_la_LDFLAGS = 
 libinst_wstring_la_LIBADD = 
 libinst_wstring_la_OBJECTS =  wstring-inst.lo
-libstdc___la_OBJECTS =  limitsMEMBERS.lo c++io.lo cmath.lo complex.lo \
-complexf.lo complexl.lo complex_io.lo stdexcept.lo ios.lo stdstreams.lo \
+libstdc___la_OBJECTS =  limitsMEMBERS.lo cmath.lo complex.lo complexf.lo \
+complexl.lo complex_io.lo stdexcept.lo c++io.lo ios.lo stdstreams.lo \
 strstream.lo locale.lo localename.lo locale-inst.lo stl-inst.lo \
 misc-inst.lo valarray-inst.lo string-inst.lo
 CXXFLAGS = @CXXFLAGS@