autotools: update style

- rename configure.in to configure.ac
- replace INCLUDES with AM_CPPFLAGS
- modernize AM_INIT_AUTOMAKE invocation

Signed-off-by: Patrick Welche <prlw1@cam.ac.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

19 files changed, 22 insertions, 21 deletions

diff --git a/Makefile.am b/Makefile.am
index f0c39c1d..52f7654a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ EXTRA_DIST=ChangeLog INSTALL TODO NOTES configure gitcompile libtool \
 	   depcomp version MEMORY-LEAK m4/attributes.m4
 AUTOMAKE_OPTIONS=foreign
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
 
 rpm: dist
 	$(MAKE) -C utils rpm
diff --git a/alsalisp/Makefile.am b/alsalisp/Makefile.am
index 6df915a1..8e3e0159 100644
--- a/alsalisp/Makefile.am
+++ b/alsalisp/Makefile.am
@@ -5,4 +5,4 @@ alsalisp_LDADD = ../src/libasound.la
 
 all: alsalisp
 
-INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/src/alisp
+AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/src/alisp
diff --git a/aserver/Makefile.am b/aserver/Makefile.am
index 116f578b..fbdb94cf 100644
--- a/aserver/Makefile.am
+++ b/aserver/Makefile.am
@@ -5,7 +5,7 @@ aserver_LDADD = ../src/libasound.la
 
 all: aserver
 
-INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/src/pcm
+AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/src/pcm
 
 ../src/libasound.la:
 	$(MAKE) -C ../src libasound.la
diff --git a/configure.in b/configure.ac
index 9463b5ad..d744867a 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,7 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT(src/control/control.c)
+AC_INIT(alsa-lib, 1.0.27.2)
 
+AC_CONFIG_SRCDIR([src/control/control.c])
 AC_CONFIG_MACRO_DIR([m4])
 
 dnl *************************************************
@@ -12,7 +13,7 @@ dnl add API = c+1:0:a+1
 dnl remove API = c+1:0:0
 dnl *************************************************
 AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE(alsa-lib, 1.0.27.2)
+AM_INIT_AUTOMAKE
 eval LIBTOOL_VERSION_INFO="2:0:0"
 dnl *************************************************
 AM_CONDITIONAL([INSTALL_M4], [test -n "${ACLOCAL}"])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 406fde76..e087f424 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS=pictures
 
 EXTRA_DIST=README.1st asoundrc.txt doxygen.cfg index.doxygen
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
 
 doc:
 	test -e doxygen.cfg || sed s:[@]top_srcdir[@]:..:g doxygen.cfg.in > doxygen.cfg
diff --git a/include/Makefile.am b/include/Makefile.am
index de37f2cc..0127d5c4 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -61,7 +61,7 @@ alsa:
 version.h: stamp-vh alsa
 	@:
 
-stamp-vh: $(top_builddir)/configure.in
+stamp-vh: $(top_builddir)/configure.ac
 	@echo "/*" > ver.tmp
 	@echo " *  version.h" >> ver.tmp
 	@echo " */" >> ver.tmp
@@ -83,7 +83,7 @@ stamp-vh: $(top_builddir)/configure.in
               echo timestamp > stamp-vh)
 	-@rm -f ver.tmp
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
 
 install-data-hook:
 	test -d $(DESTDIR)$(sysincludedir) || mkdir -p $(DESTDIR)$(sysincludedir)
diff --git a/modules/mixer/simple/Makefile.am b/modules/mixer/simple/Makefile.am
index bad09444..cb64ee8c 100644
--- a/modules/mixer/simple/Makefile.am
+++ b/modules/mixer/simple/Makefile.am
@@ -3,7 +3,7 @@ pkglibdir = $(alsaplugindir)/smixer
 
 AM_CFLAGS = -g -O2 -W -Wall
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
 
 pkglib_LTLIBRARIES = smixer-sbase.la \
 		     smixer-ac97.la \
