Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9423
Modified Files:
Makefile.conf.in Rules.make configure.in
Log Message:
- fixed the build 2.6 kernel without SMP and without sequencer support.
Index: Makefile.conf.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Makefile.conf.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- Makefile.conf.in 28 Jan 2004 18:43:14 -0000 1.59
+++ Makefile.conf.in 30 Jan 2004 11:44:58 -0000 1.60
@@ -79,7 +79,7 @@
CONFIG_VIDEO_DEV = @CONFIG_VIDEO_DEV@
ifndef NEW_KBUILD
-INCLUDE = -I$(TOPDIR)/include @EXTRA_INCLUDES@
-I$(CONFIG_SND_KERNELDIR)/include
+INCLUDE = -I$(TOPDIR)/include @EXTRA_INCLUDES@ @KERNEL_INC@
CFLAGS = $(MODFLAGS) $(INCLUDE) $(c_opts) -Wall -Wstrict-prototypes \
-fomit-frame-pointer -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common \
-pipe -DALSA_BUILD -nostdinc -iwithprefix include
Index: Rules.make
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Rules.make,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Rules.make 26 Jan 2004 11:08:48 -0000 1.37
+++ Rules.make 30 Jan 2004 11:44:58 -0000 1.38
@@ -17,8 +17,9 @@
# apply patches beforehand
prepare: $(clean-files)
@for d in $(patsubst %/,%,$(filter %/, $(obj-y))) \
- $(patsubst %/,%,$(filter %/, $(obj-m))); do \
- $(MAKE) -C $$d prepare; \
+ $(patsubst %/,%,$(filter %/, $(obj-m))) DUMMY; do \
+ echo $$d; \
+ if [ $$d != DUMMY ]; then $(MAKE) -C $$d prepare; fi; \
done
ALL_MOBJS := $(filter-out $(obj-y), $(obj-m))
@@ -29,8 +30,8 @@
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; \
+ $(patsubst %/,%,$(filter %/, $(obj-m))) DUMMY; do \
+ if [ $$d != DUMMY ]; then $(MAKE) -C $$d modules_install; fi; \
done
else
Index: configure.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- configure.in 28 Jan 2004 18:43:15 -0000 1.217
+++ configure.in 30 Jan 2004 11:44:58 -0000 1.218
@@ -86,8 +86,9 @@
EOF
exit 1
fi
+KERNEL_INC="-I$CONFIG_SND_KERNELDIR/include"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_CACHE_VAL(kaversion,
[AC_TRY_RUN([
#include <stdio.h>
@@ -153,7 +154,7 @@
dnl Check for GCC version...
AC_MSG_CHECKING(for GCC version)
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_CACHE_VAL(kernel_gcc,
[AC_TRY_RUN([
#include <stdio.h>
@@ -341,7 +342,7 @@
boolvar="$1"
AC_MSG_CHECKING(for $2)
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
AC_TRY_RUN([
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
@@ -367,7 +368,7 @@
boolvar1="$1_MODULE"
AC_MSG_CHECKING(for $2)
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
AC_TRY_RUN([
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
@@ -571,7 +572,7 @@
processor=""
rm -f processor.id
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_TRY_RUN([
#include <stdio.h>
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
@@ -886,7 +887,7 @@
machine=`cat machine.id`;AC_MSG_RESULT($machine))
CFLAGS="$ac_save_CFLAGS"
rm -f machine.id
- c_opts="$c_opts -I\$(CONFIG_SND_KERNELDIR)/include/asm-i386/mach-$machine"
+ KERNEL_INC="$KERNEL_INC
-I\$(CONFIG_SND_KERNELDIR)/include/asm-i386/mach-$machine"
fi
;;
esac
@@ -997,7 +998,7 @@
AC_MSG_CHECKING(for strlcpy)
strlcpy="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="-Wall -Werror $CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="-Wall -Werror $CFLAGS $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1022,7 +1023,7 @@
AC_MSG_CHECKING(for snprintf)
snprintf="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="-Wall -Werror $CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="-Wall -Werror $CFLAGS $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1046,7 +1047,7 @@
AC_MSG_CHECKING(for vmalloc_to_page)
vmalloc_to_page="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1071,7 +1072,7 @@
AC_MSG_CHECKING(for old kmod)
old_kmod="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS -Wall $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1094,7 +1095,7 @@
AC_MSG_CHECKING(for PDE)
pde_defined="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS -Wall $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1119,7 +1120,7 @@
AC_MSG_CHECKING(for pci_set_consistent_dma_mask)
pci_consistent_defined="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS -Wall $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1142,7 +1143,7 @@
AC_MSG_CHECKING(for tty->count is the atomic type)
tty_count_atomic="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS -Wall $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1168,7 +1169,7 @@
AC_MSG_CHECKING(for old kill_fasync)
oldkfasync="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1196,7 +1197,7 @@
AC_MSG_CHECKING(for dma_addr_t)
dma_addr_t="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1219,7 +1220,7 @@
AC_MSG_CHECKING(for MUTEX macros)
have_mutex_macros="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1323,7 +1324,7 @@
AC_MSG_CHECKING(for RTC callback support in kernel)
rtcsup="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_TRY_RUN([
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
#if defined(__alpha__) || (!defined(CONFIG_RTC) && !defined(CONFIG_RTC_MODULE))
@@ -1411,6 +1412,7 @@
AC_SUBST(m_opts)
AC_SUBST(GENKSYMS)
AC_SUBST(EXTRA_INCLUDES)
+AC_SUBST(KERNEL_INC)
dnl Output files...
AC_OUTPUT(version Makefile.conf snddevices \
@@ -1424,6 +1426,7 @@
if test "$CONFIG_SND_MODULE" = y; then
echo "Hacking autoconf.h..."
rm -f include/linux/autoconf.h
+ mkdir -p include/linux
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
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
