Update of /cvsroot/alsa/alsa-driver/usb
In directory sc8-pr-cvs1:/tmp/cvs-serv1156/usb
Modified Files:
.cvsignore Makefile usbaudio.inc usbmidi.c usbmixer.c
Log Message:
- fixed --with-isapnp option of configure.
- changed (added) to build / install for 2.6 kernels.
with this change, you cannot run make in the local directory any more
unless you set SND_TOPDIR environment variable. it points to the path
name of the top directory of alsa-driver directory.
Index: .cvsignore
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/usb/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1 Jun 2003 18:37:45 -0000 1.2
+++ .cvsignore 10 Nov 2003 17:32:44 -0000 1.3
@@ -1,2 +1,5 @@
.depend
usbaudio.c
+.*.cmd
+*.ko
+*.mod.c
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/usb/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile 24 Sep 2003 16:45:10 -0000 1.10
+++ Makefile 10 Nov 2003 17:32:44 -0000 1.11
@@ -1,24 +1,19 @@
-TOPDIR = ..
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
-include $(TOPDIR)/toplevel.config
-include $(TOPDIR)/Makefile.conf
-
-EXTRA_CLEAN = usbaudio.c
+clean-files := usbaudio.c
# for compatibility
extra-snd-usb-audio-objs := usbcompat.o
-extra-subdir-y := us428
-extra-subdir-m := $(extra-subdir-y)
+obj-$(CONFIG_SND) += us428/
export-objs := usbaudio.o usbmidi.o
-TOPDIR = $(MAINSRCDIR)
-
-include $(TOPDIR)/alsa-kernel/usb/Makefile
+include $(SND_TOPDIR)/alsa-kernel/usb/Makefile
-EXTRA_CFLAGS = -I$(TOPDIR)/alsa-kernel/usb
+EXTRA_CFLAGS += -I$(SND_TOPDIR)/alsa-kernel/usb
-include $(TOPDIR)/Rules.make
+include $(SND_TOPDIR)/Rules.make
-usbaudio.c: usbaudio.patch usbaudio.inc usbaudio.inc1
$(TOPDIR)/alsa-kernel/usb/usbaudio.c
+usbaudio.c: usbaudio.patch usbaudio.inc usbaudio.inc1
$(SND_TOPDIR)/alsa-kernel/usb/usbaudio.c
Index: usbaudio.inc
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/usb/usbaudio.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- usbaudio.inc 20 Aug 2003 09:59:59 -0000 1.2
+++ usbaudio.inc 10 Nov 2003 17:32:44 -0000 1.3
@@ -1,6 +1,11 @@
+#include <linux/config.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#define SND_NEED_USB_WRAPPER
#include <sound/driver.h>
#include <linux/usb.h>
+#endif
#ifdef OLD_USB
#define snd_usb_complete_callback(x) __old_ ## x
Index: usbmidi.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/usb/usbmidi.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- usbmidi.c 8 Sep 2003 10:57:41 -0000 1.10
+++ usbmidi.c 10 Nov 2003 17:32:45 -0000 1.11
@@ -1,7 +1,12 @@
+#include <linux/config.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#define SND_NEED_USB_WRAPPER
#define __NO_VERSION__
#include <sound/driver.h>
#include <linux/usb.h>
+#endif
#ifdef OLD_USB
#define snd_usb_complete_callback(x) __old_ ## x
Index: usbmixer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/usb/usbmixer.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- usbmixer.c 22 Oct 2002 10:15:37 -0000 1.7
+++ usbmixer.c 10 Nov 2003 17:32:45 -0000 1.8
@@ -1,3 +1,8 @@
+#include <linux/config.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#define SND_NEED_USB_WRAPPER
#define __NO_VERSION__
+#endif
#include "../alsa-kernel/usb/usbmixer.c"
-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
