Update of /cvsroot/alsa/alsa-driver/acore
In directory sc8-pr-cvs1:/tmp/cvs-serv1156/acore
Modified Files:
.cvsignore Makefile memalloc.inc memory_wrapper.c sgbuf.c
wrappers.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/acore/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 31 May 2003 11:09:05 -0000 1.3
+++ .cvsignore 10 Nov 2003 17:32:37 -0000 1.4
@@ -8,3 +8,6 @@
pcm_native.c
info.c
memalloc.c
+.*.cmd
+*.ko
+*.mod.c
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile 31 Oct 2003 11:38:38 -0000 1.30
+++ Makefile 10 Nov 2003 17:32:37 -0000 1.31
@@ -1,9 +1,7 @@
-TOPDIR = ..
+include $(SND_TOPDIR)/toplevel.config
+include $(SND_TOPDIR)/Makefile.conf
-include $(TOPDIR)/toplevel.config
-include $(TOPDIR)/Makefile.conf
-
-EXTRA_CLEAN = info.c pcm_native.c control.c hwdep.c init.c rawmidi.c sound.c timer.c
memalloc.c
+clean-files := info.c pcm_native.c control.c hwdep.c init.c rawmidi.c sound.c timer.c
memalloc.c
obj-$(CONFIG_SND_PDPLUS) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
obj-$(CONFIG_SND_MIXART) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-hwdep.o
@@ -15,20 +13,18 @@
obj-$(CONFIG_SND_AU8830) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
snd-rawmidi.o snd-hwdep.o
export-objs := sound.o pcm.o pcm_lib.o rawmidi.o timer.o hwdep.o memalloc.o
-
-TOPDIR = $(MAINSRCDIR)
-include $(TOPDIR)/alsa-kernel/core/Makefile
+include $(SND_TOPDIR)/alsa-kernel/core/Makefile
snd-page-alloc-objs += memory_wrapper.o
-include $(TOPDIR)/Rules.make
+include $(SND_TOPDIR)/Rules.make
-info.c: info.inc info.patch $(TOPDIR)/alsa-kernel/core/info.c
-pcm_native.c: pcm_native.patch $(TOPDIR)/alsa-kernel/core/pcm_native.c
-control.c: control.patch $(TOPDIR)/alsa-kernel/core/control.c
-hwdep.c: hwdep.patch $(TOPDIR)/alsa-kernel/core/hwdep.c
-init.c: init.patch $(TOPDIR)/alsa-kernel/core/init.c
-rawmidi.c: rawmidi.patch $(TOPDIR)/alsa-kernel/core/rawmidi.c
-sound.c: sound.patch $(TOPDIR)/alsa-kernel/core/sound.c
-timer.c: timer.patch $(TOPDIR)/alsa-kernel/core/timer.c
-memalloc.c: memalloc.patch memalloc.inc memalloc.inc1
$(TOPDIR)/alsa-kernel/core/memalloc.c
+info.c: info.inc info.patch $(SND_TOPDIR)/alsa-kernel/core/info.c
+pcm_native.c: pcm_native.patch $(SND_TOPDIR)/alsa-kernel/core/pcm_native.c
+control.c: control.patch $(SND_TOPDIR)/alsa-kernel/core/control.c
+hwdep.c: hwdep.patch $(SND_TOPDIR)/alsa-kernel/core/hwdep.c
+init.c: init.patch $(SND_TOPDIR)/alsa-kernel/core/init.c
+rawmidi.c: rawmidi.patch $(SND_TOPDIR)/alsa-kernel/core/rawmidi.c
+sound.c: sound.patch $(SND_TOPDIR)/alsa-kernel/core/sound.c
+timer.c: timer.patch $(SND_TOPDIR)/alsa-kernel/core/timer.c
+memalloc.c: memalloc.patch memalloc.inc memalloc.inc1
$(SND_TOPDIR)/alsa-kernel/core/memalloc.c
Index: memalloc.inc
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/memalloc.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memalloc.inc 31 May 2003 11:09:05 -0000 1.1
+++ memalloc.inc 10 Nov 2003 17:32:37 -0000 1.2
@@ -1,10 +1,12 @@
#include <linux/config.h>
#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#if defined(CONFIG_MODVERSIONS) && !defined(__GENKSYMS__) && !defined(__DEPEND__)
#define MODVERSIONS
#include <linux/modversions.h>
#include "sndversions.h"
+#endif
#endif
#include "config.h"
Index: memory_wrapper.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/memory_wrapper.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- memory_wrapper.c 10 Oct 2003 15:29:26 -0000 1.9
+++ memory_wrapper.c 10 Nov 2003 17:32:37 -0000 1.10
@@ -2,10 +2,12 @@
#include <linux/config.h>
#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#if defined(CONFIG_MODVERSIONS) && !defined(__GENKSYMS__) && !defined(__DEPEND__)
#define MODVERSIONS
#include <linux/modversions.h>
#include "sndversions.h"
+#endif
#endif
#include "config.h"
Index: sgbuf.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/sgbuf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sgbuf.c 5 Mar 2003 11:36:39 -0000 1.4
+++ sgbuf.c 10 Nov 2003 17:32:37 -0000 1.5
@@ -2,10 +2,12 @@
#include <linux/config.h>
#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#if defined(CONFIG_MODVERSIONS) && !defined(__GENKSYMS__) && !defined(__DEPEND__)
#define MODVERSIONS
#include <linux/modversions.h>
#include "sndversions.h"
+#endif
#endif
#include "config.h"
Index: wrappers.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/wrappers.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wrappers.c 14 Jul 2003 07:57:30 -0000 1.20
+++ wrappers.c 10 Nov 2003 17:32:37 -0000 1.21
@@ -4,10 +4,12 @@
#include <linux/version.h>
#include <linux/config.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#if defined(CONFIG_MODVERSIONS) && !defined(__GENKSYMS__) && !defined(__DEPEND__)
#define MODVERSIONS
#include <linux/modversions.h>
#include "sndversions.h"
+#endif
#endif
#include <linux/kmod.h>
-------------------------------------------------------
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
