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>

diff --git a/Makefile.am b/Makefile.am
index f0c39c1de48eb20bffbec9dc059a722aa3bde8ad..52f7654ac0a7f306c1eef42bcc7b1c048412ed7c 100644 (file)
--- 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 6df915a1e6beb13e84ca66eff85f399bb62b7c8b..8e3e0159c0ee01d1b1288c89f8696e7c6f3e93a4 100644 (file)
--- 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 116f578b56d120c580c827d6066dcc2e53b1b033..fbdb94cf94029634d53e76d59baa36ac785ab079 100644 (file)
--- 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
similarity index 99%
rename from configure.in
rename to configure.ac
index 9463b5ad4766a24698ad4a39ec9c89038bcdc142..d744867a3acbbc4f3d260904ebb6823edecc8013 100644 (file)
--- 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 406fde763edec5962d76a01ee9d40837ec680b8b..e087f42449a568fd28adec25818ab471e842d3f7 100644 (file)
--- 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 de37f2cc3996faaf1a3a214fab5c03a63b42c116..0127d5c4b2005acba635c831b296f4b44cff6b6c 100644 (file)
--- 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 bad09444fb04d506f24bab912d0dddf7ccc27902..cb64ee8ca6659fac286b448143954a22b0dc88eb 100644 (file)
--- 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 8f789fecc125b823e6c1ad004f2b1f86f005abcc..fa255ff43ee07e889d27ea9dfd11df042b7f3e1e 100644 (file)
--- 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 e6d4ac537961365863b6b58dcc314e4657d398dd..1234e111e3884ba7514f013c26762030a227d237 100644 (file)
--- 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 8076c732b77dc84cbadf6088f22d86ed52b17a2f..3d476a210e6ee2c499b197472765e9a1325c9346 100644 (file)
--- 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 0b626b904a0206ccfbafd4f4d407feb7fcf4a0a5..b543e581e47366bb98ee25b646fb0d69863bda9a 100644 (file)
--- 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 c0749a476d7db8a04997e1fdff5dd220781d457c..6eeff8af459a7777a894247efd760a9c8c2d7a49 100644 (file)
--- 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 28faa5425550c4fb0fe3ddbb81db9f8410177deb..81598f634bc3a776e7279278617ea1a99bad409c 100644 (file)
--- 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 2470c7ad0e06b048aed89a8c515a178a86dc5e49..41858a1fb07e3d2d40f6e316f332664b9eadf722 100644 (file)
--- 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 1ea92f02d80f5face38545949bba1e6619bd428d..6cefe3970f4a3f06924653f1ca639f6594533226 100644 (file)
--- 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 e7cf77b64995b2fb3622f5c76d06b7f765dd5987..7cfbe455af561f5801ff6db87d39d8b8883c8553 100644 (file)
--- 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 7435d90333c4d72fe97ae4b5a8a14b43f18c4bbf..9d66b24439c290544808d8a4db68807abf882d20 100644 (file)
--- 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 87054021a70c4e393f605f6133e2f50e6151862a..a06e79b39d18337775256cad9522fef23f57dde3 100644 (file)
--- 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 447d5251207d1753c74f342094a72b25695494cb..7220c02029f4ce5dd2834b1ca26cf7cb819d57cc 100644 (file)
--- 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