From 0088583b2556a68d4e521d5ced6ae38a946c7205 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 28 Apr 2015 20:42:51 +0100 Subject: [PATCH] Makefile.am (SUBDIRS): Move python to hosted_source. * Makefile.am (SUBDIRS): Move python to hosted_source. * Makefile.in: Regenerate. * acinclude.m4 (glibcxx_SUBDIRS): Reorder. * configure: Regenerate. From-SVN: r222541 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/Makefile.am | 6 +++--- libstdc++-v3/Makefile.in | 4 ++-- libstdc++-v3/acinclude.m4 | 2 +- libstdc++-v3/configure | 22 +++++++++++----------- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 442f91ce529..88c0d97e0b4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2015-04-28 Jonathan Wakely + + * Makefile.am (SUBDIRS): Move python to hosted_source. + * Makefile.in: Regenerate. + * acinclude.m4 (glibcxx_SUBDIRS): Reorder. + * configure: Regenerate. + 2015-04-28 Marc Glisse PR libstdc++/65883 diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index 808bebad09e..b1bcba7eb9f 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -23,12 +23,12 @@ include $(top_srcdir)/fragment.am if GLIBCXX_HOSTED - hosted_source = src doc po testsuite +## Note that python must come after src. + hosted_source = src doc po testsuite python endif ## Keep this list sync'd with acinclude.m4:GLIBCXX_CONFIGURE. -## Note that python must come after src. -SUBDIRS = include libsupc++ $(hosted_source) python +SUBDIRS = include libsupc++ $(hosted_source) ACLOCAL_AMFLAGS = -I . -I .. -I ../config diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 961d840f45f..86b7de4e1dc 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -317,8 +317,8 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. AM_CPPFLAGS = $(GLIBCXX_INCLUDES) -@GLIBCXX_HOSTED_TRUE@hosted_source = src doc po testsuite -SUBDIRS = include libsupc++ $(hosted_source) python +@GLIBCXX_HOSTED_TRUE@hosted_source = src doc po testsuite python +SUBDIRS = include libsupc++ $(hosted_source) ACLOCAL_AMFLAGS = -I . -I .. -I ../config @BUILD_XML_FALSE@STAMP_XML = diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 196b4ff1b37..ffa2122f8a7 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -49,7 +49,7 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [ # Keep these sync'd with the list in Makefile.am. The first provides an # expandable list at autoconf time; the second provides an expandable list # (i.e., shell variable) at configure time. - m4_define([glibcxx_SUBDIRS],[include libsupc++ python src src/c++98 src/c++11 doc po testsuite]) + m4_define([glibcxx_SUBDIRS],[include libsupc++ src src/c++98 src/c++11 doc po testsuite python]) SUBDIRS='glibcxx_SUBDIRS' # These need to be absolute paths, yet at the same time need to diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index f5b28f455ed..e94fb9d861f 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -4951,7 +4951,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } # expandable list at autoconf time; the second provides an expandable list # (i.e., shell variable) at configure time. - SUBDIRS='include libsupc++ python src src/c++98 src/c++11 doc po testsuite' + SUBDIRS='include libsupc++ src src/c++98 src/c++11 doc po testsuite python' # These need to be absolute paths, yet at the same time need to # canonicalize only relative paths, because then amd will not unmount @@ -78026,7 +78026,7 @@ $as_echo "$as_me: WARNING: === Symbol versioning will be disabled." >&2;} fi # For libtool versioning info, format is CURRENT:REVISION:AGE -libtool_VERSION=6:21:0 +libtool_VERSION=6:22:0 # Everything parsed; figure out what files and settings to use. case $enable_symvers in @@ -79713,7 +79713,7 @@ ac_config_files="$ac_config_files doc/xsl/customization.xsl" # append it here. Only modify Makefiles that have just been created. # # Also, get rid of this simulated-VPATH thing that automake does. -ac_config_files="$ac_config_files include/Makefile libsupc++/Makefile python/Makefile src/Makefile src/c++98/Makefile src/c++11/Makefile doc/Makefile po/Makefile testsuite/Makefile" +ac_config_files="$ac_config_files include/Makefile libsupc++/Makefile src/Makefile src/c++98/Makefile src/c++11/Makefile doc/Makefile po/Makefile testsuite/Makefile python/Makefile" ac_config_commands="$ac_config_commands generate-headers" @@ -80930,13 +80930,13 @@ do "doc/xsl/customization.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/customization.xsl" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "libsupc++/Makefile") CONFIG_FILES="$CONFIG_FILES libsupc++/Makefile" ;; - "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/c++98/Makefile") CONFIG_FILES="$CONFIG_FILES src/c++98/Makefile" ;; "src/c++11/Makefile") CONFIG_FILES="$CONFIG_FILES src/c++11/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; + "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; "generate-headers") CONFIG_COMMANDS="$CONFIG_COMMANDS generate-headers" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -82736,7 +82736,7 @@ _EOF . ${multi_basedir}/config-ml.in { ml_norecursion=; unset ml_norecursion;} ;; - "python/Makefile":F) cat > vpsed$$ << \_EOF + "src/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ @@ -82747,7 +82747,7 @@ _EOF . ${multi_basedir}/config-ml.in { ml_norecursion=; unset ml_norecursion;} ;; - "src/Makefile":F) cat > vpsed$$ << \_EOF + "src/c++98/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ @@ -82758,7 +82758,7 @@ _EOF . ${multi_basedir}/config-ml.in { ml_norecursion=; unset ml_norecursion;} ;; - "src/c++98/Makefile":F) cat > vpsed$$ << \_EOF + "src/c++11/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ @@ -82769,7 +82769,7 @@ _EOF . ${multi_basedir}/config-ml.in { ml_norecursion=; unset ml_norecursion;} ;; - "src/c++11/Makefile":F) cat > vpsed$$ << \_EOF + "doc/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ @@ -82780,7 +82780,7 @@ _EOF . ${multi_basedir}/config-ml.in { ml_norecursion=; unset ml_norecursion;} ;; - "doc/Makefile":F) cat > vpsed$$ << \_EOF + "po/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ @@ -82791,7 +82791,7 @@ _EOF . ${multi_basedir}/config-ml.in { ml_norecursion=; unset ml_norecursion;} ;; - "po/Makefile":F) cat > vpsed$$ << \_EOF + "testsuite/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ @@ -82802,7 +82802,7 @@ _EOF . ${multi_basedir}/config-ml.in { ml_norecursion=; unset ml_norecursion;} ;; - "testsuite/Makefile":F) cat > vpsed$$ << \_EOF + "python/Makefile":F) cat > vpsed$$ << \_EOF s!`test -f '$<' || echo '$(srcdir)/'`!! _EOF sed -f vpsed$$ $ac_file > tmp$$ -- 2.30.2