Restore MAKEOVERRIDES in libsanitizer

	* Makefile.am (MAKEOVERRIDES): Restored.
	* asan/Makefile.am: Likewise.
	* interception/Makefile.am: Likewise.
	* sanitizer_common/Makefile.am: Likewise.
	* tsan/Makefile.am: Likewise.
	* Makefile.in: Regenerated.
	* asan/Makefile.in: Likewise.
	* interception/Makefile.in: Likewise.
	* sanitizer_common/Makefile.in: Likewise.
	* tsan/Makefile.in: Likewise.

From-SVN: r194450

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index aa26e3eeaa3f32b4ace89152d69fe39b4190b065..4c85dbee574006160b12ea898e4027eaeaaf2f76 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,16 @@
+2012-12-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * Makefile.am (MAKEOVERRIDES): Restored.
+       * asan/Makefile.am: Likewise.
+       * interception/Makefile.am: Likewise.
+       * sanitizer_common/Makefile.am: Likewise.
+       * tsan/Makefile.am: Likewise.
+       * Makefile.in: Regenerated.
+       * asan/Makefile.in: Likewise.
+       * interception/Makefile.in: Likewise.
+       * sanitizer_common/Makefile.in: Likewise.
+       * tsan/Makefile.in: Likewise.
+
 2012-12-12  H.J. Lu  <hongjiu.lu@intel.com>
 
        * asan/Makefile.am (libasan_la_LIBADD): Use $(LIBSTDCXX_RAW_CXX_LDLAGS).

diff --git a/libsanitizer/Makefile.am b/libsanitizer/Makefile.am
index ac3276e16946c946e2f394b57e3bc68a871d0677..272a218a8fd54a2a221328a9bb5779c2ac206e60 100644 (file)
--- a/libsanitizer/Makefile.am
+++ b/libsanitizer/Makefile.am
@@ -10,5 +10,7 @@ if USING_MAC_INTERPOSE
 SUBDIRS = sanitizer_common asan
 endif
 
+MAKEOVERRIDES=
+
 ## ################################################################
 

diff --git a/libsanitizer/Makefile.in b/libsanitizer/Makefile.in
index 42cde43cfaab0c14bae1c8030ff08c2eebe47673..b089634b95886ed5e3651c7d3295dc386e829d91 100644 (file)
--- a/libsanitizer/Makefile.in
+++ b/libsanitizer/Makefile.in
@@ -252,6 +252,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config
 @TSAN_SUPPORTED_FALSE@SUBDIRS = interception sanitizer_common asan 
 @TSAN_SUPPORTED_TRUE@SUBDIRS = interception sanitizer_common asan tsan 
 @USING_MAC_INTERPOSE_TRUE@SUBDIRS = sanitizer_common asan
+MAKEOVERRIDES = 
 all: all-recursive
 
 .SUFFIXES:

diff --git a/libsanitizer/asan/Makefile.am b/libsanitizer/asan/Makefile.am
index fcd145ccb311450b738aab396151e2bb137f53ab..95fd75efd9b1a341d74258aef025d72c8650b3aa 100644 (file)
--- a/libsanitizer/asan/Makefile.am
+++ b/libsanitizer/asan/Makefile.am
@@ -44,5 +44,7 @@ libasan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDLAGS)
 
 libasan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
 
+MAKEOVERRIDES=
+
 ## ################################################################
 

diff --git a/libsanitizer/asan/Makefile.in b/libsanitizer/asan/Makefile.in
index 9a397bc3f6723b33a59642f8a7b43f436618691e..87a454575679e1d54180ac3100b642829e2db5c0 100644 (file)
--- a/libsanitizer/asan/Makefile.in
+++ b/libsanitizer/asan/Makefile.in
@@ -291,6 +291,7 @@ libasan_la_SOURCES = $(asan_files) $(am__append_2)
 @USING_MAC_INTERPOSE_TRUE@libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la \
 @USING_MAC_INTERPOSE_TRUE@     $(LIBSTDCXX_RAW_CXX_LDLAGS)
 libasan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
