Fix includes after change to build-sys

Make the includes be libkmod/libkmod.h for code outside of library. This
fixes the broken build after 1315123 ('build-sys: Don't add libkmod
subdirectory to include path').

diff --git a/shared/array.c b/shared/array.c
index f1f42c780b17c6e81d146fff06cff753ab726ad0..c2e2e148f8583e9a076595af6a58c0fe6fcd48fb 100644 (file)
--- a/shared/array.c
+++ b/shared/array.c
@@ -24,8 +24,6 @@
 
 #include <shared/array.h>
 
-#include <libkmod.h>
-
 /* basic pointer array growing in steps */
 
 

diff --git a/testsuite/test-blacklist.c b/testsuite/test-blacklist.c
index 1ec853fb3440ca10addcb6ca10c2491ed36d6a75..99a86ab171523ccd75ea58a8dd2582f836227923 100644 (file)
--- a/testsuite/test-blacklist.c
+++ b/testsuite/test-blacklist.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 /* good luck bulding a kmod_list outside of the library... makes this blacklist
  * function rather pointless */

diff --git a/testsuite/test-dependencies.c b/testsuite/test-dependencies.c
index 36cebc5f2f2075b7f964c38ccfc85bd14376dcae..ac7a08fd30c570fbf0428a639787a3b31ff2cb0c 100644 (file)
--- a/testsuite/test-dependencies.c
+++ b/testsuite/test-dependencies.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "testsuite.h"
 

diff --git a/testsuite/test-init.c b/testsuite/test-init.c
index 0c9094ca2dfe072bf6943dead94e92e2041daba2..df09ddac70232f7257a9b19c54393cdbbcc25f87 100644 (file)
--- a/testsuite/test-init.c
+++ b/testsuite/test-init.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "testsuite.h"
 

diff --git a/testsuite/test-loaded.c b/testsuite/test-loaded.c
index da164fdb9ba027c4a61ba9c5ffcebc5f62653d55..9d5814f23ffc6cb8f379855233620c1275d60b88 100644 (file)
--- a/testsuite/test-loaded.c
+++ b/testsuite/test-loaded.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "testsuite.h"
 

diff --git a/testsuite/test-new-module.c b/testsuite/test-new-module.c
index ae9716f0f2d2c8d974483f18bbbc7a49e894131c..360065cbef72a0971f2b40ab8aae8f9679e7a809 100644 (file)
--- a/testsuite/test-new-module.c
+++ b/testsuite/test-new-module.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "testsuite.h"
 

diff --git a/testsuite/test-testsuite.c b/testsuite/test-testsuite.c
index 2d2c96337f5b28c06e64f3389310f9c63122a1f6..58d312e17b654c440491b7a0a38fae40336bc59d 100644 (file)
--- a/testsuite/test-testsuite.c
+++ b/testsuite/test-testsuite.c
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/utsname.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "testsuite.h"
 

diff --git a/tools/depmod.c b/tools/depmod.c
index 9669a617ce29dd072610c9df113fa89759b261d1..d25f76b18388afe30b158d521e9368fa1452e5e8 100644 (file)
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -36,7 +36,7 @@
 #include <shared/macro.h>
 #include <shared/util.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "kmod.h"
 

diff --git a/tools/insmod.c b/tools/insmod.c
index c3be4e44efaf3cbb30bcffc514ffaa50b1410a07..e0c2313924eea711c811086a65d13d6f20094e93 100644 (file)
--- a/tools/insmod.c
+++ b/tools/insmod.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "kmod.h"
 

diff --git a/tools/kmod.c b/tools/kmod.c
index 42390275304ff4dfaf3c0cedffb68d0c99fe9e84..abb1707b9b95546f2c86b285fba4da60c8503cf5 100644 (file)
--- a/tools/kmod.c
+++ b/tools/kmod.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "kmod.h"
 

diff --git a/tools/log.c b/tools/log.c
index 4ae4aedf4898942e145aeca50b0016b4e691c256..e29a150d25acefefe436901834876b4880be26fa 100644 (file)
--- a/tools/log.c
+++ b/tools/log.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <syslog.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "kmod.h"
 

diff --git a/tools/lsmod.c b/tools/lsmod.c
index 282163969dfe6d6ce0cc10d9a68257911ab9d9b2..e953c7e55c3f0a9e6a1f70cc067159b2c51ec9b6 100644 (file)
--- a/tools/lsmod.c
+++ b/tools/lsmod.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "kmod.h"
 

diff --git a/tools/modinfo.c b/tools/modinfo.c
index 74ec183410be1449839aa67060dc52be5ec25f1d..36d8795d6bc7bee3572e1f3ecbaad450ff69b0d1 100644 (file)
--- a/tools/modinfo.c
+++ b/tools/modinfo.c
@@ -29,7 +29,7 @@
 
 #include <shared/util.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "kmod.h"
 

diff --git a/tools/modprobe.c b/tools/modprobe.c
index b82625593334b0b5efd2db8359bc5ed163496448..3af16c7a02a65b590c6b63e38e81605f882083ad 100644 (file)
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -34,7 +34,7 @@
 #include <shared/array.h>
 #include <shared/macro.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "kmod.h"
 

diff --git a/tools/rmmod.c b/tools/rmmod.c
index c6f1aeec98556e4d86fb322a36032937c79420f9..75fc7b5b85adfc63bc985df580452c9a6bb023bc 100644 (file)
--- a/tools/rmmod.c
+++ b/tools/rmmod.c
@@ -28,7 +28,7 @@
 
 #include <shared/macro.h>
 
-#include <libkmod.h>
+#include <libkmod/libkmod.h>
 
 #include "kmod.h"