Skip to contentSkip to conversation

ld10k1: Don't require as10k1

PATCH In review Mikael Magnusson 2 participants 2 messages Apr 10, 2005 – Apr 11, 2005

lore
Share & tools
lore

Mikael Magnusson

author
#0 lore raw

PATCH 1/1 ld10k1: Don't require as10k1

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 <[email protected]>
configure.in +1 -3
diff -ur ld10k1.cvs/configure.in ld10k1/configure.in
@@ -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
setup/effects/Makefile.am +4 -2
diff -ur ld10k1.cvs/setup/effects/Makefile.am ld10k1/setup/effects/Makefile.am
@@ -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
#1 lore raw

At Sun, 10 Apr 2005 12:24:37 +0200,

Quoted 6 lines · Mikael Magnusson

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.

Quoted 6 lines

diffstat output:

  configure.in              |    4 +---
  setup/effects/Makefile.am |    6 ++++--
  2 files changed, 5 insertions(+), 5 deletions(-)
Signed-off-by Mikael Magnusson <[email protected]>

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