ALSA: usb-audio: refactor code

[safe/jmp/linux-2.6] / sound / usb / Makefile

diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 2c1dc11..0758d8d 100644 (file)
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -2,11 +2,23 @@
 # Makefile for ALSA
 #
 
-snd-usb-audio-objs := usbaudio.o usbmixer.o
-snd-usb-lib-objs := usbmidi.o
+snd-usb-audio-objs :=  card.o \
+                       usbmixer.o \
+                       proc.o \
+                       quirks.o \
+                       format.o \
+                       endpoint.o \
+                       urb.o \
+                       pcm.o \
+                       helper.o
+
+snd-usbmidi-lib-objs := midi.o
 
 # Toplevel Module Dependency
-obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usb-lib.o
-obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-lib.o
+obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usbmidi-lib.o
+
+obj-$(CONFIG_SND_USB_UA101) += snd-usbmidi-lib.o
+obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o
+obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o
 
-obj-$(CONFIG_SND) += usx2y/
+obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/