Update of /cvsroot/alsa/alsa-kernel/drivers/opl4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26337/drivers/opl4
Modified Files:
Makefile
Log Message:
Fixed sequencer dependency for opl3, opl4 and emux objects.
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/drivers/opl4/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 23 May 2003 11:15:12 -0000 1.1
+++ Makefile 29 Feb 2004 10:03:19 -0000 1.2
@@ -7,9 +7,19 @@
snd-opl4-synth-objs := opl4_seq.o opl4_synth.o yrw801.o
OPL4_OBJS := snd-opl4-lib.o
-ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
- OPL4_OBJS += snd-opl4-synth.o
-endif
+OPL4_SYNTH_OBJS := snd-opl4-synth.o
+
+#
+# this function returns:
+# "m" - CONFIG_SND_SEQUENCER is m
+# <empty string> - CONFIG_SND_SEQUENCER is undefined
+# otherwise parameter #1 value
+#
+sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if
$(CONFIG_SND_SEQUENCER),$(1)))
obj-$(CONFIG_SND_OPTI92X_AD1848) += $(OPL4_OBJS)
+obj-$(call sequencer,$(CONFIG_SND_OPTI92X_AD1848)) += $(OPL4_SYNTH_OBJS)
obj-$(CONFIG_SND_OPTI92X_CS4231) += $(OPL4_OBJS)
+obj-$(call sequencer,$CONFIG_SND_OPTI92X_CS4231)) += $(OPL4_SYNTH_OBJS)
+
+obj-m := $(sort $(obj-m))
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
