[PATCH] ld10k1: Don't require as10k1

[PATCH] ld10k1: Don't require as10k1

[Mikael Magnusson]

[-- Attachment #1: Type: text/plain, Size: 409 bytes --]

Summary:
Don't require as10k1 in the configure script and remove the .emu10k1
files in maintainer-clean instead of clean, since the assembled
.emu10k1 files are included in the alsa-tools dist.

diffstat output:
  configure.in              |    4 +---
  setup/effects/Makefile.am |    6 ++++--
  2 files changed, 5 insertions(+), 5 deletions(-)

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>


[-- Attachment #2: ld10k1-as10k1.patch --]
[-- Type: text/x-patch, Size: 998 bytes --]

diff -ur ld10k1.cvs/configure.in ld10k1/configure.in
--- ld10k1.cvs/configure.in	2005-03-21 15:24:51.000000000 +0100
+++ ld10k1/configure.in	2005-04-10 12:01:52.168577208 +0200
@@ -16,9 +16,7 @@
 AC_SUBST(effectsdir)
 
 AC_CHECK_PROG(AS10K1, as10k1, as10k1)
-if test -z "$AS10K1"; then
-  AC_MSG_ERROR([as10k1 is not installed])
-fi
+AM_CONDITIONAL(HAVE_AS10K1, test x"$AS10K1" != x)
 
 #taken from alsa-lib
 dnl Make a symlink for inclusion of lo10k1/xxx.h
diff -ur ld10k1.cvs/setup/effects/Makefile.am ld10k1/setup/effects/Makefile.am
--- ld10k1.cvs/setup/effects/Makefile.am	2005-04-10 11:57:55.004887745 +0200
+++ ld10k1/setup/effects/Makefile.am	2005-04-10 12:05:19.069307463 +0200
@@ -10,9 +10,11 @@
 	sto51.emu10k1 switch_6.emu10k1 copy_2.emu10k1 \
 	prologic.emu10k1 fxbus.emu10k1
 
-CLEANFILES = $(dist_effects_DATA)
+MAINTAINERCLEANFILES = $(dist_effects_DATA)
 
-SUFFIXEC = .asm .emu10k1
+SUFFIXES = .asm .emu10k1
 
+if HAVE_AS10K1
 .asm.emu10k1:
 	$(AS10K1) -o $@ $<
+endif HAVE_AS10K1

Re: [PATCH] ld10k1: Don't require as10k1

[Takashi Iwai]

At Sun, 10 Apr 2005 12:24:37 +0200,
Mikael Magnusson wrote:
> 
> Summary:
> Don't require as10k1 in the configure script and remove the .emu10k1
> files in maintainer-clean instead of clean, since the assembled
> .emu10k1 files are included in the alsa-tools dist.
> 
> diffstat output:
>   configure.in              |    4 +---
>   setup/effects/Makefile.am |    6 ++++--
>   2 files changed, 5 insertions(+), 5 deletions(-)
> 
> Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>

Thanks.  Applied to CVS now.


Takashi


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click