From ca618b60bfafcccf018b2a7d994afc65eb49415c Mon Sep 17 00:00:00 2001
From: Phil Edwards <pme@gcc.gnu.org>
Date: Wed, 27 Aug 2003 21:29:43 +0000
Subject: [PATCH] Makefile.am: Remove trailing whitespace.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* Makefile.am: Remove trailing whitespace. Remove needless
"foo = @foo@" assignments. Replace direct uses of @foo@ with $(foo).
* include/Makefile.am: Likewise.
* libmath/Makefile.am: Likewise.
* libsupc++/Makefile.am: Likewise.
* po/Makefile.am: Likewise.
* src/Makefile.am: Likewise.
* testsuite/Makefile.am: Likewise.
* Makefile.in, include/Makefile.in, libmath/Makefile.in,
libsupc++/Makefile.in, po/Makefile.in, src/Makefile.in,
testsuite/Makefile.in: Regenerated.
From-SVN: r70865
---
libstdc++-v3/ChangeLog | 15 ++++++++++
libstdc++-v3/Makefile.am | 4 +--
libstdc++-v3/Makefile.in | 4 +--
libstdc++-v3/include/Makefile.am | 25 ++++++++--------
libstdc++-v3/include/Makefile.in | 28 ++++++++---------
libstdc++-v3/libmath/Makefile.am | 2 +-
libstdc++-v3/libmath/Makefile.in | 2 +-
libstdc++-v3/libsupc++/Makefile.am | 22 +++++++-------
libstdc++-v3/libsupc++/Makefile.in | 20 ++++++-------
libstdc++-v3/po/Makefile.am | 28 ++++++++---------
libstdc++-v3/po/Makefile.in | 28 ++++++++---------
libstdc++-v3/src/Makefile.am | 48 +++++++++++++++---------------
libstdc++-v3/src/Makefile.in | 48 +++++++++++++++---------------
libstdc++-v3/testsuite/Makefile.am | 13 ++++----
libstdc++-v3/testsuite/Makefile.in | 12 ++++----
15 files changed, 156 insertions(+), 143 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 08ae0ae35ced..b81e651190da 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,18 @@
+2003-08-27 Phil Edwards <pme@gcc.gnu.org>
+
+ * Makefile.am: Remove trailing whitespace. Remove needless
+ "foo = @foo@" assignments. Replace direct uses of @foo@ with $(foo).
+ * include/Makefile.am: Likewise.
+ * libmath/Makefile.am: Likewise.
+ * libsupc++/Makefile.am: Likewise.
+ * po/Makefile.am: Likewise.
+ * src/Makefile.am: Likewise.
+ * testsuite/Makefile.am: Likewise.
+
+ * Makefile.in, include/Makefile.in, libmath/Makefile.in,
+ libsupc++/Makefile.in, po/Makefile.in, src/Makefile.in,
+ testsuite/Makefile.in: Regenerated.
+
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Change quoting of
diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am
index 2c3db0e94802..040b8da7c9fc 100644
--- a/libstdc++-v3/Makefile.am
+++ b/libstdc++-v3/Makefile.am
@@ -29,7 +29,7 @@ if GLIBCXX_HOSTED
hosted_source = src po
endif
## Keep this list sync'd with acinclude.m4:GLIBCXX_CONFIGURE.
-SUBDIRS = include libmath libsupc++ $(hosted_source) testsuite
+SUBDIRS = include libmath libsupc++ $(hosted_source) testsuite
# These rules are messy, but are hella worth it.
doxygen:
@@ -132,7 +132,7 @@ AM_MAKEFLAGS = \
"NM_FOR_BUILD=$(NM_FOR_BUILD)" \
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
"DESTDIR=$(DESTDIR)" \
- "WERROR=$(WERROR)"
+ "WERROR=$(WERROR)"
# Subdir rules rely on $(FLAGS_TO_PASS)
FLAGS_TO_PASS = $(AM_MAKEFLAGS)
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 2e7f454aeb1f..b830f7418cec 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -219,7 +219,7 @@ WARN_CXXFLAGS = \
# -I/-D flags to pass when compiling.
AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
@GLIBCXX_HOSTED_TRUE@hosted_source = src po
-SUBDIRS = include libmath libsupc++ $(hosted_source) testsuite
+SUBDIRS = include libmath libsupc++ $(hosted_source) testsuite
# Multilib support.
MAKEOVERRIDES =
@@ -273,7 +273,7 @@ AM_MAKEFLAGS = \
"NM_FOR_BUILD=$(NM_FOR_BUILD)" \
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
"DESTDIR=$(DESTDIR)" \
- "WERROR=$(WERROR)"
+ "WERROR=$(WERROR)"
# Subdir rules rely on $(FLAGS_TO_PASS)
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index cc4a5f54f3f8..3a8bf72ade92 100644
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -225,7 +225,7 @@ ext_headers = \
# This is the common subset of files that all three "C" header models use.
-c_base_srcdir = @C_INCLUDE_DIR@
+c_base_srcdir = $(C_INCLUDE_DIR)
c_base_builddir = .
c_base_headers = \
${c_base_srcdir}/std_cassert.h \
@@ -304,19 +304,19 @@ else
c_compatibility_headers_extra =
endif
-host_srcdir = ${glibcxx_srcdir}/@OS_INC_SRCDIR@
+host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
host_builddir = ./${host_alias}/bits
host_headers = \
${host_srcdir}/ctype_base.h \
${host_srcdir}/ctype_inline.h \
${host_srcdir}/ctype_noninline.h \
${host_srcdir}/os_defines.h \
- ${glibcxx_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
- ${glibcxx_srcdir}/@FPOS_INC_SRCDIR@/fpos.h
+ ${glibcxx_srcdir}/$(ATOMICITY_INC_SRCDIR)/atomicity.h \
+ ${glibcxx_srcdir}/$(FPOS_INC_SRCDIR)/fpos.h
# Non-installed host_header files.
host_headers_noinst = \
- ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@
+ ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H)
# These host_headers_extra files are all built with ad hoc naming rules.
host_headers_extra = \
@@ -441,13 +441,13 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
@if [ ! -f stamp-host ]; then \
(cd ${host_builddir} ;\
$(LN_S) ${host_headers} . || true ;\
- $(LN_S) ${glibcxx_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CSTDIO_H@ c++io.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CTIME_H@ time_members.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
+ $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_H) c++locale.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H) . || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_H) codecvt_specializations.h || true);\
fi ;\
$(STAMP) stamp-host
@@ -464,7 +464,6 @@ ${host_builddir}/c++config.h: ${top_builddir}/config.h \
echo "#endif // _CXXCONFIG_" >>$@
# Host includes for threads
-glibcxx_thread_h = @glibcxx_thread_h@
uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
${host_builddir}/gthr.h: ${toplevel_srcdir}/gcc/gthr.h stamp-${host_alias}
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index bb3218960b8c..35c724e6a276 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -166,8 +166,6 @@ glibcxx_builddir = @glibcxx_builddir@
glibcxx_localedir = @glibcxx_localedir@
glibcxx_prefixdir = @glibcxx_prefixdir@
glibcxx_srcdir = @glibcxx_srcdir@
-
-# Host includes for threads
glibcxx_thread_h = @glibcxx_thread_h@
glibcxx_toolexecdir = @glibcxx_toolexecdir@
glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@
@@ -427,7 +425,7 @@ ext_headers = \
# This is the common subset of files that all three "C" header models use.
-c_base_srcdir = @C_INCLUDE_DIR@
+c_base_srcdir = $(C_INCLUDE_DIR)
c_base_builddir = .
c_base_headers = \
${c_base_srcdir}/std_cassert.h \
@@ -503,20 +501,20 @@ c_compatibility_headers = \
@GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE@c_compatibility_headers_extra = ${c_compatibility_headers}
-host_srcdir = ${glibcxx_srcdir}/@OS_INC_SRCDIR@
+host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
host_builddir = ./${host_alias}/bits
host_headers = \
${host_srcdir}/ctype_base.h \
${host_srcdir}/ctype_inline.h \
${host_srcdir}/ctype_noninline.h \
${host_srcdir}/os_defines.h \
- ${glibcxx_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
- ${glibcxx_srcdir}/@FPOS_INC_SRCDIR@/fpos.h
+ ${glibcxx_srcdir}/$(ATOMICITY_INC_SRCDIR)/atomicity.h \
+ ${glibcxx_srcdir}/$(FPOS_INC_SRCDIR)/fpos.h
# Non-installed host_header files.
host_headers_noinst = \
- ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@
+ ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H)
# These host_headers_extra files are all built with ad hoc naming rules.
@@ -560,6 +558,8 @@ allcreated = \
${thread_host_headers} \
${pch_build}
+
+# Host includes for threads
uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
# By adding these files here, automake will remove them for 'make clean'
@@ -796,13 +796,13 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
@if [ ! -f stamp-host ]; then \
(cd ${host_builddir} ;\
$(LN_S) ${host_headers} . || true ;\
- $(LN_S) ${glibcxx_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CSTDIO_H@ c++io.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CTIME_H@ time_members.h || true ;\
- $(LN_S) ${glibcxx_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
+ $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_H) c++locale.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H) . || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true ;\
+ $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_H) codecvt_specializations.h || true);\
fi ;\
$(STAMP) stamp-host
diff --git a/libstdc++-v3/libmath/Makefile.am b/libstdc++-v3/libmath/Makefile.am
index 9d4147781886..091b4a46bd35 100644
--- a/libstdc++-v3/libmath/Makefile.am
+++ b/libstdc++-v3/libmath/Makefile.am
@@ -26,7 +26,7 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
noinst_LTLIBRARIES = libmath.la
-libmath_la_LIBADD = @LIBMATHOBJS@
+libmath_la_LIBADD = $(LIBMATHOBJS)
libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in
index 55699003f574..f9023ffb051a 100644
--- a/libstdc++-v3/libmath/Makefile.in
+++ b/libstdc++-v3/libmath/Makefile.in
@@ -204,7 +204,7 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
noinst_LTLIBRARIES = libmath.la
-libmath_la_LIBADD = @LIBMATHOBJS@
+libmath_la_LIBADD = $(LIBMATHOBJS)
libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am
index 9ce80f9bb3bc..50727402c135 100644
--- a/libstdc++-v3/libsupc++/Makefile.am
+++ b/libstdc++-v3/libsupc++/Makefile.am
@@ -19,20 +19,20 @@
## You should have received a copy of the GNU General Public License
## along with GCC; see the file COPYING. If not, write to
## the Free Software Foundation, 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
+## Boston, MA 02111-1307, USA.
include $(top_srcdir)/fragment.am
# Need this library to both be part of libstdc++.a, and installed
# separately too.
-# 1) separate libsupc++.la
+# 1) separate libsupc++.la
toolexeclib_LTLIBRARIES = libsupc++.la
# 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
noinst_LTLIBRARIES = libsupc++convenience.la
headers = \
- exception new typeinfo cxxabi.h exception_defines.h
+ exception new typeinfo cxxabi.h exception_defines.h
sources = \
del_op.cc \
@@ -62,8 +62,8 @@ sources = \
vec.cc \
vterminate.cc
-libsupc___la_SOURCES = $(sources)
-libsupc__convenience_la_SOURCES = $(sources)
+libsupc___la_SOURCES = $(sources)
+libsupc__convenience_la_SOURCES = $(sources)
glibcxxinstalldir = $(gxx_include_dir)
glibcxxinstall_HEADERS = $(headers)
@@ -72,13 +72,13 @@ glibcxxinstall_HEADERS = $(headers)
# modified in a per-library or per-sub-library way. Need to manually
# set this option because CONFIG_CXXFLAGS has to be after
# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
-# as the occasion call for it.
+# as the occasion call for it.
AM_CXXFLAGS = \
-fno-implicit-templates \
$(LIBSUPCXX_PICFLAGS) \
$(WARN_CXXFLAGS) \
$(OPTIMIZE_CXXFLAGS) \
- $(CONFIG_CXXFLAGS)
+ $(CONFIG_CXXFLAGS)
AM_MAKEFLAGS = \
"gxx_include_dir=$(gxx_include_dir)"
@@ -105,8 +105,8 @@ AM_MAKEFLAGS = \
# We have to put --tag disable-shared after --tag CXX lest things
# CXX undo the affect of disable-shared.
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
- --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
+ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
# 3) We'd have a problem when building the shared libstdc++ object if
# the rules automake generates would be used. We cannot allow g++ to
@@ -115,8 +115,8 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
# directory to configure libstdc++-v3 to use gcc as the C++
# compilation driver.
CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \
- --mode=link $(CXX) \
- @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+ --mode=link $(CXX) \
+ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
# We have to have rules modified from the default to counteract SUN make
# prepending each of $(glibcxxinstall_HEADERS) with VPATH below.
diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index 4e74717ed63e..2806ac2a798e 100644
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -221,13 +221,13 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
# Need this library to both be part of libstdc++.a, and installed
# separately too.
-# 1) separate libsupc++.la
+# 1) separate libsupc++.la
toolexeclib_LTLIBRARIES = libsupc++.la
# 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
noinst_LTLIBRARIES = libsupc++convenience.la
headers = \
- exception new typeinfo cxxabi.h exception_defines.h
+ exception new typeinfo cxxabi.h exception_defines.h
sources = \
@@ -259,8 +259,8 @@ sources = \
vterminate.cc
-libsupc___la_SOURCES = $(sources)
-libsupc__convenience_la_SOURCES = $(sources)
+libsupc___la_SOURCES = $(sources)
+libsupc__convenience_la_SOURCES = $(sources)
glibcxxinstalldir = $(gxx_include_dir)
glibcxxinstall_HEADERS = $(headers)
@@ -269,13 +269,13 @@ glibcxxinstall_HEADERS = $(headers)
# modified in a per-library or per-sub-library way. Need to manually
# set this option because CONFIG_CXXFLAGS has to be after
# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
-# as the occasion call for it.
+# as the occasion call for it.
AM_CXXFLAGS = \
-fno-implicit-templates \
$(LIBSUPCXX_PICFLAGS) \
$(WARN_CXXFLAGS) \
$(OPTIMIZE_CXXFLAGS) \
- $(CONFIG_CXXFLAGS)
+ $(CONFIG_CXXFLAGS)
AM_MAKEFLAGS = \
@@ -304,8 +304,8 @@ AM_MAKEFLAGS = \
# We have to put --tag disable-shared after --tag CXX lest things
# CXX undo the affect of disable-shared.
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
- --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
+ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
# 3) We'd have a problem when building the shared libstdc++ object if
@@ -315,8 +315,8 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
# directory to configure libstdc++-v3 to use gcc as the C++
# compilation driver.
CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \
- --mode=link $(CXX) \
- @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+ --mode=link $(CXX) \
+ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
subdir = libsupc++
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
index e17918feadc9..15685abf5a09 100644
--- a/libstdc++-v3/po/Makefile.am
+++ b/libstdc++-v3/po/Makefile.am
@@ -25,33 +25,33 @@ include $(top_srcdir)/fragment.am
# Location of installation directories.
locale_installdir = $(DESTDIR)$(datadir)/locale
-locale_builddir = @glibcxx_localedir@
+locale_builddir = $(glibcxx_localedir)
# Tell automake that foo.po makes foo.mo
SUFFIXES = .po .mo
-LOCALE_IN = @glibcxx_POFILES@
-LOCALE_OUT = @glibcxx_MOFILES@
+LOCALE_IN = $(glibcxx_POFILES)
+LOCALE_OUT = $(glibcxx_MOFILES)
MSGFMT = msgfmt
# Necessary files.
DISTFILES = \
Makefile.am Makefile.in string_literals.cc POTFILES.in $(PACKAGE).pot \
- $(LOCALE_IN)
+ $(LOCALE_IN)
.po.mo:
$(MSGFMT) -o $@ $<
-all-local: all-local-@USE_NLS@
-all-local-no:
-all-local-yes: $(LOCALE_OUT)
+all-local: all-local-$(USE_NLS)
+all-local-no:
+all-local-yes: $(LOCALE_OUT)
# 'make check' needs the catalogs constructed in build directory.
-check: check-@USE_NLS@
+check: check-$(USE_NLS)
check-no:
check-yes:
- $(mkinstalldirs) $(locale_builddir)
+ $(mkinstalldirs) $(locale_builddir)
catalogs='$(LOCALE_OUT)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
@@ -59,14 +59,14 @@ check-yes:
install_dir=$(locale_builddir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $$install_dir; \
$(INSTALL_DATA) $$cat $$install_dir/$(PACKAGE).mo; \
- done
+ done
-# Install rules here.
+# Install rules here.
# Wish install could just `cp -R ./share $(locale_installdir)` ...
-install-data-local: install-data-local-@USE_NLS@
+install-data-local: install-data-local-$(USE_NLS)
install-data-local-no:
install-data-local-yes: all-local-yes
- $(mkinstalldirs) $(locale_installdir)
+ $(mkinstalldirs) $(locale_installdir)
catalogs='$(LOCALE_OUT)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
@@ -85,4 +85,4 @@ pot:
`grep -r -l '__N(".*")' .`
# Specify what gets cleaned up on a 'make clean'
-CLEANFILES = $(LOCALE_OUT)
+CLEANFILES = $(LOCALE_OUT)
diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
index d9b439bac2b0..7925f979c912 100644
--- a/libstdc++-v3/po/Makefile.in
+++ b/libstdc++-v3/po/Makefile.in
@@ -221,24 +221,24 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
# Location of installation directories.
locale_installdir = $(DESTDIR)$(datadir)/locale
-locale_builddir = @glibcxx_localedir@
+locale_builddir = $(glibcxx_localedir)
# Tell automake that foo.po makes foo.mo
SUFFIXES = .po .mo
-LOCALE_IN = @glibcxx_POFILES@
-LOCALE_OUT = @glibcxx_MOFILES@
+LOCALE_IN = $(glibcxx_POFILES)
+LOCALE_OUT = $(glibcxx_MOFILES)
MSGFMT = msgfmt
# Necessary files.
DISTFILES = \
Makefile.am Makefile.in string_literals.cc POTFILES.in $(PACKAGE).pot \
- $(LOCALE_IN)
+ $(LOCALE_IN)
# Specify what gets cleaned up on a 'make clean'
-CLEANFILES = $(LOCALE_OUT)
+CLEANFILES = $(LOCALE_OUT)
subdir = po
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
CONFIG_HEADER = $(top_builddir)/config.h
@@ -392,15 +392,15 @@ uninstall-am: uninstall-info-am
.po.mo:
$(MSGFMT) -o $@ $<
-all-local: all-local-@USE_NLS@
-all-local-no:
-all-local-yes: $(LOCALE_OUT)
+all-local: all-local-$(USE_NLS)
+all-local-no:
+all-local-yes: $(LOCALE_OUT)
# 'make check' needs the catalogs constructed in build directory.
-check: check-@USE_NLS@
+check: check-$(USE_NLS)
check-no:
check-yes:
- $(mkinstalldirs) $(locale_builddir)
+ $(mkinstalldirs) $(locale_builddir)
catalogs='$(LOCALE_OUT)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
@@ -408,14 +408,14 @@ check-yes:
install_dir=$(locale_builddir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $$install_dir; \
$(INSTALL_DATA) $$cat $$install_dir/$(PACKAGE).mo; \
- done
+ done
-# Install rules here.
+# Install rules here.
# Wish install could just `cp -R ./share $(locale_installdir)` ...
-install-data-local: install-data-local-@USE_NLS@
+install-data-local: install-data-local-$(USE_NLS)
install-data-local-no:
install-data-local-yes: all-local-yes
- $(mkinstalldirs) $(locale_installdir)
+ $(mkinstalldirs) $(locale_installdir)
catalogs='$(LOCALE_OUT)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 153fc530051b..52bb3270c882 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -55,26 +55,26 @@ host_sources = \
numeric_members.cc \
time_members.cc
-codecvt_members.cc: ${glibcxx_srcdir}/@CCODECVT_CC@
- @LN_S@ ${glibcxx_srcdir}/@CCODECVT_CC@ . || true
+codecvt_members.cc: ${glibcxx_srcdir}/$(CCODECVT_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_CC) . || true
-collate_members.cc: ${glibcxx_srcdir}/@CCOLLATE_CC@
- @LN_S@ ${glibcxx_srcdir}/@CCOLLATE_CC@ . || true
+collate_members.cc: ${glibcxx_srcdir}/$(CCOLLATE_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CCOLLATE_CC) . || true
-ctype_members.cc: ${glibcxx_srcdir}/@CCTYPE_CC@
- @LN_S@ ${glibcxx_srcdir}/@CCTYPE_CC@ . || true
+ctype_members.cc: ${glibcxx_srcdir}/$(CCTYPE_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CCTYPE_CC) . || true
-messages_members.cc: ${glibcxx_srcdir}/@CMESSAGES_CC@
- @LN_S@ ${glibcxx_srcdir}/@CMESSAGES_CC@ . || true
+messages_members.cc: ${glibcxx_srcdir}/$(CMESSAGES_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_CC) . || true
-monetary_members.cc: ${glibcxx_srcdir}/@CMONEY_CC@
- @LN_S@ ${glibcxx_srcdir}/@CMONEY_CC@ . || true
+monetary_members.cc: ${glibcxx_srcdir}/$(CMONEY_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CMONEY_CC) . || true
-numeric_members.cc: ${glibcxx_srcdir}/@CNUMERIC_CC@
- @LN_S@ ${glibcxx_srcdir}/@CNUMERIC_CC@ . || true
+numeric_members.cc: ${glibcxx_srcdir}/$(CNUMERIC_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CNUMERIC_CC) . || true
-time_members.cc: ${glibcxx_srcdir}/@CTIME_CC@
- @LN_S@ ${glibcxx_srcdir}/@CTIME_CC@ . || true
+time_members.cc: ${glibcxx_srcdir}/$(CTIME_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CTIME_CC) . || true
# Source files linked in via configuration/make substitution for a
# particular host, but with ad hoc naming rules.
@@ -82,11 +82,11 @@ host_sources_extra = \
basic_file.cc \
c++locale.cc
-c++locale.cc: ${glibcxx_srcdir}/@CLOCALE_CC@
- @LN_S@ ${glibcxx_srcdir}/@CLOCALE_CC@ ./$@ || true
+c++locale.cc: ${glibcxx_srcdir}/$(CLOCALE_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_CC) ./$@ || true
-basic_file.cc: ${glibcxx_srcdir}/@BASIC_FILE_CC@
- @LN_S@ ${glibcxx_srcdir}/@BASIC_FILE_CC@ ./$@ || true
+basic_file.cc: ${glibcxx_srcdir}/$(BASIC_FILE_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_CC) ./$@ || true
# Sources present in the src directory.
sources = \
@@ -131,13 +131,13 @@ libstdc___la_LIBADD = \
libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD)
libstdc___la_LDFLAGS = \
- -version-info @libtool_VERSION@ ${version_arg} \
- -lm @LIBUNWIND_FLAG@
+ -version-info $(libtool_VERSION) ${version_arg} \
+ -lm $(LIBUNWIND_FLAG)
# Use special rules for the deprecated source files so that they find
# deprecated include files.
-GLIBCXX_INCLUDE_DIR=@glibcxx_builddir@/include
+GLIBCXX_INCLUDE_DIR=$(glibcxx_builddir)/include
strstream.lo: strstream.cc
$(LTCXXCOMPILE) -I$(GLIBCXX_INCLUDE_DIR)/backward -Wno-deprecated -c $<
strstream.o: strstream.cc
@@ -199,7 +199,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
# directory to configure libstdc++-v3 to use gcc as the C++
# compilation driver.
CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
- @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
# Added bits to build debug library.
@@ -228,9 +228,9 @@ stamp-debug:
echo `date` > stamp-debug;
build_debug: stamp-debug
- (cd ${debugdir} && $(MAKE) CXXFLAGS='@DEBUG_FLAGS@' all)
+ (cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' all)
# Install debug library here.
install_debug:
(cd ${debugdir} && $(MAKE) \
- toolexeclibdir=@glibcxx_toolexeclibdir@/debug install)
+ toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index a622f551f997..efedd07bd342 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -289,13 +289,13 @@ libstdc___la_LIBADD = \
libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD)
libstdc___la_LDFLAGS = \
- -version-info @libtool_VERSION@ ${version_arg} \
- -lm @LIBUNWIND_FLAG@
+ -version-info $(libtool_VERSION) ${version_arg} \
+ -lm $(LIBUNWIND_FLAG)
# Use special rules for the deprecated source files so that they find
# deprecated include files.
-GLIBCXX_INCLUDE_DIR = @glibcxx_builddir@/include
+GLIBCXX_INCLUDE_DIR = $(glibcxx_builddir)/include
# 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
@@ -338,7 +338,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
# directory to configure libstdc++-v3 to use gcc as the C++
# compilation driver.
CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
- @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
debugdir = debug
@@ -624,32 +624,32 @@ uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES
@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
+codecvt_members.cc: ${glibcxx_srcdir}/$(CCODECVT_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_CC) . || true
-collate_members.cc: ${glibcxx_srcdir}/@CCOLLATE_CC@
- @LN_S@ ${glibcxx_srcdir}/@CCOLLATE_CC@ . || true
+collate_members.cc: ${glibcxx_srcdir}/$(CCOLLATE_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CCOLLATE_CC) . || true
-ctype_members.cc: ${glibcxx_srcdir}/@CCTYPE_CC@
- @LN_S@ ${glibcxx_srcdir}/@CCTYPE_CC@ . || true
+ctype_members.cc: ${glibcxx_srcdir}/$(CCTYPE_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CCTYPE_CC) . || true
-messages_members.cc: ${glibcxx_srcdir}/@CMESSAGES_CC@
- @LN_S@ ${glibcxx_srcdir}/@CMESSAGES_CC@ . || true
+messages_members.cc: ${glibcxx_srcdir}/$(CMESSAGES_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_CC) . || true
-monetary_members.cc: ${glibcxx_srcdir}/@CMONEY_CC@
- @LN_S@ ${glibcxx_srcdir}/@CMONEY_CC@ . || true
+monetary_members.cc: ${glibcxx_srcdir}/$(CMONEY_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CMONEY_CC) . || true
-numeric_members.cc: ${glibcxx_srcdir}/@CNUMERIC_CC@
- @LN_S@ ${glibcxx_srcdir}/@CNUMERIC_CC@ . || true
+numeric_members.cc: ${glibcxx_srcdir}/$(CNUMERIC_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CNUMERIC_CC) . || true
-time_members.cc: ${glibcxx_srcdir}/@CTIME_CC@
- @LN_S@ ${glibcxx_srcdir}/@CTIME_CC@ . || true
+time_members.cc: ${glibcxx_srcdir}/$(CTIME_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CTIME_CC) . || true
-c++locale.cc: ${glibcxx_srcdir}/@CLOCALE_CC@
- @LN_S@ ${glibcxx_srcdir}/@CLOCALE_CC@ ./$@ || true
+c++locale.cc: ${glibcxx_srcdir}/$(CLOCALE_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_CC) ./$@ || true
-basic_file.cc: ${glibcxx_srcdir}/@BASIC_FILE_CC@
- @LN_S@ ${glibcxx_srcdir}/@BASIC_FILE_CC@ ./$@ || true
+basic_file.cc: ${glibcxx_srcdir}/$(BASIC_FILE_CC)
+ $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_CC) ./$@ || true
strstream.lo: strstream.cc
$(LTCXXCOMPILE) -I$(GLIBCXX_INCLUDE_DIR)/backward -Wno-deprecated -c $<
strstream.o: strstream.cc
@@ -691,12 +691,12 @@ stamp-debug:
echo `date` > stamp-debug;
build_debug: stamp-debug
- (cd ${debugdir} && $(MAKE) CXXFLAGS='@DEBUG_FLAGS@' all)
+ (cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' all)
# Install debug library here.
install_debug:
(cd ${debugdir} && $(MAKE) \
- toolexeclibdir=@glibcxx_toolexeclibdir@/debug install)
+ toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index 4248a14fe0c1..3a03189b7b8a 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -52,7 +52,7 @@ libv3test_a_SOURCES = testsuite_hooks.cc testsuite_allocator.cc
if GLIBCXX_TEST_ABI
noinst_PROGRAMS = abi_check
else
-noinst_PROGRAMS =
+noinst_PROGRAMS =
endif
abi_check_SOURCES = abi_check.cc
@@ -69,9 +69,8 @@ endif
# This is automatically run after the generated check-DEJAGNU rule.
check-local: check-abi
-baseline_dir = @baseline_dir@
baseline_file = ${baseline_dir}/baseline_symbols.txt
-extract_symvers = @glibcxx_srcdir@/scripts/extract_symvers
+extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers
current_symbols.txt: ${extract_symvers} ../src/.libs/libstdc++.so
-@(${extract_symvers} ../src/.libs/libstdc++.so current_symbols.txt)
@@ -84,7 +83,7 @@ baseline_symbols:
exit 1; \
fi; true)
-new-abi-baseline:
+new-abi-baseline:
-@$(mkinstalldirs) ${baseline_dir}
-@(output=${baseline_file}; \
if test -f $${output}; then \
@@ -101,7 +100,7 @@ check-abi: abi_check baseline_symbols current_symbols.txt
-@(./abi_check --check ./current_symbols.txt ${baseline_file} \
2>&1 | tee libstdc++-abi.sum)
-check-abi-verbose: abi_check baseline_symbols current_symbols.txt
+check-abi-verbose: abi_check baseline_symbols current_symbols.txt
-@(./abi_check --check-verbose ./current_symbols.txt ${baseline_file} \
2>&1 | tee libstdc++-abi.sum)
@@ -126,7 +125,7 @@ check-script-install: ${survey_script}
${survey_script} 0)
-# Runs the testsuite/performance tests.
+# Runs the testsuite/performance tests.
# Some of these tests create large (~75MB) files, allocate huge
# ammounts of memory, or otherwise tie up machine resources. Thus,
# running this is off by default.
@@ -147,4 +146,4 @@ check-script check-script-install check-performance
# By adding these files here, automake will remove them for 'make clean'
CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum \
- testsuite_* site.exp abi_check baseline_symbols
+ testsuite_* site.exp abi_check baseline_symbols
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index 932aca9c1957..c44c29428d5f 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -147,7 +147,6 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
-
baseline_dir = @baseline_dir@
bindir = @bindir@
build = @build@
@@ -247,8 +246,9 @@ libv3test_a_SOURCES = testsuite_hooks.cc testsuite_allocator.cc
@GLIBCXX_TEST_ABI_TRUE@noinst_PROGRAMS = abi_check
abi_check_SOURCES = abi_check.cc
+
baseline_file = ${baseline_dir}/baseline_symbols.txt
-extract_symvers = @glibcxx_srcdir@/scripts/extract_symvers
+extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers
# These two special 'check-script' rules use the bash script
# 'check_survey' to do testing. This script is not as portable as the
@@ -257,7 +257,7 @@ extract_symvers = @glibcxx_srcdir@/scripts/extract_symvers
# items like compile time, execution time, and binary size.
survey_script = ${glibcxx_builddir}/scripts/check_survey
-# Runs the testsuite/performance tests.
+# Runs the testsuite/performance tests.
# Some of these tests create large (~75MB) files, allocate huge
# ammounts of memory, or otherwise tie up machine resources. Thus,
# running this is off by default.
@@ -265,7 +265,7 @@ performance_script = ${glibcxx_srcdir}/scripts/check_performance
# By adding these files here, automake will remove them for 'make clean'
CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum \
- testsuite_* site.exp abi_check baseline_symbols
+ testsuite_* site.exp abi_check baseline_symbols
subdir = testsuite
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -593,7 +593,7 @@ baseline_symbols:
exit 1; \
fi; true)
-new-abi-baseline:
+new-abi-baseline:
-@$(mkinstalldirs) ${baseline_dir}
-@(output=${baseline_file}; \
if test -f $${output}; then \
@@ -609,7 +609,7 @@ new-abi-baseline:
@GLIBCXX_TEST_ABI_TRUE@ -@(./abi_check --check ./current_symbols.txt ${baseline_file} \
@GLIBCXX_TEST_ABI_TRUE@ 2>&1 | tee libstdc++-abi.sum)
-@GLIBCXX_TEST_ABI_TRUE@check-abi-verbose: abi_check baseline_symbols current_symbols.txt
+@GLIBCXX_TEST_ABI_TRUE@check-abi-verbose: abi_check baseline_symbols current_symbols.txt
@GLIBCXX_TEST_ABI_TRUE@ -@(./abi_check --check-verbose ./current_symbols.txt ${baseline_file} \
@GLIBCXX_TEST_ABI_TRUE@ 2>&1 | tee libstdc++-abi.sum)
--
GitLab