* src/Makefile.am (version_dep): New variable.

	(libstdc___la_DEPENDENCIES): Use it to add dependency on
	libstdc++-symbol.ver only when using symbol versioning.
	* src/Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71772 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 224cc60..d7d2222 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-25  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * src/Makefile.am (version_dep): New variable.
+       (libstdc___la_DEPENDENCIES): Use it to add dependency on
+       libstdc++-symbol.ver only when using symbol versioning.
+       * src/Makefile.in: Regenerate.
+
 2003-09-23  Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/bits/locale_facets.tcc: Tweak to avoid warnings.

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 52bb327..c2453b3 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -30,6 +30,7 @@ toolexeclib_LTLIBRARIES = libstdc++.la
 # Symbol versioning for shared libraries.
 if GLIBCXX_BUILD_VERSIONED_SHLIB
 version_arg = -Wl,--version-script=libstdc++-symbol.ver
+version_dep = libstdc++-symbol.ver
 libstdc++-symbol.ver:  ${glibcxx_srcdir}/$(SYMVER_MAP)
        cp ${glibcxx_srcdir}/$(SYMVER_MAP) ./libstdc++-symbol.ver
        if test "x$(port_specific_symbol_files)" != x; then \
@@ -40,7 +41,7 @@ libstdc++-symbol.ver:  ${glibcxx_srcdir}/$(SYMVER_MAP)
        fi
 else
 version_arg =
-libstdc++-symbol.ver:
+version_dep =
 endif
 
 
@@ -128,7 +129,7 @@ libstdc___la_LIBADD = \
        $(top_builddir)/libmath/libmath.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 efedd07..2e46d47 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -226,6 +226,8 @@ toolexeclib_LTLIBRARIES = libstdc++.la
 # Symbol versioning for shared libraries.
 @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@version_arg = -Wl,--version-script=libstdc++-symbol.ver
 @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@version_arg = 
+@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@version_dep = 
+@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@version_dep = libstdc++-symbol.ver
 
 # Source files linked in via configuration/make substitution for a
 # particular host.
@@ -286,7 +288,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} \
@@ -622,7 +624,6 @@ uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES
 @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@     cat tmp.top $(port_specific_symbol_files) tmp.bottom > $@; \
 @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@     rm tmp.top tmp.bottom; \
 @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@   fi
-@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@libstdc++-symbol.ver:
 
 codecvt_members.cc: ${glibcxx_srcdir}/$(CCODECVT_CC)
        $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_CC) . || true