tweaked include directives so gcc -MM generates better dependency files

diff --git a/lib/buffer.c b/lib/buffer.c
index 629656602509f29e73fba1a538171774b54bce61..dcfe931b5009f09120b5f83f8349dd0df504ed2b 100644 (file)
--- 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 17bf62834df9de2fa7aa2b89e799c6cd2531c83d..0aa8cbdd033ffef9446557c3d66a345724a9295c 100644 (file)
--- 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 2f4edeac73ce18390e5c42efd3c993e2ea54936f..df9c7136ed019cbff54d4eff795253ae0c38215e 100644 (file)
--- 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 b0c4d0caf6ae6a4cd50a8f09c06c81ba56bf1b36..a42b27c6567a5c59a8106bfb6376564a0de454eb 100644 (file)
--- 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 cf26b8daefcdad35a3d7910dadba583662664bd3..4b5fe5120f73e747fd603bac49d8bf23c76fcf33 100644 (file)
--- 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 963dfcfc7466d3ef402176668ea3aebc6645642a..4c96531da6051dfcf4a34a129b0360af1e0e5949 100644 (file)
--- 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 88176bb622f58ca3b9472755adaf950796ba2b93..d84ca10f07ab73341e9d0d55e86b11766c71769e 100644 (file)
--- 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 fd304f1ba6ce6cbeec5731e3c88ff668bb316b33..1f012ee608b028f6e3e6ce7bda5f04eb664c549c 100644 (file)
--- 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 c2aea26e82e32957f3e5717bea58d6f29f23adcb..fc88f1d4f578dd2ca46fa44b4aa8eadbfb6fc0f6 100644 (file)
--- 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 8c5fad8cc4431b9a1c48d3062826cfb43d2bac0c..db13bea461952f68ee82c395ec9001151b7b2f40 100644 (file)
--- 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 9f99f2389650035e035b1ac85d9fbdfc4eebf94c..bd730d7249d25ddbc58be9657b0d2994e7ab2332 100644 (file)
--- 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 fabd88d79d8a1aac5eef1e9acc4e45961755d26b..26579d7fcc0826b659c08744dd76ff555db2b0c0 100644 (file)
--- 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 51a1ace1a03756ae6d05a5d56da5b0e84de85da3..462da1355f2a644e4ff033f9d96706ebfbafbb1b 100644 (file)
--- 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 b569b1d88df50aad328d3258c9cc0bea3e3e8b3b..e9d748b92b7af9f7bab1687703cb4697ac90da32 100644 (file)
--- 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 3296301554431f623e0405643e59df7b70d61f36..2404c34c3201b68da3335cdff57c570fa9fc6c9c 100644 (file)
--- 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"