From 02d08acb3e8f1fc9f00e6af0d4499a2ea21da33c Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 16 Aug 2009 14:45:01 -0700
Subject: [PATCH] Use proper automake subdirectory options

---
 .gitignore   | 1 +
 Makefile.am  | 2 ++
 configure.ac | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b66f23c0..e57e492c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.la
 .deps
 .libs
+.dirstamp
 Makefile
 Makefile.in
 aclocal.m4
diff --git a/Makefile.am b/Makefile.am
index 4081601f..5a3a1a69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
 
 SUBDIRS = gdbus gatchat gisi include plugins drivers unit src doc
 
+AM_MAKEFLAGS = --no-print-directory
+
 DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles
 
 MAINTAINERCLEANFILES = Makefile.in \
diff --git a/configure.ac b/configure.ac
index 989bf2a9..9824f546 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.60)
-AC_INIT()
+AC_INIT(ofono, 0.3)
 
-AM_INIT_AUTOMAKE(ofono, 0.3)
+AM_INIT_AUTOMAKE([subdir-objects])
 AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])