From 4f9dae6ede27c3576bdcd916adb04a4947897992 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Mon, 12 Jan 2004 23:00:30 +0000 Subject: [PATCH] Makefile.am (version.dep): backport from HEAD. 2004-01-12 Marc Espie * src/Makefile.am (version.dep): backport from HEAD. * src/Makefile.in: regen. From-SVN: r75766 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/src/Makefile.am | 5 +++-- libstdc++-v3/src/Makefile.in | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 627217c53ed7..3d84488cb367 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2004-01-12 Marc Espie + + * src/Makefile.am (version.dep): backport from HEAD. + * src/Makefile.in: regen. + 2004-01-12 Gernot Hillier * configure.in: GLIBCXX->GLIBCPP. diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 304c035defc0..199bb65521ff 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -38,11 +38,12 @@ toolexeclib_LTLIBRARIES = libstdc++.la # Symbol versioning for shared libraries. if GLIBCPP_BUILD_VERSIONED_SHLIB version_arg = -Wl,--version-script=libstdc++-symbol.ver +version_dep = libstdc++-symbol.ver libstdc++-symbol.ver: ${glibcpp_srcdir}/@SYMVER_MAP@ @LN_S@ ${glibcpp_srcdir}/@SYMVER_MAP@ ./libstdc++-symbol.ver || true else version_arg = -libstdc++-symbol.ver: +version_dep = endif # Compile flags that should be constant throughout the build, both for @@ -156,7 +157,7 @@ libstdc___la_LIBADD = \ $(top_builddir)/libmath/libmath.la @libio_la@ \ $(top_builddir)/libsupc++/libsupc++convenience.la -libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD) +libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD) libstdc___la_LDFLAGS = \ -version-info @libtool_VERSION@ ${version_arg} \ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 95c1cf881e24..50aa12541f00 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -148,6 +148,8 @@ toolexeclibdir = @glibcpp_toolexeclibdir@ toolexeclib_LTLIBRARIES = libstdc++.la @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@version_arg = @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@-Wl,--version-script=libstdc++-symbol.ver @GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@version_arg = +@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@version_dep = libstdc++-symbol.ver +@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@version_dep = # Compile flags that should be constant throughout the build, both for # SUBDIRS and for libstdc++-v3 in general. @@ -240,7 +242,7 @@ libstdc___la_LIBADD = \ $(top_builddir)/libsupc++/libsupc++convenience.la -libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD) +libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD) libstdc___la_LDFLAGS = \ -version-info @libtool_VERSION@ ${version_arg} \ @@ -543,7 +545,6 @@ mostlyclean distclean maintainer-clean @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@libstdc++-symbol.ver: ${glibcpp_srcdir}/@SYMVER_MAP@ @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@ @LN_S@ ${glibcpp_srcdir}/@SYMVER_MAP@ ./libstdc++-symbol.ver || true -@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@libstdc++-symbol.ver: codecvt_members.cc: ${glibcpp_srcdir}/@CCODECVT_CC@ @LN_S@ ${glibcpp_srcdir}/@CCODECVT_CC@ . || true -- 2.47.2