OSDN Git Service

* configure.in (toplevel_srcdir, auxdir): Set.
[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / src / Makefile.in
index ea65319..212c415 100644 (file)
@@ -101,10 +101,12 @@ enable_shared = @enable_shared@
 enable_static = @enable_static@
 glibcpp_basedir = @glibcpp_basedir@
 gxx_include_dir = @gxx_include_dir@
+gxx_target_include_dir = @gxx_target_include_dir@
 ifGNUmake = @ifGNUmake@
 libinst_wstring_la = @libinst_wstring_la@
 libio_la = @libio_la@
 libstdcxx_interface = @libstdcxx_interface@
+toplevel_srcdir = @toplevel_srcdir@
 
 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
@@ -140,22 +142,22 @@ WARN_CXXFLAGS = \
 # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
 GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
 C_INCLUDE_DIR = @C_INCLUDE_DIR@
-TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
+CSTD_INCLUDES = @CSTD_INCLUDES@
 LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
-CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
+TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 
 INCLUDES = \
-       -D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ \
-       $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \
-       $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) -I$(top_builddir)/include \
+       -nostdinc++ \
+       -I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include \
+       $(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \
        $(TOPLEVEL_INCLUDES)    
 
 
 base_headers = \
        bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h \
-       bits/basic_string.h bits/std_string.h  bits/string.tcc \
+       bits/std_string.h bits/basic_string.h bits/basic_string.tcc \
        bits/generic_shadow.h bits/std_utility.h \
        bits/std_complex.h \
        bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h \
@@ -172,15 +174,6 @@ base_headers = \
        bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h \
        bits/stl_pthread_alloc.h bits/pthread_allocimpl.h \
        bits/stl_threads.h bits/stl_iterator_base.h \
-       backward/algo.h backward/algobase.h backward/alloc.h \
-       backward/bvector.h backward/defalloc.h backward/deque.h \
-       backward/function.h backward/hash_map.h backward/hash_set.h \
-       backward/hashtable.h backward/heap.h backward/iterator.h \
-       backward/list.h backward/map.h backward/multimap.h backward/new.h \
-       backward/multiset.h backward/pair.h backward/iostream.h \
-       backward/rope.h backward/set.h backward/slist.h backward/stack.h \
-       backward/tempbuf.h backward/tree.h backward/vector.h \
-       backward/fstream.h \
        bits/std_bitset.h bits/std_deque.h bits/std_functional.h \
        bits/std_iterator.h bits/std_list.h \
        bits/std_map.h bits/std_memory.h bits/std_numeric.h \
@@ -196,10 +189,26 @@ base_headers = \
        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/concept_checks.h bits/container_concepts.h \
-       bits/sequence_concepts.h bits/std_strstream.h \
+       bits/sequence_concepts.h bits/stl_config.h bits/stl_construct.h
+
+
+backward_headers = \
+       backward/complex.h backward/iomanip.h backward/istream.h \
+       backward/ostream.h backward/stream.h backward/streambuf.h \
+       backward/algo.h backward/algobase.h backward/alloc.h \
+       backward/bvector.h backward/defalloc.h backward/deque.h \
+       backward/function.h backward/hash_map.h backward/hash_set.h \
+       backward/hashtable.h backward/heap.h backward/iterator.h \
+       backward/list.h backward/map.h backward/multimap.h backward/new.h \
+       backward/multiset.h backward/pair.h backward/iostream.h \
+       backward/rope.h backward/set.h backward/slist.h backward/stack.h \
+       backward/tempbuf.h backward/tree.h backward/vector.h \
+       backward/fstream.h backward/strstream.h backward/strstream
+
+
+ext_headers = \
        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 \
+       ext/stl_bvector.h ext/stl_hashtable.h ext/stl_hash_fun.h \
        ext/hash_map ext/hash_set ext/rope ext/slist \
        ext/tree ext/bvector 
 
@@ -210,27 +219,24 @@ c_base_headers = \
        bits/std_cmath.h bits/std_csetjmp.h bits/std_csignal.h \
        bits/std_cstdarg.h bits/std_cstddef.h bits/std_cstdio.h \
        bits/std_cstdlib.h bits/std_cstring.h bits/std_ctime.h \
-       bits/std_cwchar.h bits/std_cwctype.h 
-
-
-c_shadow_headers = \
-       assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h \
-       signal.h stdarg.h stddef.h stdio.h stdlib.h string.h time.h wchar.h \
-       wctype.h fcntl.h libio.h iolibio.h libioP.h pthread.h iconv.h \
-       features.h langinfo.h \
-       bits/wrap_libio.h bits/wrap_iolibio.h bits/wrap_libioP.h \
-       bits/wrap_iconv.h bits/wrap_fcntl.h bits/wrap_pthread.h \
-       bits/wrap_features.h bits/wrap_langinfo.h \
-       sys/cdefs.h 
-
-@GLIBCPP_USE_CSHADOW_TRUE@c_headers = @GLIBCPP_USE_CSHADOW_TRUE@$(c_base_headers) $(c_shadow_headers)
-@GLIBCPP_USE_CSHADOW_FALSE@c_headers = @GLIBCPP_USE_CSHADOW_FALSE@$(c_base_headers)
+       bits/std_cwchar.h bits/std_cwctype.h bits/cmath.tcc
+
+@GLIBCPP_USE_CSHADOW_TRUE@c_shadow_headers = @GLIBCPP_USE_CSHADOW_TRUE@\
+@GLIBCPP_USE_CSHADOW_TRUE@     assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     signal.h stdarg.h stddef.h stdio.h stdlib.h string.h time.h wchar.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     wctype.h fcntl.h libio.h iolibio.h libioP.h pthread.h iconv.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     features.h langinfo.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     bits/wrap_libio.h bits/wrap_iolibio.h bits/wrap_libioP.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     bits/wrap_iconv.h bits/wrap_fcntl.h bits/wrap_pthread.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     bits/wrap_features.h bits/wrap_langinfo.h \
+@GLIBCPP_USE_CSHADOW_TRUE@     sys/cdefs.h 
+@GLIBCPP_USE_CSHADOW_FALSE@c_shadow_headers = 
 
 std_headers = \
        algorithm bitset complex deque fstream functional \
        iomanip ios iosfwd iostream istream iterator limits list locale \
        map memory numeric ostream queue set sstream stack stdexcept \
-       streambuf string strstream utility valarray vector \
+       streambuf string utility valarray vector \
        cassert cctype cerrno cfloat climits clocale ciso646 \
        cmath csetjmp csignal cstdarg cstddef cstdio cstdlib \
        cstring ctime cwchar cwctype
@@ -240,20 +246,19 @@ std_headers = \
 @GLIBCPP_NEED_LIBIO_FALSE@libio_headers = 
 
 build_headers = \
-       bits/std_limits.h bits/c++config.h bits/c++io.h bits/c++threads.h \
+       bits/std_limits.h \
+       bits/c++config.h bits/c++io.h bits/c++locale.h bits/c++threads.h \
        bits/atomicity.h bits/os_defines.h \
        bits/ctype_base.h bits/ctype_noninline.h bits/ctype_inline.h 
 
 
-headers = $(base_headers) $(c_headers)
-
 sources = \
        limitsMEMBERS.cc \
-       cmath.cc \
-       complex.cc complexf.cc complexl.cc complex_io.cc \
-       stdexcept.cc \
-       c++io.cc ios.cc stdstreams.cc strstream.cc \
-       locale.cc localename.cc codecvt.cc \
+       complex_io.cc \
+       stdexcept.cc bitset.cc \
+        globals.cc \
+       c++io.cc ios.cc strstream.cc \
+       c++locale.cc locale.cc localename.cc codecvt.cc \
        locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
 
 
@@ -283,6 +288,16 @@ libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
 @GXX_INCLUDE_DIR_TRUE@myincludep = @GXX_INCLUDE_DIR_TRUE@@gxx_include_dir@
 @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@myincludep = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@$(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
 @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@myincludep = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@$(prefix)/include/g++-@libstdcxx_interface@
+@GXX_INCLUDE_DIR_TRUE@targetincludep = @GXX_INCLUDE_DIR_TRUE@@gxx_include_dir@
+@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@targetincludep = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@$(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
+@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@targetincludep = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@@gxx_target_include_dir@
+
+# NB: As libio_headers may be empty, need this to make sure bash doesn't
+# choke on an empty for... loop by using libio_headers_install
+# NB: installation of shadow headers is not attempted.
+src_incdir = @GLIBCPP_INCLUDE_DIR@
+bld_incdir = $(top_builddir)/include
+c_incdir = @C_INCLUDE_DIR@
 
 # 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
@@ -343,10 +358,10 @@ 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 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 codecvt.lo locale-inst.lo \
-stl-inst.lo misc-inst.lo valarray-inst.lo string-inst.lo
+libstdc___la_OBJECTS =  limitsMEMBERS.lo complex_io.lo stdexcept.lo \
+bitset.lo globals.lo c++io.lo ios.lo strstream.lo c++locale.lo \
+locale.lo localename.lo codecvt.lo locale-inst.lo stl-inst.lo \
+misc-inst.lo valarray-inst.lo string-inst.lo
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@@ -595,37 +610,61 @@ $(top_builddir)/stamp-cshadow: $(top_srcdir)/mkinclosure \
        rm -f  $(top_builddir)/stamp-cshadow 
        echo "done" > $(top_builddir)/stamp-cshadow 
 
-# We have our own special, needlessly complicated installation routine
+# We have our own special, ridiculously complicated installation routine
 # here, as automake/autoconf is currently brain-damaged when it comes
-# to installing sub-directories of headers.
-install-data-local: myinstallheaders
-
-# NB: As libio_headers may be empty, need this to make sure bash doesn't
-# choke on an empty for... loop by using libio_headers_install
-myinstallheaders: $(headers:%=$(myincludep)/%)
+# to installing sub-directories of headers. In particular, we want to
+# 1) install build headers from (blddir)/include/bits -> (install)/bits
+# 2) install source headers from
+#      (srcdir)/include/bits -> (install)/bits
+#      (srcdir)/include/ext -> (install)/ext
+#      (srcdir)/include/backward -> (install)/backward
+#      ... and the always entertaining "C" compatibility bits
+#      where * represents configure-time directory switching
+#      (srcdir)/include/c* -> (install)/
+#      (srcdir)/include/c*/bits -> (install)/bits
+#      (srcdir)/include/c*/sys -> (install)/sys
+install-data-local: myinstalldirs myinstallheaders
+
+# NB: installation of shadow header directories is not attempted.
+myinstalldirs:
+       if test -z "$(MULTISUBDIR)"; then \
+       $(mkinstalldirs) $(DESTDIR)$(myincludep)/bits; \
+       $(mkinstalldirs) $(DESTDIR)$(myincludep)/ext; \
+       $(mkinstalldirs) $(DESTDIR)$(targetincludep)/bits; \
+       fi
+myinstallheaders: 
        if test -z "$(MULTISUBDIR)"; then \
+       for i in $(base_headers); do \
+        echo "$(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)/bits/"; \
+         $(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)/bits/; \
+       done; \
+       for i in $(ext_headers); do \
+        echo "$(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)/ext/"; \
+         $(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)/ext/; \
+       done; \
+       for i in $(backward_headers); do \
+        echo "$(INSTALL_DATA) $(src_incdir)/$$i $(myincludep)"; \
+         $(INSTALL_DATA) $(src_incdir)/$$i $(myincludep); \
+       done; \
+       for i in $(c_base_headers); do \
+        echo "$(INSTALL_DATA) $(c_incdir)/$$i $(myincludep)/bits/"; \
+         $(INSTALL_DATA) $(c_incdir)/$$i $(myincludep)/bits/; \
+       done; \
        for i in $(std_headers); do \
-         echo "$(INSTALL_DATA) $(GLIBCPP_INCLUDE_DIR)/std/$$i $(myincludep)";\
-               $(INSTALL_DATA) $(GLIBCPP_INCLUDE_DIR)/std/$$i $(myincludep); \
+       echo "$(INSTALL_DATA) $(src_incdir)/std/$$i $(myincludep)";\
+         $(INSTALL_DATA) $(src_incdir)/std/$$i $(myincludep); \
        done; \
        for i in $(build_headers); do \
-          echo "$(INSTALL_DATA) $(top_builddir)/include/$$i $(myincludep)/bits/"; \
-            $(INSTALL_DATA) $(top_builddir)/include/$$i $(myincludep)/bits/; \
+        echo "$(INSTALL_DATA) $(bld_incdir)/$$i $(targetincludep)/bits/"; \
+         $(INSTALL_DATA) $(bld_incdir)/$$i $(targetincludep)/bits/; \
        done; \
        libio_headers_install='$(libio_headers)'; \
        for i in $$libio_headers_install; do \
-          echo "$(INSTALL_DATA) $$i $(myincludep)"; \
-                $(INSTALL_DATA) $$i $(myincludep); \
+        echo "$(INSTALL_DATA) $$i $(myincludep)"; \
+          $(INSTALL_DATA) $$i $(myincludep); \
        done; \
        fi;
 
-$(headers:%=$(myincludep)/%): $(myincludep)/%: %
-       if test -z "$(MULTISUBDIR)"; then \
-       $(mkinstalldirs) $(@D); \
-       echo " $(INSTALL_DATA) $^ $@"; \
-       $(INSTALL_DATA) $^ $@; \
-       fi;
-
 # We have to handle misc-inst.cc and locale-inst.cc in a special way
 # since we cannot instantiate all classes due to missing definitions
 # for things like vptrs, type_info bits, etc. when using
@@ -639,7 +678,14 @@ locale-inst.o: locale-inst.cc
 locale-inst.lo: locale-inst.cc
        $(LTCXXCOMPILE) -fimplicit-templates -c $<
 
-# We have to instantiate wstring bits too. . . 
+# Use special rules for the deprecated source files so that they find
+# deprecated include files.
+strstream.lo: strstream.cc
+       $(LTCXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -c $<
+strstream.o: strstream.cc
+       $(CXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -c $<
+
+# Make wstring-inst.cc from string-inst.cc
 wstring-inst.o: string-inst.cc
        $(CXXCOMPILE) -fimplicit-templates -c -DC=wchar_t $< -o $@
 wstring-inst.lo: string-inst.cc
@@ -649,9 +695,9 @@ wstring-inst.lo: string-inst.cc
 all: libstdc++.INC
 libstdc++.INC: Makefile
        $(MAKE) \
-         top_builddir=`CDPATH=:. && cd $(top_builddir) && pwd` \
-         top_srcdir=`CDPATH=:. && cd $(top_srcdir) && pwd` \
-         tmp-$@
+       top_builddir=`CDPATH=:. && cd $(top_builddir) && pwd` \
+       top_srcdir=`CDPATH=:. && cd $(top_srcdir) && pwd` \
+       tmp-$@
        -rm -f $@
        mv tmp-$@ $@