From 37bb079407d01ddf6d2e50e6d5eb02ef5883f2b3 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Mon, 11 Aug 2003 20:19:38 +0000
Subject: [PATCH] Fixes for 'make dist' to work properly

---
 Makefile.am                   |  2 ++
 comedi/Makefile.am            | 16 ++++++++++++----
 comedi/comedi_ksyms.c         |  2 ++
 comedi/drivers/Makefile.am    | 17 +++++++++++++++++
 comedi/kcomedilib/Makefile.am |  6 +++---
 comedi/kcomedilib/ksyms.c     |  1 +
 6 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 45c9b6a9..c670bd01 100644
--- 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 4a6b18ca..f37487e9 100644
--- 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 146c0f75..6cd7e0d7 100644
--- 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 f0632c6e..183d86ca 100644
--- 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 70fa5410..4238e6cf 100644
--- 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 fcbc783e..2c4121ef 100644
--- 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>
-- 
2.26.2