Merge branch 'master' of git@git.alsa-project.org:alsa-utils

This commit is contained in:
Jaroslav Kysela 2008-09-09 12:54:17 +02:00
commit c97e82caf7
3 changed files with 3 additions and 2 deletions

1
.gitignore vendored
View file

@ -30,6 +30,7 @@ alsamixer/alsamixer
amidi/amidi
amixer/amixer
aplay/aplay
aplay/arecord
aplay/arecord.1
iecset/iecset
seq/aconnect/aconnect

View file

@ -5,7 +5,7 @@ else
ALSAMIXER_DIR=
endif
SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
EXTRA_DIST= config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure gitcompile depcomp
EXTRA_DIST= TODO gitcompile
AUTOMAKE_OPTIONS=foreign
ACLOCAL_AMFLAGS = -I m4

View file

@ -5,7 +5,7 @@ man_MANS=alsactl.1 alsactl_init.7
EXTRA_DIST=alsactl.1 alsactl_init.xml
alsactl_SOURCES=alsactl.c state.c utils.c init_parse.c
noinst_HEADERS=alsactl.h
noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c
%.7: %.xml
xmlto man $?