diff --git a/src/Makefile.am b/src/Makefile.am
index 8f789fec..fa255ff4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,4 +87,4 @@ instr/libinstr.la:
 alisp/libalisp.la:
 	$(MAKE) -C alisp libalisp.la
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
diff --git a/src/alisp/Makefile.am b/src/alisp/Makefile.am
index e6d4ac53..1234e111 100644
--- a/src/alisp/Makefile.am
+++ b/src/alisp/Makefile.am
@@ -8,4 +8,4 @@ noinst_HEADERS = alisp_local.h
 
 all: libalisp.la
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
diff --git a/src/control/Makefile.am b/src/control/Makefile.am
index 8076c732..3d476a21 100644
--- a/src/control/Makefile.am
+++ b/src/control/Makefile.am
@@ -15,4 +15,4 @@ noinst_HEADERS = control_local.h
 all: libcontrol.la
 
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
diff --git a/src/hwdep/Makefile.am b/src/hwdep/Makefile.am
index 0b626b90..b543e581 100644
--- a/src/hwdep/Makefile.am
+++ b/src/hwdep/Makefile.am
@@ -5,4 +5,4 @@ noinst_HEADERS = hwdep_local.h
 all: libhwdep.la
 
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
diff --git a/src/mixer/Makefile.am b/src/mixer/Makefile.am
index c0749a47..6eeff8af 100644
--- a/src/mixer/Makefile.am
+++ b/src/mixer/Makefile.am
@@ -11,4 +11,4 @@ noinst_HEADERS = mixer_local.h mixer_simple.h
 all: libmixer.la
 
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
diff --git a/src/pcm/Makefile.am b/src/pcm/Makefile.am
index 28faa542..81598f63 100644
--- a/src/pcm/Makefile.am
+++ b/src/pcm/Makefile.am
@@ -114,4 +114,4 @@ alsadir = $(datadir)/alsa
 
 all: libpcm.la
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
diff --git a/src/rawmidi/Makefile.am b/src/rawmidi/Makefile.am
index 2470c7ad..41858a1f 100644
--- a/src/rawmidi/Makefile.am
+++ b/src/rawmidi/Makefile.am
@@ -9,4 +9,4 @@ noinst_HEADERS = rawmidi_local.h
 all: librawmidi.la
 
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
diff --git a/src/seq/Makefile.am b/src/seq/Makefile.am
index 1ea92f02..6cefe397 100644
--- a/src/seq/Makefile.am
+++ b/src/seq/Makefile.am
@@ -10,4 +10,4 @@ noinst_HEADERS = seq_local.h
 all: libseq.la
 
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
diff --git a/src/timer/Makefile.am b/src/timer/Makefile.am
index e7cf77b6..7cfbe455 100644
--- a/src/timer/Makefile.am
+++ b/src/timer/Makefile.am
@@ -6,4 +6,4 @@ noinst_HEADERS = timer_local.h
 all: libtimer.la
 
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
diff --git a/src/ucm/Makefile.am b/src/ucm/Makefile.am
index 7435d903..9d66b244 100644
--- a/src/ucm/Makefile.am
+++ b/src/ucm/Makefile.am
@@ -7,4 +7,4 @@ noinst_HEADERS = ucm_local.h
 all: libucm.la
 
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
diff --git a/test/Makefile.am b/test/Makefile.am
index 87054021..a06e79b3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -22,7 +22,7 @@ code_CFLAGS=-Wall -pipe -g -O2
 chmap_LDADD=../src/libasound.la
 audio_time_LDADD=../src/libasound.la
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include
 AM_CFLAGS=-Wall -pipe -g
 
 EXTRA_DIST=seq-decoder.c seq-sender.c midifile.h midifile.c midifile.3
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 447d5251..7220c020 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -11,4 +11,4 @@ pkgconfig_DATA = alsa.pc
 rpm: buildrpm alsa-lib.spec
 	VERSION=$(VERSION) $(srcdir)/buildrpm
 
-INCLUDES=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include