Beginnings of support for kbuild with recent 2.6 kernels.

diff --git a/comedi/Kbuild b/comedi/Kbuild
new file mode 100644 (file)
index 0000000..2a673d3
--- /dev/null
+++ b/comedi/Kbuild
@@ -0,0 +1,9 @@
+
+obj-m += comedi.o
+comedi-y := comedi_fops.o proc.o range.o drivers.o comedi_ksyms.o
+#FIXME: these should be added for rt-enabled kernels
+#comedi-y += rt_pend_tq.o rt.o
+
+obj-y += kcomedilib/
+obj-y += drivers/
+

diff --git a/comedi/drivers/Kbuild b/comedi/drivers/Kbuild
new file mode 100644 (file)
index 0000000..2eea3ce
--- /dev/null
+++ b/comedi/drivers/Kbuild
@@ -0,0 +1,107 @@
+
+obj-y += addi-data/
+
+#FIXME: deal with conditionally compiled rt/pcmcia/usb modules
+
+#if CONFIG_COMEDI_RT
+#rt_modules = comedi_rt_timer.ko
+#endif
+
+#if CONFIG_PCMCIA
+#pcmcia_modules= \
+# cb_das16_cs.ko \
+# das08_cs.ko \
+# ni_daq_dio24.ko \
+# ni_mio_cs.ko \
+# ni_labpc_cs.ko \
+# quatech_daqp_cs.ko
+#endif
+
+#if CONFIG_USB
+#usb_modules= \
+# usbdux.ko \
+# usbduxfast.ko \
+# dt9812.ko
+#else
+#usb_modules=
+#endif
+
+obj-m += 8255.o
+obj-m += amcc_s5933.o
+obj-m += comedi_fc.o
+obj-m += das08.o
+obj-m += mite.o
+obj-m += ni_labpc.o
+obj-m += acl7225b.o
+obj-m += adl_pci6208.o
+obj-m += adl_pci9111.o
+obj-m += adl_pci9118.o
+obj-m += adv_pci1710.o
+obj-m += adv_pci_dio.o
+obj-m += amplc_pci224.o
+obj-m += amplc_pci230.o
+obj-m += amplc_pc236.o
+obj-m += amplc_pc263.o
+obj-m += amplc_dio200.o
+obj-m += c6xdigio.o
+obj-m += cb_pcidas.o
+obj-m += cb_pcidas64.o
+obj-m += cb_pcidda.o
+obj-m += cb_pcimdas.o
+obj-m += cb_pcimdda.o
+obj-m += comedi_bond.o
+obj-m += contec_pci_dio.o
+obj-m += daqboard2000.o
+obj-m += das16.o
+obj-m += das16m1.o
+obj-m += das6402.o
+obj-m += das800.o
+obj-m += das1800.o
+obj-m += dmm32at.o
+obj-m += dt2801.o
+obj-m += dt2811.o
+obj-m += dt2814.o
+obj-m += dt2815.o
+obj-m += dt2817.o
+obj-m += dt282x.o
+obj-m += dt3000.o
+obj-m += fl512.o
+obj-m += gsc_hpdi.o
+obj-m += ii_pci20kc.o
+obj-m += icp_multi.o
+obj-m += ke_counter.o
+obj-m += me_daq.o
+obj-m += me4000.o
+obj-m += multiq3.o
+obj-m += ni_660x.o
+obj-m += ni_670x.o
+obj-m += ni_atmio.o
+obj-m += ni_pcimio.o
+obj-m += ni_pcidio.o
+obj-m += ni_6527.o
+obj-m += ni_atmio16d.o
+obj-m += ni_at_a2150.o
+obj-m += ni_at_ao.o
+obj-m += pcm3724.o
+obj-m += pcm3730.o
+obj-m += pcmad.o
+obj-m += pcmda12.o
+obj-m += poc.o
+obj-m += pcl711.o
+obj-m += pcl724.o
+obj-m += pcl725.o
+obj-m += pcl726.o
+obj-m += pcl730.o
+obj-m += pcl812.o
+obj-m += pcl816.o
+obj-m += pcl818.o
+obj-m += pcmuio.o
+obj-m += comedi_parport.o
+obj-m += rtd520.o
+obj-m += rti800.o
+obj-m += rti802.o
+obj-m += skel.o
+obj-m += ssv_dnp.o
+obj-m += s626.o
+obj-m += comedi_test.o
+

diff --git a/comedi/drivers/addi-data/Kbuild b/comedi/drivers/addi-data/Kbuild
new file mode 100644 (file)
index 0000000..897fdcc
--- /dev/null
+++ b/comedi/drivers/addi-data/Kbuild
@@ -0,0 +1,2 @@
+
+obj-m += addi_common.o

diff --git a/comedi/kcomedilib/Kbuild b/comedi/kcomedilib/Kbuild
new file mode 100644 (file)
index 0000000..1e2cc2b
--- /dev/null
+++ b/comedi/kcomedilib/Kbuild
@@ -0,0 +1,3 @@
+
+obj-m += kcomedilib.o
+kcomedilib-y := kcomedilib_main.o data.o dio.o get.o ksyms.o

diff --git a/configure.ac b/configure.ac
index 667c62a25086006500833b2d52f3188a1a3e9729..dd4870ce8a21cc6d810d9f3e9c4fbc8f61058e86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,8 @@ else
        AC_MSG_NOTICE([PCMCIA support disabled])
        AM_CONDITIONAL(CONFIG_PCMCIA,false)
 fi
+AC_ARG_ENABLE([kbuild], [  --enable-kbuild     Build modules using kernel's kbuild system (needs recent 2.6 kernel)],
+       [ENABLE_KBUILD=$enableval], [ENABLE_KBUILD="no"])
 AS_LINUX_CONFIG_OPTION_MODULE(CONFIG_ISA)
 AS_LINUX_CONFIG_OPTION_MODULE(CONFIG_PCI)
 AS_LINUX_CONFIG_OPTION_MODULE(CONFIG_USB)
@@ -77,11 +79,12 @@ AC_DEFINE(CONFIG_COMEDI_8255, true, [Define if 8255 support is enabled])
 DISTCHECK_CONFIGURE_FLAGS="--with-modulesdir=\\\$\$\(prefix\)/modules"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 comedi/Makefile
 comedi/drivers/Makefile
 comedi/drivers/addi-data/Makefile
 comedi/kcomedilib/Makefile
 ])
+AC_OUTPUT