From 10e3f81ef780ded422b984ef76ab174a3395e57e Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 12 May 2006 15:34:22 +0200 Subject: [PATCH] Add hgcompile script and fix INSTALL document Added hgcompile script (just a copy of cvscompile), and fixed INSTALL document about HG. --- INSTALL | 8 ++++---- Makefile.am | 2 +- hgcompile | 25 +++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100755 hgcompile diff --git a/INSTALL b/INSTALL index d1fcbbb..202c491 100644 --- a/INSTALL +++ b/INSTALL @@ -24,11 +24,11 @@ package. The configure script from alsa-utils package probably cannot find header file asoundlib.h in $prefix/include/alsa directory (usually in /usr/include/alsa directory). -Compilation from CVS sources ----------------------------- +Compilation from HG sources +--------------------------- You need also GNU packages autoconf and automake installed in your system -to compile CVS sources of alsa-utils package. +to compile HG (Mercurial) sources of alsa-utils package. For compilation you can use these commands: @@ -40,7 +40,7 @@ For compilation you can use these commands: ./configure make -The included cvscompile script does this job for you. +The included hgcompile script does this job for you. Note: Some automake packages have missing aclocal program. Use newer version in the case. diff --git a/Makefile.am b/Makefile.am index 1003eb6..e626cf2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 cvscompile depcomp +EXTRA_DIST= config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp AUTOMAKE_OPTIONS=foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/hgcompile b/hgcompile new file mode 100755 index 0000000..18bc940 --- /dev/null +++ b/hgcompile @@ -0,0 +1,25 @@ +#!/bin/bash + +if test -d ../alsa-lib/utils && ! test -r `aclocal --print-ac-dir`/alsa.m4; then + alsa_m4_flags="-I ../alsa-lib/utils" +fi +aclocal $alsa_m4_flags $ACLOCAL_FLAGS +# save original files to avoid stupid modifications by gettextize +cp Makefile.am Makefile.am.ok +cp configure.in configure.in.ok +gettextize -c -f --no-changelog +echo "EXTRA_DIST = gettext.m4" > m4/Makefile.am +cp Makefile.am.ok Makefile.am +cp configure.in.ok configure.in +autoheader +automake --foreign --copy --add-missing +touch depcomp # for older automake +autoconf +export CFLAGS='-O2 -Wall -pipe -g' +echo "CFLAGS=$CFLAGS" +echo "./configure $@" +./configure $@ || exit 1 +unset CFLAGS +if [ -z "$HGCOMPILE_NO_MAKE" ]; then + make +fi