summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-08-16 14:52:28 -0700
committerMarcel Holtmann <marcel@holtmann.org>2009-08-16 14:52:28 -0700
commitd1003b737c601ff4686448e20002f83a4142fd13 (patch)
tree1f41523633e9a52567a50a22419578e43dfecf78
parent054be75df725781e7cd67d788ef2704744681880 (diff)
downloadbluez-d1003b737c601ff4686448e20002f83a4142fd13.tar.gz
Prepare for better subdirectory automake support
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac4
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 81cb5c63d..4ee6695d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,8 @@ SUBDIRS = include lib sbc gdbus common \
plugins network serial input audio src \
client tools rfcomm compat cups test scripts doc
+AM_MAKEFLAGS = --no-print-directory
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = bluez.pc
diff --git a/configure.ac b/configure.ac
index 85e1dae8b..833346ef7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ(2.60)
-AC_INIT()
+AC_INIT(bluez, 4.47)
-AM_INIT_AUTOMAKE(bluez, 4.47)
+AM_INIT_AUTOMAKE()
AM_CONFIG_HEADER(config.h)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])