Makefile.am (libstdc++-symbols.ver): Use CONFIG_HEADER.

2012-12-10  Matthias Klose  <doko@ubuntu.com>

        * src/Makefile.am (libstdc++-symbols.ver): Use CONFIG_HEADER.
        * src/Makefile.in: Regenerate.

From-SVN: r194346

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c478e94b7ae97da60b22f9781ec832c35c8c54c4..1c29664a532e7dd8e2a4bd9c7cfb4f9a72ec3d54 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-10  Matthias Klose  <doko@ubuntu.com>
+
+       * src/Makefile.am (libstdc++-symbols.ver): Use CONFIG_HEADER.
+       * src/Makefile.in: Regenerate.
+
 2012-12-09  Andreas Schwab  <schwab@linux-m68k.org>
 
        * testsuite/lib/libstdc++.exp (dg-test): Unset testname_with_flags

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index d76318eae89d147d77291df7e5563a3775990189..b367c3f9594faf95e60d6833430dfd576f388605 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -196,7 +196,7 @@ libstdc++-symbols.ver:  ${glibcxx_srcdir}/$(SYMVER_FILE) \
          fi; \
        fi
        $(EGREP) -v '^[         ]*#(#| |$$)' $@.tmp | \
-         $(CC) -E -P -include ../config.h - > $@ || (rm -f $@ ; exit 1)
+         $(CC) -E -P -include $(CONFIG_HEADER) - > $@ || (rm -f $@ ; exit 1)
        rm -f $@.tmp
 
 CLEANFILES = libstdc++-symbols.ver

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index f9ff31943e9e771e8e152fdff00163b9d135d5b6..69001b4bf477a3895491a0c3309d26c808b3457e 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -865,7 +865,7 @@ compatibility-thread-c++0x.o: compatibility-thread-c++0x.cc
 @ENABLE_SYMVERS_TRUE@    fi; \
 @ENABLE_SYMVERS_TRUE@  fi
 @ENABLE_SYMVERS_TRUE@  $(EGREP) -v '^[         ]*#(#| |$$)' $@.tmp | \
-@ENABLE_SYMVERS_TRUE@    $(CC) -E -P -include ../config.h - > $@ || (rm -f $@ ; exit 1)
+@ENABLE_SYMVERS_TRUE@    $(CC) -E -P -include $(CONFIG_HEADER) - > $@ || (rm -f $@ ; exit 1)
 @ENABLE_SYMVERS_TRUE@  rm -f $@.tmp
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@libstdc++-symbols.ver-sun : libstdc++-symbols.ver \
 @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@         $(toplevel_srcdir)/contrib/make_sunver.pl \