Fixes for 'make dist' to work properly

diff --git a/Makefile.am b/Makefile.am
index 45c9b6a92e712fac0454d6b56233b65b4ff702fa..c670bd01b0729902c90332ced2c335f380ca6b1e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
 
 SUBDIRS = comedi
 
+EXTRA_DIST = Documentation include m4 scripts
+
 
 dev:
        -mknod -m 666 /dev/comedi0 c 98 0

diff --git a/comedi/Makefile.am b/comedi/Makefile.am
index 4a6b18ca4892a8eaa585294019d7e27b798f6275..f37487e9f0777b053a6ff13bb715ba253ed90180 100644 (file)
--- a/comedi/Makefile.am
+++ b/comedi/Makefile.am
@@ -3,8 +3,16 @@ SUBDIRS = kcomedilib drivers
 
 module_PROGRAMS = comedi.ko
 
-comedi_ko_SOURCES = comedi_fops.c proc.c range.c drivers.c \
-       comedi_ksyms.o
+EXTRA_DIST = \
+ rt_pend_tq.h
+
+comedi_ko_SOURCES = \
+ comedi_fops.c \
+ proc.c \
+ range.c \
+ drivers.c \
+ comedi_ksyms.c
+
 comedi_ko_CFLAGS = $(COMEDI_CFLAGS) $(LINUX_CFLAGS)
 comedi_ko_LINK = $(top_builddir)/modtool --link -o $@
 
@@ -13,8 +21,8 @@ comedi_ko_LINK = $(top_builddir)/modtool --link -o $@
 #endif
 
 
-comedi_ksyms.o: comedi_ksyms.c
-       $(CC) -o $@ comedi_ksyms.c $(CFLAGS) $(COMEDI_CFLAGS) $(LINUX_CFLAGS) -DEXPORT_SYMTAB
+#comedi_ksyms.o: comedi_ksyms.c
+#      $(CC) -o $@ comedi_ksyms.c $(CFLAGS) $(COMEDI_CFLAGS) $(LINUX_CFLAGS) -DEXPORT_SYMTAB
 
 install-data-hook: 
        depmod -ae $(LINUX_KERNELRELEASE)

diff --git a/comedi/comedi_ksyms.c b/comedi/comedi_ksyms.c
index 146c0f75182644d780fd5b2ae25bfa1c579167c0..6cd7e0d708eee8075661df672ea2ec8a369ae7ef 100644 (file)
--- a/comedi/comedi_ksyms.c
+++ b/comedi/comedi_ksyms.c
@@ -23,6 +23,8 @@
 
 
 #define __NO_VERSION__
+#define EXPORT_SYMTAB
+
 #include <linux/comedidev.h>
 
 

diff --git a/comedi/drivers/Makefile.am b/comedi/drivers/Makefile.am
index f0632c6e885a05f6f9a76b45eeda960d1ced62ad..183d86cad94cc1dc04a7454b40f23c446184dad2 100644 (file)
--- a/comedi/drivers/Makefile.am
+++ b/comedi/drivers/Makefile.am
@@ -1,8 +1,25 @@
 
+#SUBDIRS = addi-data
 
 AM_CFLAGS = $(COMEDI_CFLAGS) $(LINUX_CFLAGS)
 LINK = $(top_builddir)/modtool --link -o $@
 
+EXTRA_DIST = \
+ 8253.h \
+ 8255.h \
+ am9513.h \
+ amcc_s5933.h \
+ comedi_fc.h \
+ das08.h \
+ icp_multi.h \
+ mite.h \
+ ni_labpc.h \
+ ni_mio_common.c \
+ ni_stc.h \
+ plx9052.h \
+ plx9080.h \
+ rtd520.h
+
 # mpc8260cpm.ko
 # comedi_rt_timer.ko
 

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

diff --git a/comedi/kcomedilib/ksyms.c b/comedi/kcomedilib/ksyms.c
index fcbc783e560ccec7160625a6605c28d8b5b33f90..2c4121ef5fcecbc4381a0c407a295bb4957f09dd 100644 (file)
--- a/comedi/kcomedilib/ksyms.c
+++ b/comedi/kcomedilib/ksyms.c
@@ -22,6 +22,7 @@
 */
 
 
+#define EXPORT_SYMTAB
 
 #include <linux/comedi.h>
 #include <linux/comedidev.h>