Skip to content

Commit 3983f7b

Browse files
committed
ALSA: core: Use *-y instead of *-objs in Makefile
*-objs suffix is reserved rather for (user-space) host programs while usually *-y suffix is used for kernel drivers (although *-objs works for that purpose for now). Let's correct the old usages of *-objs in Makefiles. Signed-off-by: Takashi Iwai <tiwai@suse.de> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Jaroslav Kysela <perex@perex.cz> Link: https://lore.kernel.org/r/20240507135513.14919-2-tiwai@suse.de
1 parent 21a522f commit 3983f7b

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

sound/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ ifeq ($(CONFIG_SND),y)
1717
obj-y += last.o
1818
endif
1919

20-
soundcore-objs := sound_core.o
20+
soundcore-y := sound_core.o

sound/core/Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ snd-pcm-$(CONFIG_SND_PCM_IEC958) += pcm_iec958.o
2424
CFLAGS_pcm_lib.o := -I$(src)
2525
CFLAGS_pcm_native.o := -I$(src)
2626

27-
snd-pcm-dmaengine-objs := pcm_dmaengine.o
27+
snd-pcm-dmaengine-y := pcm_dmaengine.o
2828

29-
snd-ctl-led-objs := control_led.o
30-
snd-rawmidi-objs := rawmidi.o
31-
snd-ump-objs := ump.o
29+
snd-ctl-led-y := control_led.o
30+
snd-rawmidi-y := rawmidi.o
31+
snd-ump-y := ump.o
3232
snd-ump-$(CONFIG_SND_UMP_LEGACY_RAWMIDI) += ump_convert.o
33-
snd-timer-objs := timer.o
34-
snd-hrtimer-objs := hrtimer.o
35-
snd-hwdep-objs := hwdep.o
36-
snd-seq-device-objs := seq_device.o
33+
snd-timer-y := timer.o
34+
snd-hrtimer-y := hrtimer.o
35+
snd-hwdep-y := hwdep.o
36+
snd-seq-device-y := seq_device.o
3737

38-
snd-compress-objs := compress_offload.o
38+
snd-compress-y := compress_offload.o
3939

4040
obj-$(CONFIG_SND) += snd.o
4141
obj-$(CONFIG_SND_CTL_LED) += snd-ctl-led.o

sound/core/oss/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
55
#
66

7-
snd-mixer-oss-objs := mixer_oss.o
7+
snd-mixer-oss-y := mixer_oss.o
88

99
snd-pcm-oss-y := pcm_oss.o
1010
snd-pcm-oss-$(CONFIG_SND_PCM_OSS_PLUGINS) += pcm_plugin.o \

sound/core/seq/Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
55
#
66

7-
snd-seq-objs := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \
7+
snd-seq-y := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \
88
seq_fifo.o seq_prioq.o seq_timer.o \
99
seq_system.o seq_ports.o
1010
snd-seq-$(CONFIG_SND_PROC_FS) += seq_info.o
1111
snd-seq-$(CONFIG_SND_SEQ_UMP) += seq_ump_convert.o
12-
snd-seq-midi-objs := seq_midi.o
13-
snd-seq-midi-emul-objs := seq_midi_emul.o
14-
snd-seq-midi-event-objs := seq_midi_event.o
15-
snd-seq-dummy-objs := seq_dummy.o
16-
snd-seq-virmidi-objs := seq_virmidi.o
17-
snd-seq-ump-client-objs := seq_ump_client.o
12+
snd-seq-midi-y := seq_midi.o
13+
snd-seq-midi-emul-y := seq_midi_emul.o
14+
snd-seq-midi-event-y := seq_midi_event.o
15+
snd-seq-dummy-y := seq_dummy.o
16+
snd-seq-virmidi-y := seq_virmidi.o
17+
snd-seq-ump-client-y := seq_ump_client.o
1818

1919
obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o
2020
obj-$(CONFIG_SND_SEQUENCER_OSS) += oss/

sound/core/seq/oss/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
55
#
66

7-
snd-seq-oss-objs := seq_oss.o seq_oss_init.o seq_oss_timer.o seq_oss_ioctl.o \
7+
snd-seq-oss-y := seq_oss.o seq_oss_init.o seq_oss_timer.o seq_oss_ioctl.o \
88
seq_oss_event.o seq_oss_rw.o seq_oss_synth.o \
99
seq_oss_midi.o seq_oss_readq.o seq_oss_writeq.o
1010

0 commit comments

Comments
 (0)