+MAKEOVERRIDES = 
 all: all-am
 
 .SUFFIXES:

diff --git a/libsanitizer/interception/Makefile.am b/libsanitizer/interception/Makefile.am
index a35ea307d11821dd07c3a65cbfd98c7bbd4ff3c2..aab68f07c0fe57c85c877a75aaf72da4028b4295 100644 (file)
--- a/libsanitizer/interception/Makefile.am
+++ b/libsanitizer/interception/Makefile.am
@@ -17,5 +17,7 @@ interception_files = \
 
 libinterception_la_SOURCES = $(interception_files)
 
+MAKEOVERRIDES=
+
 ## ################################################################
 

diff --git a/libsanitizer/interception/Makefile.in b/libsanitizer/interception/Makefile.in
index d1c4dcb10dfde4d682c8cc73df1c259603219ee1..af8269c0fb88b6afe80c9eac1c6040e49e4bf256 100644 (file)
--- a/libsanitizer/interception/Makefile.in
+++ b/libsanitizer/interception/Makefile.in
@@ -225,6 +225,7 @@ interception_files = \
         interception_win.cc
 
 libinterception_la_SOURCES = $(interception_files)
+MAKEOVERRIDES = 
 all: all-am
 
 .SUFFIXES:

diff --git a/libsanitizer/sanitizer_common/Makefile.am b/libsanitizer/sanitizer_common/Makefile.am
index 7e499e03ecb641c0a8911a9eb51645ddebd862c4..8d414b306c580556e7de66c96969eda9f1c1c380 100644 (file)
--- a/libsanitizer/sanitizer_common/Makefile.am
+++ b/libsanitizer/sanitizer_common/Makefile.am
@@ -29,5 +29,7 @@ sanitizer_common_files = \
 
 libsanitizer_common_la_SOURCES = $(sanitizer_common_files) 
 
+MAKEOVERRIDES=
+
 ## ################################################################
 

diff --git a/libsanitizer/sanitizer_common/Makefile.in b/libsanitizer/sanitizer_common/Makefile.in
index 8ef3d9a63f1e945ba3e3dc76fd360befcbd17468..19c79ff4ac704253d87bbfd30b653ba4c240125b 100644 (file)
--- a/libsanitizer/sanitizer_common/Makefile.in
+++ b/libsanitizer/sanitizer_common/Makefile.in
@@ -242,6 +242,7 @@ sanitizer_common_files = \
         sanitizer_win.cc
 
 libsanitizer_common_la_SOURCES = $(sanitizer_common_files) 
+MAKEOVERRIDES = 
 all: all-am
 
 .SUFFIXES:

diff --git a/libsanitizer/tsan/Makefile.am b/libsanitizer/tsan/Makefile.am
index d7719ae9d8fe9c1d620e6fd4f27b4f5fe5891b07..a92ab34f4b68829903fb40be07d8f3f3cd0c398a 100644 (file)
--- a/libsanitizer/tsan/Makefile.am
+++ b/libsanitizer/tsan/Makefile.am
@@ -37,5 +37,7 @@ libtsan_la_SOURCES = $(tsan_files)
 libtsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDLAGS)
 libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
 
+MAKEOVERRIDES=
+
 ## ################################################################
 

diff --git a/libsanitizer/tsan/Makefile.in b/libsanitizer/tsan/Makefile.in
index 8d3f30e40cd5154851d575bbaf628bbb336c11ee..d2a4b1c043798e4fa20566bae23b329cd8b12637 100644 (file)
--- a/libsanitizer/tsan/Makefile.in
+++ b/libsanitizer/tsan/Makefile.in
@@ -276,6 +276,7 @@ tsan_files = \
 libtsan_la_SOURCES = $(tsan_files) 
 libtsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDLAGS)
 libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
+MAKEOVERRIDES = 
 all: all-am
 
 .SUFFIXES: