add link flag for modtool. separate out PCMCIA-based drivers

diff --git a/comedi/Makefile.am b/comedi/Makefile.am
index aa16bc8092a56de95d7927ef0e1b85be751e1f5d..969c1576f6d2a1fff5ba6933c469438f25a4d172 100644 (file)
--- a/comedi/Makefile.am
+++ b/comedi/Makefile.am
@@ -6,7 +6,7 @@ module_PROGRAMS = comedi.ko
 comedi_ko_SOURCES = comedi_fops.c proc.c range.c drivers.c \
        comedi_ksyms.o
 comedi_ko_CFLAGS = $(COMEDI_CFLAGS) $(LINUX_CFLAGS)
-comedi_ko_LINK = $(top_builddir)/modtool -o $@
+comedi_ko_LINK = $(top_builddir)/modtool --link -o $@
 
 #ifsel(CONFIG_COMEDI_RT)
 #  objlink(comedi.o rt_pend_tq.o rt.o)

diff --git a/comedi/drivers/Makefile.am b/comedi/drivers/Makefile.am
index 07996f70610ef80f41023ddfb26033a5e9f9dd42..020781d3a0cacec26991c3fe20458808f8938b07 100644 (file)
--- a/comedi/drivers/Makefile.am
+++ b/comedi/drivers/Makefile.am
@@ -1,11 +1,23 @@
 
 
 AM_CFLAGS = $(COMEDI_CFLAGS) $(LINUX_CFLAGS)
-LINK = $(top_builddir)/modtool -o $@
+LINK = $(top_builddir)/modtool --link -o $@
 
 # mpc8260cpm.ko
 # comedi_rt_timer.ko
 
+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 \
+else
+pcmcia_modules=
+endif
+
 module_PROGRAMS = 8255.ko \
  adl_pci9111.ko \
  adl_pci9118.ko \
@@ -20,12 +32,10 @@ module_PROGRAMS = 8255.ko \
  cb_pcidda.ko \
  cb_pcimdas.ko \
  cb_pcimdda.ko \
- cb_das16_cs.ko \
  comedi_fc.ko \
  contec_pci_dio.ko \
  daqboard2000.ko \
  das08.ko \
- das08_cs.ko \
  das16.ko \
  das16m1.ko \
  das6402.ko \
@@ -49,15 +59,12 @@ module_PROGRAMS = 8255.ko \
  ni_660x.ko \
  ni_670x.ko \
  ni_atmio.ko \
- ni_mio_cs.ko \
  ni_pcimio.ko \
  ni_pcidio.ko \
  ni_6527.ko \
  ni_atmio16d.ko \
  ni_at_a2150.ko \
  ni_labpc.ko \
- ni_labpc_cs.ko \
- ni_daq_dio24.ko \
  ni_at_ao.ko \
  pcm3730.ko \
  pcmad.ko \
@@ -69,7 +76,6 @@ module_PROGRAMS = 8255.ko \
  pcl812.ko \
  pcl816.ko \
  pcl818.ko \
- quatech_daqp_cs.ko \
  comedi_parport.ko \
  rtd520.ko \
  rti800.ko \

diff --git a/comedi/kcomedilib/Makefile.am b/comedi/kcomedilib/Makefile.am
index 8817a7b6e85c15c04b621bd6eeecf058dfefb4ba..70fa54100bf2dfe22badf8ffe9488fc8670abc1e 100644 (file)
--- a/comedi/kcomedilib/Makefile.am
+++ b/comedi/kcomedilib/Makefile.am
@@ -3,7 +3,7 @@ module_PROGRAMS = kcomedilib.ko
 
 kcomedilib_ko_SOURCES = data.c ksyms.o dio.c kcomedilib_main.c get.c
 kcomedilib_ko_CFLAGS = $(COMEDI_CFLAGS) $(LINUX_CFLAGS)
-kcomedilib_ko_LINK = $(top_builddir)/modtool -o $@
+kcomedilib_ko_LINK = $(top_builddir)/modtool --link -o $@
 
 ksyms.o: ksyms.c
        $(CC) -o $@ ksyms.c $(CFLAGS) $(COMEDI_CFLAGS) $(LINUX_CFLAGS) -DEXPORT_SYMTAB