diff options
Diffstat (limited to 'libstdc++-v3/src/Makefile.in')
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 929a153094d..c4fa9ede4a4 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -105,12 +105,9 @@ libinst_wstring_la = @libinst_wstring_la@ AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 -@USE_LIBDIR_TRUE@toolexeclibdir = \ -@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexeclibdir = \ -@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexecdir = \ -@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) +@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) +@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) +@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) toolexeclib_LTLIBRARIES = libstdc++.la EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la @@ -256,10 +253,9 @@ std_headers = \ map memory new numeric ostream queue set sstream stack stdexcept \ streambuf string strstream typeinfo utility valarray vector -@GLIBCPP_NEED_LIBIO_TRUE@libio_headers = \ -@GLIBCPP_NEED_LIBIO_TRUE@\ +@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_FALSE@libio_headers = \ +@GLIBCPP_NEED_LIBIO_FALSE@libio_headers = generated_headers = \ $(top_builddir)/bits/std_limits.h $(top_builddir)/bits/c++config.h \ @@ -338,9 +334,8 @@ libstdc___la_LIBADD = \ libstdc___la_LDFLAGS = -version-info 3:0:0 -lm libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD) -@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_H = \ -@GLIBCPP_USE_CSHADOW_TRUE@$(top_builddir)/stamp-cshadow -@GLIBCPP_USE_CSHADOW_FALSE@CSHADOW_H = \ +@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_H = @GLIBCPP_USE_CSHADOW_TRUE@$(top_builddir)/stamp-cshadow +@GLIBCPP_USE_CSHADOW_FALSE@CSHADOW_H = # We cannot use the default rules to install headers since we cannot # statically decide which headers to install. So we have our own special |
