mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

autotools: update style

Browse source 
- 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>
This commit is contained in:
Patrick Welche 2014-02-25 12:40:21 +00:00 • committed by Takashi Iwai
parent 7a6e8ca348
commit b669b50de2
19 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -17,7 +17,7 @@ EXTRA_DIST=ChangeLog INSTALL TODO NOTES configure gitcompile libtool \
depcomp version MEMORY-LEAK m4/attributes.m4 depcomp version MEMORY-LEAK m4/attributes.m4
AUTOMAKE_OPTIONS=foreign AUTOMAKE_OPTIONS=foreign
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include
rpm: dist rpm: dist
$(MAKE) -C utils rpm $(MAKE) -C utils rpm

2
alsalisp/Makefile.am
View file

@ -5,4 +5,4 @@ alsalisp_LDADD = ../src/libasound.la
all: alsalisp all: alsalisp
INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/src/alisp AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/src/alisp

2
aserver/Makefile.am
View file

@ -5,7 +5,7 @@ aserver_LDADD = ../src/libasound.la
all: aserver 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: ../src/libasound.la:
$(MAKE) -C ../src libasound.la $(MAKE) -C ../src libasound.la

5
configure.in → configure.ac
View file

@ -1,7 +1,8 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59) 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]) AC_CONFIG_MACRO_DIR([m4])
dnl ************************************************* dnl *************************************************
@ -12,7 +13,7 @@ dnl add API = c+1:0:a+1
dnl remove API = c+1:0:0 dnl remove API = c+1:0:0
dnl ************************************************* dnl *************************************************
AC_CANONICAL_HOST AC_CANONICAL_HOST
AM_INIT_AUTOMAKE(alsa-lib, 1.0.27.2) AM_INIT_AUTOMAKE
eval LIBTOOL_VERSION_INFO="2:0:0" eval LIBTOOL_VERSION_INFO="2:0:0"
dnl ************************************************* dnl *************************************************
AM_CONDITIONAL([INSTALL_M4], [test -n "${ACLOCAL}"]) AM_CONDITIONAL([INSTALL_M4], [test -n "${ACLOCAL}"])

2
doc/Makefile.am
View file

@ -2,7 +2,7 @@ SUBDIRS=pictures
EXTRA_DIST=README.1st asoundrc.txt doxygen.cfg index.doxygen EXTRA_DIST=README.1st asoundrc.txt doxygen.cfg index.doxygen
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include
doc: doc:
test -e doxygen.cfg || sed s:[@]top_srcdir[@]:..:g doxygen.cfg.in > doxygen.cfg test -e doxygen.cfg || sed s:[@]top_srcdir[@]:..:g doxygen.cfg.in > doxygen.cfg

4
include/Makefile.am
View file

@ -61,7 +61,7 @@ alsa:
version.h: stamp-vh alsa version.h: stamp-vh alsa
@: @:
stamp-vh: $(top_builddir)/configure.in stamp-vh: $(top_builddir)/configure.ac
@echo "/*" > ver.tmp @echo "/*" > ver.tmp
@echo " * version.h" >> ver.tmp @echo " * version.h" >> ver.tmp
@echo " */" >> ver.tmp @echo " */" >> ver.tmp
@ -83,7 +83,7 @@ stamp-vh: $(top_builddir)/configure.in
echo timestamp > stamp-vh) echo timestamp > stamp-vh)
-@rm -f ver.tmp -@rm -f ver.tmp
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include
install-data-hook: install-data-hook:
test -d $(DESTDIR)$(sysincludedir) || mkdir -p $(DESTDIR)$(sysincludedir) test -d $(DESTDIR)$(sysincludedir) || mkdir -p $(DESTDIR)$(sysincludedir)

2
modules/mixer/simple/Makefile.am
View file

@ -3,7 +3,7 @@ pkglibdir = $(alsaplugindir)/smixer
AM_CFLAGS = -g -O2 -W -Wall AM_CFLAGS = -g -O2 -W -Wall
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include
pkglib_LTLIBRARIES = smixer-sbase.la \ pkglib_LTLIBRARIES = smixer-sbase.la \
smixer-ac97.la \ smixer-ac97.la \

2
src/Makefile.am
View file

@ -87,4 +87,4 @@ instr/libinstr.la:
alisp/libalisp.la: alisp/libalisp.la:
$(MAKE) -C alisp libalisp.la $(MAKE) -C alisp libalisp.la
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include

2
src/alisp/Makefile.am
View file

@ -8,4 +8,4 @@ noinst_HEADERS = alisp_local.h
all: libalisp.la all: libalisp.la
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include

2
src/control/Makefile.am
View file

@ -15,4 +15,4 @@ noinst_HEADERS = control_local.h
all: libcontrol.la all: libcontrol.la
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include

2
src/hwdep/Makefile.am
View file

@ -5,4 +5,4 @@ noinst_HEADERS = hwdep_local.h
all: libhwdep.la all: libhwdep.la
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include

2
src/mixer/Makefile.am
View file

@ -11,4 +11,4 @@ noinst_HEADERS = mixer_local.h mixer_simple.h
all: libmixer.la all: libmixer.la
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include

2
src/pcm/Makefile.am
View file

@ -114,4 +114,4 @@ alsadir = $(datadir)/alsa
all: libpcm.la all: libpcm.la
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include

2
src/rawmidi/Makefile.am
View file

@ -9,4 +9,4 @@ noinst_HEADERS = rawmidi_local.h
all: librawmidi.la all: librawmidi.la
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include

2
src/seq/Makefile.am
View file

@ -10,4 +10,4 @@ noinst_HEADERS = seq_local.h
all: libseq.la all: libseq.la
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include

2
src/timer/Makefile.am
View file

@ -6,4 +6,4 @@ noinst_HEADERS = timer_local.h
all: libtimer.la all: libtimer.la
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include

2
src/ucm/Makefile.am
View file

@ -7,4 +7,4 @@ noinst_HEADERS = ucm_local.h
all: libucm.la all: libucm.la
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include

2
test/Makefile.am
View file

@ -22,7 +22,7 @@ code_CFLAGS=-Wall -pipe -g -O2
chmap_LDADD=../src/libasound.la chmap_LDADD=../src/libasound.la
audio_time_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 AM_CFLAGS=-Wall -pipe -g
EXTRA_DIST=seq-decoder.c seq-sender.c midifile.h midifile.c midifile.3 EXTRA_DIST=seq-decoder.c seq-sender.c midifile.h midifile.c midifile.3

2
utils/Makefile.am
View file

@ -11,4 +11,4 @@ pkgconfig_DATA = alsa.pc
rpm: buildrpm alsa-lib.spec rpm: buildrpm alsa-lib.spec
VERSION=$(VERSION) $(srcdir)/buildrpm VERSION=$(VERSION) $(srcdir)/buildrpm
INCLUDES=-I$(top_srcdir)/include AM_CPPFLAGS=-I$(top_srcdir)/include