From 4ace8dbbe2e04da1029a539c72b90dee1724c33f Mon Sep 17 00:00:00 2001
From: Aliaksey Kandratsenka <alk@tut.by>
Date: Sun, 21 Dec 2014 18:49:47 -0800
Subject: [PATCH] added subdir-objects automake options

This is suggested by automake itself regarding future-compat.
---
 .gitignore  | 8 ++++++++
 Makefile.am | 1 +
 2 files changed, 9 insertions(+)

diff --git a/.gitignore b/.gitignore
index 87dc1fb..3e74f99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,11 +95,19 @@
 /sampling_test
 /sampling_test.sh
 /simple_compat_test
+/src/.deps
+/src/.dirstamp
+/src/base/.deps
+/src/base/.dirstamp
 /src/config.h
 /src/config.h.in
 /src/gperftools/tcmalloc.h
 /src/stamp-h1
 /src/stamp-h1
+/src/tests/.deps
+/src/tests/.dirstamp
+/src/windows/.deps
+/src/windows/.dirstamp
 /stack_trace_table_test
 /stack_trace_table_test.exe
 /stacktrace_unittest
diff --git a/Makefile.am b/Makefile.am
index d163435..b45176a 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@
 
 # Make sure that when we re-make ./configure, we get the macros we need
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 # This is so we can #include <gperftools/foo>
 AM_CPPFLAGS = -I$(top_srcdir)/src