From 0710248b23a54dd1d94f3cdcfb012bfc79abc2c0 Mon Sep 17 00:00:00 2001
From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Fri, 25 Apr 2003 01:58:34 +0000
Subject: [PATCH] tweaked include directives so gcc -MM generates better
 dependency files

---
 lib/buffer.c      | 2 --
 lib/calib.c       | 1 -
 lib/cmd.c         | 1 -
 lib/comedi.c      | 1 -
 lib/data.c        | 1 -
 lib/dio.c         | 1 -
 lib/error.c       | 1 -
 lib/filler.c      | 1 -
 lib/get.c         | 1 -
 lib/ioctl.c       | 1 -
 lib/libinternal.h | 6 +++---
 lib/range.c       | 1 -
 lib/sv.c          | 1 -
 lib/timed.c       | 1 -
 lib/timer.c       | 1 -
 15 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/lib/buffer.c b/lib/buffer.c
index 6296566..dcfe931 100644
--- a/lib/buffer.c
+++ b/lib/buffer.c
@@ -21,8 +21,6 @@
     USA.
 */
 
-#include <comedi.h>
-
 #include "libinternal.h"
 #include <string.h>
 
diff --git a/lib/calib.c b/lib/calib.c
index 17bf628..0aa8cbd 100644
--- a/lib/calib.c
+++ b/lib/calib.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <comedilib.h>
 #include "libinternal.h"
 
 static int check_cal_file( comedi_t *dev, struct calibration_file_contents *parsed_file )
diff --git a/lib/cmd.c b/lib/cmd.c
index 2f4edea..df9c713 100644
--- a/lib/cmd.c
+++ b/lib/cmd.c
@@ -22,7 +22,6 @@
 */
 
 #include <stdio.h>
-#include <comedilib.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
diff --git a/lib/comedi.c b/lib/comedi.c
index b0c4d0c..a42b27c 100644
--- a/lib/comedi.c
+++ b/lib/comedi.c
@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include <comedi.h>
 #include <string.h>
 
 #include "libinternal.h"
diff --git a/lib/data.c b/lib/data.c
index cf26b8d..4b5fe51 100644
--- a/lib/data.c
+++ b/lib/data.c
@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include <comedi.h>
 #include <string.h>
 
 #include "libinternal.h"
diff --git a/lib/dio.c b/lib/dio.c
index 963dfcf..4c96531 100644
--- a/lib/dio.c
+++ b/lib/dio.c
@@ -29,7 +29,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-#include <comedi.h>
 #include <string.h>
 
 #include "libinternal.h"
diff --git a/lib/error.c b/lib/error.c
index 88176bb..d84ca10 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -25,7 +25,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <comedi_errno.h>
 
 char *__comedilib_error_strings[]={
 	_s("No error"),
diff --git a/lib/filler.c b/lib/filler.c
index fd304f1..1f012ee 100644
--- a/lib/filler.c
+++ b/lib/filler.c
@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include <comedi.h>
 #include <string.h>
 
 #include "libinternal.h"
diff --git a/lib/get.c b/lib/get.c
index c2aea26..fc88f1d 100644
--- a/lib/get.c
+++ b/lib/get.c
@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include <comedi.h>
 #include <string.h>
 
 #include "libinternal.h"
diff --git a/lib/ioctl.c b/lib/ioctl.c
index 8c5fad8..db13bea 100644
--- a/lib/ioctl.c
+++ b/lib/ioctl.c
@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include <comedi.h>
 #include <string.h>
 
 #include "libinternal.h"
diff --git a/lib/libinternal.h b/lib/libinternal.h
index 9f99f23..bd730d7 100644
--- a/lib/libinternal.h
+++ b/lib/libinternal.h
@@ -26,7 +26,9 @@
 
 #define _COMEDILIB_DEPRECATED
 
-#include <comedilib.h>
+#include "comedilib.h"
+#include "comedi.h"
+#include "comedi_errno.h"
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -34,8 +36,6 @@
 #include <libintl.h>
 #endif
 
-#include <comedi_errno.h>
-
 /* This indicates a symbol that should not be exported as part of
  * the library.  But I don't know how to make it useful yet. */
 #define INTERNAL
diff --git a/lib/range.c b/lib/range.c
index fabd88d..26579d7 100644
--- a/lib/range.c
+++ b/lib/range.c
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include <comedi.h>
 #include <string.h>
 
 #include "libinternal.h"
diff --git a/lib/sv.c b/lib/sv.c
index 51a1ace..462da13 100644
--- a/lib/sv.c
+++ b/lib/sv.c
@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include <comedi.h>
 #include <string.h>
 
 #include "libinternal.h"
diff --git a/lib/timed.c b/lib/timed.c
index b569b1d..e9d748b 100644
--- a/lib/timed.c
+++ b/lib/timed.c
@@ -32,7 +32,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include <comedi.h>
 #include <string.h>
 
 
diff --git a/lib/timer.c b/lib/timer.c
index 3296301..2404c34 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include <comedi.h>
 #include <string.h>
 
 #include "libinternal.h"
-- 
2.26.2