Index: ChangeLog
===================================================================
--- ChangeLog	(revision 194449)
+++ ChangeLog	(working copy)
@@ -1,5 +1,18 @@
 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).
 	* tsan/Makefile.am (libtsan_la_LIBADD): Likewise.
 	* Makefile.in: Regenerated.
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 194449)
+++ Makefile.am	(working copy)
@@ -10,5 +10,7 @@ if USING_MAC_INTERPOSE
 SUBDIRS = sanitizer_common asan
 endif

+MAKEOVERRIDES=
+
 ## ################################################################

Index: asan/Makefile.am
===================================================================
--- asan/Makefile.am	(revision 194449)
+++ asan/Makefile.am	(working copy)
@@ -44,5 +44,7 @@ libasan_la_LIBADD += $(LIBSTDCXX_RAW_CXX

 libasan_la_LDFLAGS = -version-info `grep -v '^\#'
$(srcdir)/libtool-version` -lpthread -ldl

+MAKEOVERRIDES=
+
 ## ################################################################

Index: interception/Makefile.am
===================================================================
--- interception/Makefile.am	(revision 194449)
+++ interception/Makefile.am	(working copy)
@@ -17,5 +17,7 @@ interception_files = \

 libinterception_la_SOURCES = $(interception_files)

+MAKEOVERRIDES=
+
 ## ################################################################

Index: sanitizer_common/Makefile.am
===================================================================
--- sanitizer_common/Makefile.am	(revision 194449)
+++ sanitizer_common/Makefile.am	(working copy)
@@ -29,5 +29,7 @@ sanitizer_common_files = \

 libsanitizer_common_la_SOURCES = $(sanitizer_common_files)

+MAKEOVERRIDES=
+
 ## ################################################################

Index: tsan/Makefile.am
===================================================================
--- tsan/Makefile.am	(revision 194449)
+++ tsan/Makefile.am	(working copy)
@@ -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

