Update of /cvsroot/alsa/alsa-kernel/isa/gus
In directory sc8-pr-cvs1:/tmp/cvs-serv2987/isa/gus

Modified Files:
        Makefile 
Log Message:
Fixed Makefiles for kernel when CONFIG_SND_SEQUENCER is m, but the toplevel
module is y.


Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile    17 Dec 2002 20:00:43 -0000      1.7
+++ Makefile    28 Jan 2003 14:49:48 -0000      1.8
@@ -19,18 +19,24 @@
 snd-interwave-objs := interwave.o
 snd-interwave-stb-objs := interwave-stb.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)),m,$(if 
+$(CONFIG_SND_SEQUENCER),$(1)))
+
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_GUSCLASSIC) += snd-gusclassic.o snd-gus-lib.o
+obj-$(call sequencer,$(CONFIG_SND_GUSCLASSIC)) += snd-gus-synth.o
 obj-$(CONFIG_SND_GUSMAX) += snd-gusmax.o snd-gus-lib.o
+obj-$(call sequencer,$(CONFIG_SND_GUSMAX)) += snd-gus-synth.o
 obj-$(CONFIG_SND_GUSEXTREME) += snd-gusextreme.o snd-gus-lib.o
+obj-$(call sequencer,$(CONFIG_SND_GUSEXTREME)) += snd-gus-synth.o
 obj-$(CONFIG_SND_INTERWAVE) += snd-interwave.o snd-gus-lib.o
+obj-$(call sequencer,$(CONFIG_SND_INTERWAVE)) += snd-gus-synth.o
 obj-$(CONFIG_SND_INTERWAVE_STB) += snd-interwave-stb.o snd-gus-lib.o
-ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
-  obj-$(CONFIG_SND_GUSCLASSIC) += snd-gus-synth.o
-  obj-$(CONFIG_SND_GUSMAX) += snd-gus-synth.o
-  obj-$(CONFIG_SND_GUSEXTREME) += snd-gus-synth.o
-  obj-$(CONFIG_SND_INTERWAVE) += snd-gus-synth.o
-  obj-$(CONFIG_SND_INTERWAVE_STB) += snd-gus-synth.o
-endif
+obj-$(call sequencer,$(CONFIG_SND_INTERWAVE_STB)) += snd-gus-synth.o
 
 obj-m := $(sort $(obj-m))



-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to