Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1:/tmp/cvs-serv1156
Modified Files:
INSTALL Makefile Makefile.conf.in Rules.make configure.in
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: INSTALL
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/INSTALL,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- INSTALL 30 Oct 2003 11:31:43 -0000 1.148
+++ INSTALL 10 Nov 2003 17:32:36 -0000 1.149
@@ -35,14 +35,14 @@
(for example from distributor makers) can be unuseable for this action.
2) You must turn on sound support (soundcore module).
3) Run './configure' script.
- If you have ISA Plug & Play soundcard, use --with-isapnp=yes switch.
+ If you do not want ISA PnP support, use --with-isapnp=no switch.
If you want sequencer support, use --with-sequencer=yes switch.
If you do not want OSS/Free emulation, use --with-oss=no switch.
If you want turn on debug mode use --with-debug=full switch.
If you want debug soundcard detection try --with-debug=detect switch.
If you have kernel source code in another directory than /usr/src/linux,
use --with-kernel=<kernel_directory>.
- Example: ./configure --with-isapnp=yes --with-debug=full
+ Example: ./configure --with-debug=full
4) Run 'make'.
5) Run 'make install'.
6) Run the './snddevices' script to create new sound devices in /dev directory.
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Makefile,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- Makefile 29 Oct 2003 13:37:17 -0000 1.98
+++ Makefile 10 Nov 2003 17:32:37 -0000 1.99
@@ -3,7 +3,6 @@
# Copyright (c) 1994-98 by Jaroslav Kysela <[EMAIL PROTECTED]>
#
-TOPDIR = .
ALSAKERNELDIR = ../alsa-kernel
ifndef IGROUP
@@ -24,6 +23,9 @@
@echo
endif
+SND_TOPDIR = $(MAINSRCDIR)
+export SND_TOPDIR
+
ifeq (,$(wildcard acinclude.m4))
.PHONY: dummy2
dummy2:
@@ -33,9 +35,13 @@
@echo
endif
-SUBDIRS = support acore i2c drivers isa synth
+SUBDIRS = acore i2c drivers isa synth
CSUBDIRS =
+ifndef NEW_KBUILD
+SUBDIRS += support
+endif
+
ifeq (y,$(CONFIG_PCI))
SUBDIRS += pci
endif
@@ -92,14 +98,22 @@
.PHONY: compile
compile: include/sound/version.h include/sndversions.h
+ifdef NEW_KBUILD
+ @for d in $(SUBDIRS); do if ! $(MAKE) -C $(CONFIG_SND_KERNELDIR)
SUBDIRS=$(MAINSRCDIR)/$$d modules; then exit 1; fi; done
+else
@for d in $(SUBDIRS); do if ! $(MAKE) -C $$d; then exit 1; fi; done
+endif
@echo
@echo "ALSA modules were successfully compiled."
@echo
.PHONY: dep
dep: include/sound/version.h
+ifdef NEW_KBUILD
+ @for d in $(SUBDIRS); do if ! $(MAKE) -C $$d prepare; then exit 1; fi; done
+else
@for d in $(SUBDIRS); do if ! $(MAKE) -C $$d fastdep; then exit 1; fi; done
+endif
.PHONY: map
map:
@@ -137,7 +151,7 @@
ifeq ($(moddir_tree),y)
rm -rf $(DESTDIR)$(moddir)
else
- rm -f $(DESTDIR)$(moddir)/snd*.o $(DESTDIR)$(moddir)/persist.o
$(DESTDIR)$(moddir)/isapnp.o
+ rm -f $(DESTDIR)$(moddir)/snd*.*o $(DESTDIR)$(moddir)/persist.o
$(DESTDIR)$(moddir)/isapnp.o
endif
@for d in $(SUBDIRS); do if ! $(MAKE) -C $$d modules_install; then exit 1; fi;
done
ifeq ($(DESTDIR),)
@@ -178,7 +192,12 @@
.PHONY: clean
clean: clean1
+ifdef NEW_KBUILD
+ find . \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' -o -name '.*.d' -o
-name '.*.tmp' -o -name '*.mod.c' \) -type f -print | xargs rm -f
+ @for d in $(SUBDIRS); do if ! $(MAKE) -C $(CONFIG_SND_KERNELDIR)
SUBDIRS=$(MAINSRCDIR)/$$d clean; then exit 1; fi; done
+else
@for d in $(SUBDIRS); do if ! $(MAKE) -C $$d clean; then exit 1; fi; done
+endif
@for d in $(CSUBDIRS); do if ! $(MAKE) -C $$d clean; then exit 1; fi; done
.PHONY: mrproper
Index: Makefile.conf.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Makefile.conf.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Makefile.conf.in 22 Oct 2003 14:23:59 -0000 1.54
+++ Makefile.conf.in 10 Nov 2003 17:32:37 -0000 1.55
@@ -3,7 +3,13 @@
# Copyright (c) 1994-98 by Jaroslav Kysela <[EMAIL PROTECTED]>
#
+NEW_KBUILD = @NEW_KBUILD@
+
+mainsrcdir = @srcdir@
+MAINSRCDIR = @SRCDIR@
+
CROSS_COMPILE ?= @CROSS_COMPILE@
+ifndef NEW_KBUILD
AS = $(CROSS_COMPILE)@AS@
LD = $(CROSS_COMPILE)@LD@
CC = $(CROSS_COMPILE)@CC@
@@ -12,9 +18,8 @@
MODFLAGS = -DMODULE=1
CFLAGS_KERNEL =
GENKSYMS = @GENKSYMS@
+endif
-mainsrcdir = @srcdir@
-MAINSRCDIR = @SRCDIR@
prefix = @prefix@
exec_prefix = @exec_prefix@
sysconfdir = @sysconfdir@
@@ -71,6 +76,7 @@
CONFIG_USB = @CONFIG_USB@
CONFIG_SND_BIT32_EMUL = @CONFIG_SND_BIT32_EMUL@
+ifndef NEW_KBUILD
INCLUDE = -I$(TOPDIR)/include @EXTRA_INCLUDES@
-I$(CONFIG_SND_KERNELDIR)/include
CFLAGS = $(MODFLAGS) $(INCLUDE) $(c_opts) -Wall -Wstrict-prototypes \
-fomit-frame-pointer -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common \
@@ -78,3 +84,9 @@
MAKE += $(m_opts)
SNDVERSIONS = $(TOPDIR)/include/sndversions.h
DEXPORT = $(TOPDIR)/include/modules
+else
+EXTRA_CFLAGS += -I$(MAINSRCDIR)/include -Iinclude -DALSA_BUILD
+CPPFLAGS := $(subst -Iinclude,,$(CPPFLAGS))
+CFLAGS := $(subst -Iinclude,,$(CFLAGS))
+endif
+
Index: Rules.make
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Rules.make,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Rules.make 22 Oct 2003 14:25:06 -0000 1.33
+++ Rules.make 10 Nov 2003 17:32:37 -0000 1.34
@@ -6,6 +6,37 @@
MODCURDIR = $(subst $(MAINSRCDIR)/,,$(shell /bin/pwd))
+ifdef NEW_KBUILD
+
+# clean obsolete definitions
+export-objs :=
+
+%.c: %.patch
+ @$(SND_TOPDIR)/utils/patch-alsa $@
+
+# apply patches beforehand
+prepare: $(clean-files)
+ @for d in $(patsubst %/,%,$(filter %/, $(obj-y))) \
+ $(patsubst %/,%,$(filter %/, $(obj-m))); do \
+ $(MAKE) -C $$d prepare; \
+ done
+
+ALL_MOBJS := $(filter-out $(obj-y), $(obj-m))
+ALL_MOBJS := $(filter-out %/, $(ALL_MOBJS))
+modules_install:
+ifneq "$(strip $(ALL_MOBJS))" ""
+ mkdir -p $(DESTDIR)$(moddir)/$(MODCURDIR)
+ cp $(ALL_MOBJS:.o=.ko) $(DESTDIR)$(moddir)/$(MODCURDIR)
+endif
+ @for d in $(patsubst %/,%,$(filter %/, $(obj-y))) \
+ $(patsubst %/,%,$(filter %/, $(obj-m))); do \
+ $(MAKE) -C $$d modules_install; \
+ done
+
+else
+
+TOPDIR = $(SND_TOPDIR)
+
comma = ,
#
@@ -312,7 +343,7 @@
.PHONY: clean1
clean1:
- rm -f .depend *.o *.isapnp $(EXTRA_CLEAN)
+ rm -f .depend *.o *.isapnp $(clean-files)
.PHONY: clean
clean: $(patsubst %,_sfclean_%,$(ALL_SUB_DIRS)) clean1
@@ -341,3 +372,5 @@
ifneq ($(wildcard $(TOPDIR)/.hdepend),)
include $(TOPDIR)/.hdepend
endif
+
+endif # NEW_BUILD
Index: configure.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- configure.in 31 Oct 2003 11:38:14 -0000 1.199
+++ configure.in 10 Nov 2003 17:32:37 -0000 1.200
@@ -19,7 +19,7 @@
dnl Checks for header files.
AC_HEADER_STDC
-AC_CONFIG_HEADER(include/config.h include/config1.h include/version.h)
+AC_CONFIG_HEADER(include/config.h include/config1.h include/version.h
include/autoconf-extra.h)
dnl AC_CHECK_HEADERS(linux/fs.h)
dnl Checks for typedefs, structures, and compiler characteristics.
@@ -361,6 +361,19 @@
eval $boolvar="$boolchk"
])
+if test "$kversion.$kpatchlevel" = "2.6"; then
+ NEW_KBUILD=y
+ AC_SUBST(NEW_KBUILD)
+fi
+
+dnl Check builtin ALSA on 2.6 kernel
+CHECK_KERNEL_CONFIG(CONFIG_SND, [built-in ALSA])
+if test "$CONFIG_SND" = "y"; then
+ AC_MSG_ERROR(You have built-in ALSA in your kernel.)
+fi
+CHECK_KERNEL_CONFIG(CONFIG_SND_MODULE, [existing ALSA module])
+test "$CONFIG_SND_MODULE" = "y" && AC_DEFINE(CONFIG_SND_MODULE)
+
dnl Check kernel headers for 2.2
MODIFY_KERNEL_HEADER(linux/kmod.h, __LINUX_KMOD_H__)
CHECK_KERNEL_HEADER(linux/compiler.h)
@@ -892,18 +905,26 @@
CHECK_KERNEL_CONFIG(CONFIG_ISAPNP, [Kernel ISA-PnP support])
if test "$CONFIG_ISAPNP" != "y"; then
CHECK_KERNEL_CONFIG(CONFIG_ISAPNP_MODULE, [Kernel ISA-PnP module support])
- if test "$CONFIG_ISAPNP_MODULE" = "y"; then
- CONFIG_ISAPNP=y
- fi
fi
-else
- AC_MSG_CHECKING(for ISA PnP support)
- AC_ARG_WITH(isapnp,
- [ --with-isapnp=yes,no,auto driver will (not) be compiled with ISA PnP support],
- pnp="$withval", pnp="yes")
- if test "$pnp" = "auto"; then
- if test -f /proc/isapnp; then
- pnp=yes
+fi
+
+dnl Check for ALSA's own isapnp support
+dnl available only when pnp is not built in the kernel
+if test "$CONFIG_PNP_KERNEL" != y; then
+ if test "$CONFIG_ISAPNP_KERNEL" != y; then
+ isapnp_choose=y
+ elif test "$CONFIG_ISAPNP" = y -o "$CONFIG_ISAPNP_MODULE" = y; then
+ isapnp_choose=y
+ fi
+ if test "$isapnp_choose" = y; then
+ AC_MSG_CHECKING(for ISA PnP support)
+ AC_ARG_WITH(isapnp,
+ [ --with-isapnp=yes,no,auto driver will (not) be compiled with ISA PnP
support],
+ pnp="$withval", pnp="yes")
+ if test "$pnp" = "auto"; then
+ if test -f /proc/isapnp; then
+ pnp=yes
+ fi
fi
fi
if test "$pnp" = "yes"; then
@@ -1173,7 +1194,7 @@
fi
AC_SUBST(CONFIG_SND_SEQUENCER)
if test "$CONFIG_SND_SEQUENCER" = "m"; then
- AC_DEFINE(CONFIG_SND_SEQUENCER)
+ AC_DEFINE(CONFIG_SND_SEQUENCER_MODULE)
AC_DEFINE(CONFIG_SND_SEQ_DUMMY_MODULE)
AC_MSG_RESULT(yes)
else
@@ -1192,8 +1213,8 @@
AC_SUBST(CONFIG_SND_OSSEMUL)
if test "$CONFIG_SND_OSSEMUL" = "y"; then
AC_DEFINE(CONFIG_SND_OSSEMUL)
- AC_DEFINE(CONFIG_SND_MIXER_OSS)
- AC_DEFINE(CONFIG_SND_PCM_OSS)
+ AC_DEFINE(CONFIG_SND_MIXER_OSS_MODULE)
+ AC_DEFINE(CONFIG_SND_PCM_OSS_MODULE)
if test "$CONFIG_SND_SEQUENCER" = "m"; then
AC_DEFINE(CONFIG_SND_SEQUENCER_OSS)
fi
@@ -1300,3 +1321,14 @@
dnl Make right rights for scripts
chmod 755 $srcdir/snddevices
+
+dnl Hack autoconf.h if necessary
+if test "$CONFIG_SND_MODULE" = y; then
+ echo "Hacking autoconf.h..."
+ rm -f include/linux/autoconf.h
+ grep -v CONFIG_SND_ $CONFIG_SND_KERNELDIR/include/linux/autoconf.h >
include/linux/autoconf.h
+ cat include/autoconf-extra.h >> include/linux/autoconf.h
+ cat include/config1.h >> include/linux/autoconf.h
+else
+ rm -f include/linux/autoconf.h
+fi
-------------------------------------------------------
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
