aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2013-09-07 21:35:38 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2013-09-07 21:35:38 +0000
commit4b21946eda1c0dade5d313ade2dfff8fdf278e7f (patch)
tree1299825128dd0dbc0e4edd0c076e1d27bfe8bd62
parentbcb650cbb87954272436b03e1cccf795ec7e777a (diff)
downloadgcc-4b21946eda1c0dade5d313ade2dfff8fdf278e7f.zip
gcc-4b21946eda1c0dade5d313ade2dfff8fdf278e7f.tar.gz
gcc-4b21946eda1c0dade5d313ade2dfff8fdf278e7f.tar.bz2
Makefile.am: Remove #if ENABLE_VTABLE_VERIFY check around definition of check-am:.
2013-09-07 Paolo Carlini <paolo.carlini@oracle.com> * testsuite/Makefile.am: Remove #if ENABLE_VTABLE_VERIFY check around definition of check-am:. * testsuite/Makefile.in: Regenerate. From-SVN: r202356
-rw-r--r--libvtv/ChangeLog6
-rw-r--r--libvtv/testsuite/Makefile.am4
-rw-r--r--libvtv/testsuite/Makefile.in5
3 files changed, 8 insertions, 7 deletions
diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog
index 9b42df2..265a861 100644
--- a/libvtv/ChangeLog
+++ b/libvtv/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-07 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * testsuite/Makefile.am: Remove #if ENABLE_VTABLE_VERIFY check around
+ definition of check-am:.
+ * testsuite/Makefile.in: Regenerate.
+
2013-09-06 Caroline Tice <cmtice@google.com>
* Makefile.am: Remove #if ENABLE_VTABLE_VERIFY checks around
diff --git a/libvtv/testsuite/Makefile.am b/libvtv/testsuite/Makefile.am
index 5f6ab0a..56f76a79 100644
--- a/libvtv/testsuite/Makefile.am
+++ b/libvtv/testsuite/Makefile.am
@@ -39,12 +39,8 @@ check-script: ${testing_script} stamp-subdir
-@(chmod +x ${testing_script}; \
${testing_script} ${libvtv_srcdir} ${libvtv_builddir})
-if ENABLE_VTABLE_VERIFY
check-am:
$(MAKE) $(AM_MAKEFLAGS) check-script
-else
-check-am:
-endif
.PHONY: check-script
diff --git a/libvtv/testsuite/Makefile.in b/libvtv/testsuite/Makefile.in
index 2992a90..66a75e1 100644
--- a/libvtv/testsuite/Makefile.in
+++ b/libvtv/testsuite/Makefile.in
@@ -365,9 +365,8 @@ check-script: ${testing_script} stamp-subdir
-@(chmod +x ${testing_script}; \
${testing_script} ${libvtv_srcdir} ${libvtv_builddir})
-@ENABLE_VTABLE_VERIFY_TRUE@check-am:
-@ENABLE_VTABLE_VERIFY_TRUE@ $(MAKE) $(AM_MAKEFLAGS) check-script
-@ENABLE_VTABLE_VERIFY_FALSE@check-am:
+check-am:
+ $(MAKE) $(AM_MAKEFLAGS) check-script
.PHONY: check-script