[alsa-devel] [PATCH] ad1848-lib Makefile cleanup
From: Krzysztof Helt krzysztof.h1@wp.pl
This patch uses the Kconfig parameter SND_AD1848_LIB instead of mentioning each driver that requires the ad1848-lib separately in the Makefile.
Signed-off-by: Krzysztof Helt krzysztof.h1@wp.pl ---
diff -urp linux-2.6.23.old/sound/isa/ad1848/Makefile linux-2.6.23/sound/isa/ad1848/Makefile --- linux-2.6.23.old/sound/isa/ad1848/Makefile 2007-08-04 22:12:08.000000000 +0200 +++ linux-2.6.23/sound/isa/ad1848/Makefile 2007-08-08 18:53:20.000000000 +0200 @@ -7,9 +7,7 @@ snd-ad1848-lib-objs := ad1848_lib.o snd-ad1848-objs := ad1848.o
# Toplevel Module Dependency -obj-$(CONFIG_SND_CMI8330) += snd-ad1848-lib.o -obj-$(CONFIG_SND_SGALAXY) += snd-ad1848-lib.o obj-$(CONFIG_SND_AD1848) += snd-ad1848.o snd-ad1848-lib.o -obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-ad1848-lib.o +obj-$(CONFIG_SND_AD1848_LIB) += snd-ad1848-lib.o
obj-m := $(sort $(obj-m))
At Thu, 9 Aug 2007 19:06:43 +0200, Krzysztof Helt wrote:
From: Krzysztof Helt krzysztof.h1@wp.pl
This patch uses the Kconfig parameter SND_AD1848_LIB instead of mentioning each driver that requires the ad1848-lib separately in the Makefile.
Signed-off-by: Krzysztof Helt krzysztof.h1@wp.pl
diff -urp linux-2.6.23.old/sound/isa/ad1848/Makefile linux-2.6.23/sound/isa/ad1848/Makefile --- linux-2.6.23.old/sound/isa/ad1848/Makefile 2007-08-04 22:12:08.000000000 +0200 +++ linux-2.6.23/sound/isa/ad1848/Makefile 2007-08-08 18:53:20.000000000 +0200 @@ -7,9 +7,7 @@ snd-ad1848-lib-objs := ad1848_lib.o snd-ad1848-objs := ad1848.o
# Toplevel Module Dependency -obj-$(CONFIG_SND_CMI8330) += snd-ad1848-lib.o -obj-$(CONFIG_SND_SGALAXY) += snd-ad1848-lib.o obj-$(CONFIG_SND_AD1848) += snd-ad1848.o snd-ad1848-lib.o
This line should contain only snd-ad1848.o.
-obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-ad1848-lib.o +obj-$(CONFIG_SND_AD1848_LIB) += snd-ad1848-lib.o
obj-m := $(sort $(obj-m))
Oh, this sort is also superfluous.
There need similar cleanups in other isa/* directories. Care to create a patch including them?
thanks,
Takashi
On Thu, 09 Aug 2007 19:21:44 +0200 Takashi Iwai tiwai@suse.de wrote:
At Thu, 9 Aug 2007 19:06:43 +0200, Krzysztof Helt wrote:
obj-$(CONFIG_SND_AD1848) += snd-ad1848.o snd-ad1848-lib.o
This line should contain only snd-ad1848.o.
ok.
-obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-ad1848-lib.o +obj-$(CONFIG_SND_AD1848_LIB) += snd-ad1848-lib.o
obj-m := $(sort $(obj-m))
Oh, this sort is also superfluous.
There need similar cleanups in other isa/* directories. Care to create a patch including them?
Should this be one patch for all isa libs or each one in the separate patch?
Regards, Krzysztof
At Thu, 9 Aug 2007 20:03:22 +0200, Krzysztof Helt wrote:
On Thu, 09 Aug 2007 19:21:44 +0200 Takashi Iwai tiwai@suse.de wrote:
At Thu, 9 Aug 2007 19:06:43 +0200, Krzysztof Helt wrote:
obj-$(CONFIG_SND_AD1848) += snd-ad1848.o snd-ad1848-lib.o
This line should contain only snd-ad1848.o.
ok.
-obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-ad1848-lib.o +obj-$(CONFIG_SND_AD1848_LIB) += snd-ad1848-lib.o
obj-m := $(sort $(obj-m))
Oh, this sort is also superfluous.
There need similar cleanups in other isa/* directories. Care to create a patch including them?
Should this be one patch for all isa libs or each one in the separate patch?
It doesn't matter, but I think it's OK to put in a single patch. It won't be so big.
thanks,
Takashi
From: Krzysztof Helt krzysztof.h1@wp.pl
This patch uses the Kconfig parameters SND_AD1848_LIB and SND_CS4231_LIB instead of mentioning each driver that requires the ad1848-lib or cs4231-lib separately in the Makefiles.
Signed-off-by: Krzysztof Helt krzysztof.h1@wp.pl ---
This is short enough to do both libraries in one patch.
diff -urp linux-2.6.22.new/sound/isa/ad1848/Makefile linux-2.6.23/sound/isa/ad1848/Makefile --- linux-2.6.22.new/sound/isa/ad1848/Makefile 2007-07-09 01:32:17.000000000 +0200 +++ linux-2.6.23/sound/isa/ad1848/Makefile 2007-08-09 22:24:30.863357129 +0200 @@ -7,9 +7,6 @@ snd-ad1848-lib-objs := ad1848_lib.o snd-ad1848-objs := ad1848.o
# Toplevel Module Dependency -obj-$(CONFIG_SND_CMI8330) += snd-ad1848-lib.o -obj-$(CONFIG_SND_SGALAXY) += snd-ad1848-lib.o -obj-$(CONFIG_SND_AD1848) += snd-ad1848.o snd-ad1848-lib.o -obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-ad1848-lib.o +obj-$(CONFIG_SND_AD1848) += snd-ad1848.o +obj-$(CONFIG_SND_AD1848_LIB) += snd-ad1848-lib.o
-obj-m := $(sort $(obj-m)) diff -urp linux-2.6.22.new/sound/isa/cs423x/Makefile linux-2.6.23/sound/isa/cs423x/Makefile --- linux-2.6.22.new/sound/isa/cs423x/Makefile 2007-07-09 01:32:17.000000000 +0200 +++ linux-2.6.23/sound/isa/cs423x/Makefile 2007-08-09 22:25:32.794886405 +0200 @@ -10,17 +10,8 @@ snd-cs4232-objs := cs4232.o snd-cs4236-objs := cs4236.o
# Toplevel Module Dependency -obj-$(CONFIG_SND_AZT2320) += snd-cs4231-lib.o -obj-$(CONFIG_SND_MIRO) += snd-cs4231-lib.o -obj-$(CONFIG_SND_OPL3SA2) += snd-cs4231-lib.o -obj-$(CONFIG_SND_CS4231) += snd-cs4231.o snd-cs4231-lib.o -obj-$(CONFIG_SND_CS4232) += snd-cs4232.o snd-cs4231-lib.o -obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o snd-cs4231-lib.o -obj-$(CONFIG_SND_GUSMAX) += snd-cs4231-lib.o -obj-$(CONFIG_SND_INTERWAVE) += snd-cs4231-lib.o -obj-$(CONFIG_SND_INTERWAVE_STB) += snd-cs4231-lib.o -obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-cs4231-lib.o -obj-$(CONFIG_SND_WAVEFRONT) += snd-cs4231-lib.o -obj-$(CONFIG_SND_SSCAPE) += snd-cs4231-lib.o +obj-$(CONFIG_SND_CS4231_LIB) += snd-cs4231-lib.o +obj-$(CONFIG_SND_CS4231) += snd-cs4231.o +obj-$(CONFIG_SND_CS4232) += snd-cs4232.o +obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o
-obj-m := $(sort $(obj-m))
At Thu, 9 Aug 2007 22:36:29 +0200, Krzysztof Helt wrote:
From: Krzysztof Helt krzysztof.h1@wp.pl
This patch uses the Kconfig parameters SND_AD1848_LIB and SND_CS4231_LIB instead of mentioning each driver that requires the ad1848-lib or cs4231-lib separately in the Makefiles.
Signed-off-by: Krzysztof Helt krzysztof.h1@wp.pl
Thanks, applied to ALSA tree now.
Takashi
participants (2)
-
Krzysztof Helt -
Takashi Iwai