diff options
| author | Caroline Tice <cmtice@google.com> | 2013-09-25 11:44:48 -0700 |
|---|---|---|
| committer | Caroline Tice <ctice@gcc.gnu.org> | 2013-09-25 11:44:48 -0700 |
| commit | 56fc78353ed96ccf2a347f4215795f86cce22cf9 (patch) | |
| tree | 4db3ab3f6f7cc4765540042bbc86f8d60a2ede5c /libvtv/Makefile.in | |
| parent | 20f114a35a535d215d4df50480547de0790e392d (diff) | |
| download | gcc-56fc78353ed96ccf2a347f4215795f86cce22cf9.zip gcc-56fc78353ed96ccf2a347f4215795f86cce22cf9.tar.gz gcc-56fc78353ed96ccf2a347f4215795f86cce22cf9.tar.bz2 | |
Fix issue with libvtv testsuite being run (and failing)
when GCC was not configured with --enable-vtable-verify.
From-SVN: r202918
Diffstat (limited to 'libvtv/Makefile.in')
| -rw-r--r-- | libvtv/Makefile.in | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/libvtv/Makefile.in b/libvtv/Makefile.in index 96e4a22..d77a41f 100644 --- a/libvtv/Makefile.in +++ b/libvtv/Makefile.in @@ -40,7 +40,7 @@ subdir = . DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/../mkinstalldirs $(srcdir)/../depcomp \ - $(libvtv_include_HEADERS) + $(am__libvtv_include_HEADERS_DIST) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ @@ -86,7 +86,7 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES) libvtv_la_LIBADD = am__objects_1 = vtv_start.lo vtv_malloc.lo vtv_rts.lo vtv_utils.lo \ vtv_end.lo -am_libvtv_la_OBJECTS = $(am__objects_1) +@ENABLE_VTABLE_VERIFY_TRUE@am_libvtv_la_OBJECTS = $(am__objects_1) libvtv_la_OBJECTS = $(am_libvtv_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../depcomp @@ -118,6 +118,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__libvtv_include_HEADERS_DIST = vtv_map.h vtv_malloc.h vtv_fail.h \ + vtv_set.h vtv_utils.h vtv_rts.h HEADERS = $(libvtv_include_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -125,7 +127,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = testsuite ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AR = @AR@ @@ -263,7 +265,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ toplevel_builddir = @toplevel_builddir@ toplevel_srcdir = @toplevel_srcdir@ -SUBDIRS = testsuite +@ENABLE_VTABLE_VERIFY_FALSE@SUBDIRS = +@ENABLE_VTABLE_VERIFY_TRUE@SUBDIRS = testsuite ACLOCAL_AMFLAGS = -I .. -I ../config # May be used by toolexeclibdir. @@ -293,8 +296,10 @@ libvtv_includedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include # Link in vtv_start and vtv_end. BUILT_SOURCES = vtv_start.c vtv_end.c -libvtv_la_SOURCES = $(vtv_sources) -libvtv_include_HEADERS = $(vtv_headers) +@ENABLE_VTABLE_VERIFY_FALSE@libvtv_la_SOURCES = +@ENABLE_VTABLE_VERIFY_TRUE@libvtv_la_SOURCES = $(vtv_sources) +@ENABLE_VTABLE_VERIFY_FALSE@libvtv_include_HEADERS = +@ENABLE_VTABLE_VERIFY_TRUE@libvtv_include_HEADERS = $(vtv_headers) # Least ordering for dependencies mean linking w/o libstdc++ for as # long as the development of libvtv does not absolutely require it. @@ -324,9 +329,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ./Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign ./Makefile + $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ |