Skip to content

R
riscv-gcc-1
Commit ca618b60 by Phil Edwards
Options

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
parent 138ca312
Showing with 108 additions and 95 deletions
libstdc++-v3/ChangeLog
2003-08-27 Phil Edwards <pme@gcc.gnu.org> 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 * acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Change quoting of
includedir. includedir.
* aclocal.m4, configure: Regenerate. * aclocal.m4, configure: Regenerate.
......
libstdc++-v3/include/Makefile.am
...@@ -225,7 +225,7 @@ ext_headers = \ ...@@ -225,7 +225,7 @@ ext_headers = \
# This is the common subset of files that all three "C" header models use. # 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_builddir = .
c_base_headers = \ c_base_headers = \
${c_base_srcdir}/std_cassert.h \ ${c_base_srcdir}/std_cassert.h \
...@@ -304,19 +304,19 @@ else ...@@ -304,19 +304,19 @@ else
c_compatibility_headers_extra = c_compatibility_headers_extra =
endif endif
host_srcdir = ${glibcxx_srcdir}/@OS_INC_SRCDIR@ host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
host_builddir = ./${host_alias}/bits host_builddir = ./${host_alias}/bits
host_headers = \ host_headers = \
${host_srcdir}/ctype_base.h \ ${host_srcdir}/ctype_base.h \
${host_srcdir}/ctype_inline.h \ ${host_srcdir}/ctype_inline.h \
${host_srcdir}/ctype_noninline.h \ ${host_srcdir}/ctype_noninline.h \
${host_srcdir}/os_defines.h \ ${host_srcdir}/os_defines.h \
${glibcxx_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \ ${glibcxx_srcdir}/$(ATOMICITY_INC_SRCDIR)/atomicity.h \
${glibcxx_srcdir}/@FPOS_INC_SRCDIR@/fpos.h ${glibcxx_srcdir}/$(FPOS_INC_SRCDIR)/fpos.h
# Non-installed host_header files. # Non-installed host_header files.
host_headers_noinst = \ 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. # These host_headers_extra files are all built with ad hoc naming rules.
host_headers_extra = \ host_headers_extra = \
...@@ -441,13 +441,13 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} ...@@ -441,13 +441,13 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
@if [ ! -f stamp-host ]; then \ @if [ ! -f stamp-host ]; then \
(cd ${host_builddir} ;\ (cd ${host_builddir} ;\
$(LN_S) ${host_headers} . || true ;\ $(LN_S) ${host_headers} . || true ;\
$(LN_S) ${glibcxx_srcdir}/@BASIC_FILE_H@ basic_file.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}/$(CSTDIO_H) c++io.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CLOCALE_H@ c++locale.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_H) c++locale.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H) . || true ;\
$(LN_S) ${glibcxx_srcdir}/@CMESSAGES_H@ messages_members.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}/$(CTIME_H) time_members.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\ $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_H) codecvt_specializations.h || true);\
fi ;\ fi ;\
$(STAMP) stamp-host $(STAMP) stamp-host
...@@ -464,7 +464,6 @@ ${host_builddir}/c++config.h: ${top_builddir}/config.h \ ...@@ -464,7 +464,6 @@ ${host_builddir}/c++config.h: ${top_builddir}/config.h \
echo "#endif // _CXXCONFIG_" >>$@ echo "#endif // _CXXCONFIG_" >>$@
# Host includes for threads # Host includes for threads
glibcxx_thread_h = @glibcxx_thread_h@
uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_] uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
${host_builddir}/gthr.h: ${toplevel_srcdir}/gcc/gthr.h stamp-${host_alias} ${host_builddir}/gthr.h: ${toplevel_srcdir}/gcc/gthr.h stamp-${host_alias}
......
libstdc++-v3/include/Makefile.in
...@@ -166,8 +166,6 @@ glibcxx_builddir = @glibcxx_builddir@ ...@@ -166,8 +166,6 @@ glibcxx_builddir = @glibcxx_builddir@
glibcxx_localedir = @glibcxx_localedir@ glibcxx_localedir = @glibcxx_localedir@
glibcxx_prefixdir = @glibcxx_prefixdir@ glibcxx_prefixdir = @glibcxx_prefixdir@
glibcxx_srcdir = @glibcxx_srcdir@ glibcxx_srcdir = @glibcxx_srcdir@
# Host includes for threads
glibcxx_thread_h = @glibcxx_thread_h@ glibcxx_thread_h = @glibcxx_thread_h@
glibcxx_toolexecdir = @glibcxx_toolexecdir@ glibcxx_toolexecdir = @glibcxx_toolexecdir@
glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@ glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@
...@@ -427,7 +425,7 @@ ext_headers = \ ...@@ -427,7 +425,7 @@ ext_headers = \
# This is the common subset of files that all three "C" header models use. # 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_builddir = .
c_base_headers = \ c_base_headers = \
${c_base_srcdir}/std_cassert.h \ ${c_base_srcdir}/std_cassert.h \
...@@ -503,20 +501,20 @@ c_compatibility_headers = \ ...@@ -503,20 +501,20 @@ c_compatibility_headers = \
@GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE@c_compatibility_headers_extra = ${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_builddir = ./${host_alias}/bits
host_headers = \ host_headers = \
${host_srcdir}/ctype_base.h \ ${host_srcdir}/ctype_base.h \
${host_srcdir}/ctype_inline.h \ ${host_srcdir}/ctype_inline.h \
${host_srcdir}/ctype_noninline.h \ ${host_srcdir}/ctype_noninline.h \
${host_srcdir}/os_defines.h \ ${host_srcdir}/os_defines.h \
${glibcxx_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \ ${glibcxx_srcdir}/$(ATOMICITY_INC_SRCDIR)/atomicity.h \
${glibcxx_srcdir}/@FPOS_INC_SRCDIR@/fpos.h ${glibcxx_srcdir}/$(FPOS_INC_SRCDIR)/fpos.h
# Non-installed host_header files. # Non-installed host_header files.
host_headers_noinst = \ 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. # These host_headers_extra files are all built with ad hoc naming rules.
...@@ -560,6 +558,8 @@ allcreated = \ ...@@ -560,6 +558,8 @@ allcreated = \
${thread_host_headers} \ ${thread_host_headers} \
${pch_build} ${pch_build}
# Host includes for threads
uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_] uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
# By adding these files here, automake will remove them for 'make clean' # 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} ...@@ -796,13 +796,13 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
@if [ ! -f stamp-host ]; then \ @if [ ! -f stamp-host ]; then \
(cd ${host_builddir} ;\ (cd ${host_builddir} ;\
$(LN_S) ${host_headers} . || true ;\ $(LN_S) ${host_headers} . || true ;\
$(LN_S) ${glibcxx_srcdir}/@BASIC_FILE_H@ basic_file.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}/$(CSTDIO_H) c++io.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CLOCALE_H@ c++locale.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_H) c++locale.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\ $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H) . || true ;\
$(LN_S) ${glibcxx_srcdir}/@CMESSAGES_H@ messages_members.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}/$(CTIME_H) time_members.h || true ;\
$(LN_S) ${glibcxx_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\ $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_H) codecvt_specializations.h || true);\
fi ;\ fi ;\
$(STAMP) stamp-host $(STAMP) stamp-host
......
libstdc++-v3/libmath/Makefile.am
...@@ -26,7 +26,7 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs ...@@ -26,7 +26,7 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
noinst_LTLIBRARIES = libmath.la noinst_LTLIBRARIES = libmath.la
libmath_la_LIBADD = @LIBMATHOBJS@ libmath_la_LIBADD = $(LIBMATHOBJS)
libmath_la_DEPENDENCIES = $(libmath_la_LIBADD) libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
......
libstdc++-v3/libmath/Makefile.in
...@@ -204,7 +204,7 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs ...@@ -204,7 +204,7 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
noinst_LTLIBRARIES = libmath.la noinst_LTLIBRARIES = libmath.la
libmath_la_LIBADD = @LIBMATHOBJS@ libmath_la_LIBADD = $(LIBMATHOBJS)
libmath_la_DEPENDENCIES = $(libmath_la_LIBADD) libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
......
libstdc++-v3/libsupc++/Makefile.am
...@@ -116,7 +116,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \ ...@@ -116,7 +116,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
# compilation driver. # compilation driver.
CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \ CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \
--mode=link $(CXX) \ --mode=link $(CXX) \
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
# We have to have rules modified from the default to counteract SUN make # We have to have rules modified from the default to counteract SUN make
# prepending each of $(glibcxxinstall_HEADERS) with VPATH below. # prepending each of $(glibcxxinstall_HEADERS) with VPATH below.
......
libstdc++-v3/libsupc++/Makefile.in
...@@ -316,7 +316,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \ ...@@ -316,7 +316,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
# compilation driver. # compilation driver.
CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \ CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \
--mode=link $(CXX) \ --mode=link $(CXX) \
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
subdir = libsupc++ subdir = libsupc++
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
......
libstdc++-v3/po/Makefile.am
...@@ -25,13 +25,13 @@ include $(top_srcdir)/fragment.am ...@@ -25,13 +25,13 @@ include $(top_srcdir)/fragment.am
# Location of installation directories. # Location of installation directories.
locale_installdir = $(DESTDIR)$(datadir)/locale locale_installdir = $(DESTDIR)$(datadir)/locale
locale_builddir = @glibcxx_localedir@ locale_builddir = $(glibcxx_localedir)
# Tell automake that foo.po makes foo.mo # Tell automake that foo.po makes foo.mo
SUFFIXES = .po .mo SUFFIXES = .po .mo
LOCALE_IN = @glibcxx_POFILES@ LOCALE_IN = $(glibcxx_POFILES)
LOCALE_OUT = @glibcxx_MOFILES@ LOCALE_OUT = $(glibcxx_MOFILES)
MSGFMT = msgfmt MSGFMT = msgfmt
...@@ -43,12 +43,12 @@ DISTFILES = \ ...@@ -43,12 +43,12 @@ DISTFILES = \
.po.mo: .po.mo:
$(MSGFMT) -o $@ $< $(MSGFMT) -o $@ $<
all-local: all-local-@USE_NLS@ all-local: all-local-$(USE_NLS)
all-local-no: all-local-no:
all-local-yes: $(LOCALE_OUT) all-local-yes: $(LOCALE_OUT)
# 'make check' needs the catalogs constructed in build directory. # 'make check' needs the catalogs constructed in build directory.
check: check-@USE_NLS@ check: check-$(USE_NLS)
check-no: check-no:
check-yes: check-yes:
$(mkinstalldirs) $(locale_builddir) $(mkinstalldirs) $(locale_builddir)
...@@ -63,7 +63,7 @@ check-yes: ...@@ -63,7 +63,7 @@ check-yes:
# Install rules here. # Install rules here.
# Wish install could just `cp -R ./share $(locale_installdir)` ... # 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-no:
install-data-local-yes: all-local-yes install-data-local-yes: all-local-yes
$(mkinstalldirs) $(locale_installdir) $(mkinstalldirs) $(locale_installdir)
......
libstdc++-v3/po/Makefile.in
...@@ -221,13 +221,13 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) ...@@ -221,13 +221,13 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
# Location of installation directories. # Location of installation directories.
locale_installdir = $(DESTDIR)$(datadir)/locale locale_installdir = $(DESTDIR)$(datadir)/locale
locale_builddir = @glibcxx_localedir@ locale_builddir = $(glibcxx_localedir)
# Tell automake that foo.po makes foo.mo # Tell automake that foo.po makes foo.mo
SUFFIXES = .po .mo SUFFIXES = .po .mo
LOCALE_IN = @glibcxx_POFILES@ LOCALE_IN = $(glibcxx_POFILES)
LOCALE_OUT = @glibcxx_MOFILES@ LOCALE_OUT = $(glibcxx_MOFILES)
MSGFMT = msgfmt MSGFMT = msgfmt
...@@ -392,12 +392,12 @@ uninstall-am: uninstall-info-am ...@@ -392,12 +392,12 @@ uninstall-am: uninstall-info-am
.po.mo: .po.mo:
$(MSGFMT) -o $@ $< $(MSGFMT) -o $@ $<
all-local: all-local-@USE_NLS@ all-local: all-local-$(USE_NLS)
all-local-no: all-local-no:
all-local-yes: $(LOCALE_OUT) all-local-yes: $(LOCALE_OUT)
# 'make check' needs the catalogs constructed in build directory. # 'make check' needs the catalogs constructed in build directory.
check: check-@USE_NLS@ check: check-$(USE_NLS)
check-no: check-no:
check-yes: check-yes:
$(mkinstalldirs) $(locale_builddir) $(mkinstalldirs) $(locale_builddir)
...@@ -412,7 +412,7 @@ check-yes: ...@@ -412,7 +412,7 @@ check-yes:
# Install rules here. # Install rules here.
# Wish install could just `cp -R ./share $(locale_installdir)` ... # 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-no:
install-data-local-yes: all-local-yes install-data-local-yes: all-local-yes
$(mkinstalldirs) $(locale_installdir) $(mkinstalldirs) $(locale_installdir)
......
libstdc++-v3/src/Makefile.am
...@@ -55,26 +55,26 @@ host_sources = \ ...@@ -55,26 +55,26 @@ host_sources = \
numeric_members.cc \ numeric_members.cc \
time_members.cc time_members.cc
codecvt_members.cc: ${glibcxx_srcdir}/@CCODECVT_CC@ codecvt_members.cc: ${glibcxx_srcdir}/$(CCODECVT_CC)
@LN_S@ ${glibcxx_srcdir}/@CCODECVT_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_CC) . || true
collate_members.cc: ${glibcxx_srcdir}/@CCOLLATE_CC@ collate_members.cc: ${glibcxx_srcdir}/$(CCOLLATE_CC)
@LN_S@ ${glibcxx_srcdir}/@CCOLLATE_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CCOLLATE_CC) . || true
ctype_members.cc: ${glibcxx_srcdir}/@CCTYPE_CC@ ctype_members.cc: ${glibcxx_srcdir}/$(CCTYPE_CC)
@LN_S@ ${glibcxx_srcdir}/@CCTYPE_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CCTYPE_CC) . || true
messages_members.cc: ${glibcxx_srcdir}/@CMESSAGES_CC@ messages_members.cc: ${glibcxx_srcdir}/$(CMESSAGES_CC)
@LN_S@ ${glibcxx_srcdir}/@CMESSAGES_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_CC) . || true
monetary_members.cc: ${glibcxx_srcdir}/@CMONEY_CC@ monetary_members.cc: ${glibcxx_srcdir}/$(CMONEY_CC)
@LN_S@ ${glibcxx_srcdir}/@CMONEY_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CMONEY_CC) . || true
numeric_members.cc: ${glibcxx_srcdir}/@CNUMERIC_CC@ numeric_members.cc: ${glibcxx_srcdir}/$(CNUMERIC_CC)
@LN_S@ ${glibcxx_srcdir}/@CNUMERIC_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CNUMERIC_CC) . || true
time_members.cc: ${glibcxx_srcdir}/@CTIME_CC@ time_members.cc: ${glibcxx_srcdir}/$(CTIME_CC)
@LN_S@ ${glibcxx_srcdir}/@CTIME_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CTIME_CC) . || true
# Source files linked in via configuration/make substitution for a # Source files linked in via configuration/make substitution for a
# particular host, but with ad hoc naming rules. # particular host, but with ad hoc naming rules.
...@@ -82,11 +82,11 @@ host_sources_extra = \ ...@@ -82,11 +82,11 @@ host_sources_extra = \
basic_file.cc \ basic_file.cc \
c++locale.cc c++locale.cc
c++locale.cc: ${glibcxx_srcdir}/@CLOCALE_CC@ c++locale.cc: ${glibcxx_srcdir}/$(CLOCALE_CC)
@LN_S@ ${glibcxx_srcdir}/@CLOCALE_CC@ ./$@ || true $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_CC) ./$@ || true
basic_file.cc: ${glibcxx_srcdir}/@BASIC_FILE_CC@ basic_file.cc: ${glibcxx_srcdir}/$(BASIC_FILE_CC)
@LN_S@ ${glibcxx_srcdir}/@BASIC_FILE_CC@ ./$@ || true $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_CC) ./$@ || true
# Sources present in the src directory. # Sources present in the src directory.
sources = \ sources = \
...@@ -131,13 +131,13 @@ libstdc___la_LIBADD = \ ...@@ -131,13 +131,13 @@ libstdc___la_LIBADD = \
libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD) libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD)
libstdc___la_LDFLAGS = \ libstdc___la_LDFLAGS = \
-version-info @libtool_VERSION@ ${version_arg} \ -version-info $(libtool_VERSION) ${version_arg} \
-lm @LIBUNWIND_FLAG@ -lm $(LIBUNWIND_FLAG)
# Use special rules for the deprecated source files so that they find # Use special rules for the deprecated source files so that they find
# deprecated include files. # deprecated include files.
GLIBCXX_INCLUDE_DIR=@glibcxx_builddir@/include GLIBCXX_INCLUDE_DIR=$(glibcxx_builddir)/include
strstream.lo: strstream.cc strstream.lo: strstream.cc
$(LTCXXCOMPILE) -I$(GLIBCXX_INCLUDE_DIR)/backward -Wno-deprecated -c $< $(LTCXXCOMPILE) -I$(GLIBCXX_INCLUDE_DIR)/backward -Wno-deprecated -c $<
strstream.o: strstream.cc strstream.o: strstream.cc
...@@ -199,7 +199,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \ ...@@ -199,7 +199,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
# directory to configure libstdc++-v3 to use gcc as the C++ # directory to configure libstdc++-v3 to use gcc as the C++
# compilation driver. # compilation driver.
CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \ 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. # Added bits to build debug library.
...@@ -228,9 +228,9 @@ stamp-debug: ...@@ -228,9 +228,9 @@ stamp-debug:
echo `date` > stamp-debug; echo `date` > stamp-debug;
build_debug: 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 library here.
install_debug: install_debug:
(cd ${debugdir} && $(MAKE) \ (cd ${debugdir} && $(MAKE) \
toolexeclibdir=@glibcxx_toolexeclibdir@/debug install) toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
libstdc++-v3/src/Makefile.in
...@@ -289,13 +289,13 @@ libstdc___la_LIBADD = \ ...@@ -289,13 +289,13 @@ libstdc___la_LIBADD = \
libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD) libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD)
libstdc___la_LDFLAGS = \ libstdc___la_LDFLAGS = \
-version-info @libtool_VERSION@ ${version_arg} \ -version-info $(libtool_VERSION) ${version_arg} \
-lm @LIBUNWIND_FLAG@ -lm $(LIBUNWIND_FLAG)
# Use special rules for the deprecated source files so that they find # Use special rules for the deprecated source files so that they find
# deprecated include files. # 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 # 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 # 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) \ ...@@ -338,7 +338,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
# directory to configure libstdc++-v3 to use gcc as the C++ # directory to configure libstdc++-v3 to use gcc as the C++
# compilation driver. # compilation driver.
CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \ 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 debugdir = debug
...@@ -624,32 +624,32 @@ uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES ...@@ -624,32 +624,32 @@ uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ fi @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ fi
@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@libstdc++-symbol.ver: @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@libstdc++-symbol.ver:
codecvt_members.cc: ${glibcxx_srcdir}/@CCODECVT_CC@ codecvt_members.cc: ${glibcxx_srcdir}/$(CCODECVT_CC)
@LN_S@ ${glibcxx_srcdir}/@CCODECVT_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_CC) . || true
collate_members.cc: ${glibcxx_srcdir}/@CCOLLATE_CC@ collate_members.cc: ${glibcxx_srcdir}/$(CCOLLATE_CC)
@LN_S@ ${glibcxx_srcdir}/@CCOLLATE_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CCOLLATE_CC) . || true
ctype_members.cc: ${glibcxx_srcdir}/@CCTYPE_CC@ ctype_members.cc: ${glibcxx_srcdir}/$(CCTYPE_CC)
@LN_S@ ${glibcxx_srcdir}/@CCTYPE_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CCTYPE_CC) . || true
messages_members.cc: ${glibcxx_srcdir}/@CMESSAGES_CC@ messages_members.cc: ${glibcxx_srcdir}/$(CMESSAGES_CC)
@LN_S@ ${glibcxx_srcdir}/@CMESSAGES_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_CC) . || true
monetary_members.cc: ${glibcxx_srcdir}/@CMONEY_CC@ monetary_members.cc: ${glibcxx_srcdir}/$(CMONEY_CC)
@LN_S@ ${glibcxx_srcdir}/@CMONEY_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CMONEY_CC) . || true
numeric_members.cc: ${glibcxx_srcdir}/@CNUMERIC_CC@ numeric_members.cc: ${glibcxx_srcdir}/$(CNUMERIC_CC)
@LN_S@ ${glibcxx_srcdir}/@CNUMERIC_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CNUMERIC_CC) . || true
time_members.cc: ${glibcxx_srcdir}/@CTIME_CC@ time_members.cc: ${glibcxx_srcdir}/$(CTIME_CC)
@LN_S@ ${glibcxx_srcdir}/@CTIME_CC@ . || true $(LN_S) ${glibcxx_srcdir}/$(CTIME_CC) . || true
c++locale.cc: ${glibcxx_srcdir}/@CLOCALE_CC@ c++locale.cc: ${glibcxx_srcdir}/$(CLOCALE_CC)
@LN_S@ ${glibcxx_srcdir}/@CLOCALE_CC@ ./$@ || true $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_CC) ./$@ || true
basic_file.cc: ${glibcxx_srcdir}/@BASIC_FILE_CC@ basic_file.cc: ${glibcxx_srcdir}/$(BASIC_FILE_CC)
@LN_S@ ${glibcxx_srcdir}/@BASIC_FILE_CC@ ./$@ || true $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_CC) ./$@ || true
strstream.lo: strstream.cc strstream.lo: strstream.cc
$(LTCXXCOMPILE) -I$(GLIBCXX_INCLUDE_DIR)/backward -Wno-deprecated -c $< $(LTCXXCOMPILE) -I$(GLIBCXX_INCLUDE_DIR)/backward -Wno-deprecated -c $<
strstream.o: strstream.cc strstream.o: strstream.cc
...@@ -691,12 +691,12 @@ stamp-debug: ...@@ -691,12 +691,12 @@ stamp-debug:
echo `date` > stamp-debug; echo `date` > stamp-debug;
build_debug: 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 library here.
install_debug: install_debug:
(cd ${debugdir} && $(MAKE) \ (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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:
libstdc++-v3/testsuite/Makefile.am
...@@ -69,9 +69,8 @@ endif ...@@ -69,9 +69,8 @@ endif
# This is automatically run after the generated check-DEJAGNU rule. # This is automatically run after the generated check-DEJAGNU rule.
check-local: check-abi check-local: check-abi
baseline_dir = @baseline_dir@
baseline_file = ${baseline_dir}/baseline_symbols.txt 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 current_symbols.txt: ${extract_symvers} ../src/.libs/libstdc++.so
-@(${extract_symvers} ../src/.libs/libstdc++.so current_symbols.txt) -@(${extract_symvers} ../src/.libs/libstdc++.so current_symbols.txt)
......
libstdc++-v3/testsuite/Makefile.in
...@@ -147,7 +147,6 @@ ac_ct_CXX = @ac_ct_CXX@ ...@@ -147,7 +147,6 @@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@ ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
baseline_dir = @baseline_dir@ baseline_dir = @baseline_dir@
bindir = @bindir@ bindir = @bindir@
build = @build@ build = @build@
...@@ -247,8 +246,9 @@ libv3test_a_SOURCES = testsuite_hooks.cc testsuite_allocator.cc ...@@ -247,8 +246,9 @@ libv3test_a_SOURCES = testsuite_hooks.cc testsuite_allocator.cc
@GLIBCXX_TEST_ABI_TRUE@noinst_PROGRAMS = abi_check @GLIBCXX_TEST_ABI_TRUE@noinst_PROGRAMS = abi_check
abi_check_SOURCES = abi_check.cc abi_check_SOURCES = abi_check.cc
baseline_file = ${baseline_dir}/baseline_symbols.txt 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 # These two special 'check-script' rules use the bash script
# 'check_survey' to do testing. This script is not as portable as the # 'check_survey' to do testing. This script is not as portable as the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment