Change some #include lines to search only standard system directories.

diff --git a/WHATS_NEW b/WHATS_NEW
index 23d3bee81730f0979b5b8cd79bd6018e689a01ec..01de3bbb6bbf02cf058caeb68b8fffa518477bcc 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.25 -
 =================================
+  Change some #include lines to search only standard system directories.
   Add devices/preferred_names config regex list for displayed device names.
   Free a temporary dir string in fcntl_lock_file() after use.
   Fix a dm_pool_destroy() in matcher_create().

diff --git a/daemons/clvmd/clvmd-cman.c b/daemons/clvmd/clvmd-cman.c
index cb1732c2f480a471455e2f0bec408f61cb59f70c..1250f4706de05335dc379b8403307e65f519a2ad 100644 (file)
--- a/daemons/clvmd/clvmd-cman.c
+++ b/daemons/clvmd/clvmd-cman.c
@@ -36,10 +36,10 @@
 #include <fcntl.h>
 #include <getopt.h>
 #include <errno.h>
+#include <libdlm.h>
 
 #include "clvmd-comms.h"
 #include "clvm.h"
-#include "libdlm.h"
 #include "log.h"
 #include "clvmd.h"
 #include "lvm-functions.h"

diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c
index 2d137e6e955f52fb1a642ef12de7b4ada99d98eb..0623c3a774ab45656126c8d8fc59967d01cd59ae 100644 (file)
--- a/daemons/clvmd/clvmd-command.c
+++ b/daemons/clvmd/clvmd-command.c
@@ -64,8 +64,9 @@
 #include <stddef.h>
 #include <unistd.h>
 #include <errno.h>
+#include <libdevmapper.h>
+#include <libdlm.h>
 
-#include "libdevmapper.h"
 #include "list.h"
 #include "locking.h"
 #include "log.h"
@@ -73,7 +74,6 @@
 #include "clvmd-comms.h"
 #include "clvm.h"
 #include "clvmd.h"
-#include "libdlm.h"
 
 extern struct cluster_ops *clops;
 

diff --git a/daemons/clvmd/clvmd-gulm.c b/daemons/clvmd/clvmd-gulm.c
index eca6edea3c3d8cee2836962261767158cfd5fa26..507cdfacf8d0a0d20ec1a41a9df330a0dfae7d97 100644 (file)
--- a/daemons/clvmd/clvmd-gulm.c
+++ b/daemons/clvmd/clvmd-gulm.c
@@ -40,9 +40,10 @@
 #include <utmpx.h>
 #include <syslog.h>
 #include <assert.h>
+#include <libdevmapper.h>
+#include <ccs.h>
+#include <libgulm.h>
 
-#include "libdevmapper.h"
-#include "ccs.h"
 #include "list.h"
 #include "locking.h"
 #include "log.h"
@@ -51,7 +52,6 @@
 #include "lvm-functions.h"
 #include "clvmd.h"
 #include "clvmd-gulm.h"
-#include "libgulm.h"
 
 /* Hash list of nodes in the cluster */
 static struct dm_hash_table *node_hash;

diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
index 6a293835052f74ad70256e69f282c3e958151685..752bbbd7c7abc5a769f2299c8afc44289231b403 100644 (file)
--- a/daemons/clvmd/clvmd.c
+++ b/daemons/clvmd/clvmd.c
@@ -37,6 +37,7 @@
 #include <getopt.h>
 #include <syslog.h>
 #include <errno.h>
+#include <libdlm.h>
 
 #include "clvmd-comms.h"
 #include "lvm-functions.h"
@@ -44,7 +45,6 @@
 #include "version.h"
 #include "clvmd.h"
 #include "refresh_clvmd.h"
-#include "libdlm.h"
 #include "system-lv.h"
 #include "list.h"
 #include "log.h"

diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c
index 35b3e935ff1b240a48d90fde2d0600752961b0d3..56219ac20f77373811beebe3ca333aa0f376a660 100644 (file)
--- a/daemons/clvmd/lvm-functions.c
+++ b/daemons/clvmd/lvm-functions.c
@@ -30,11 +30,11 @@
 #include <errno.h>
 #include <syslog.h>
 #include <assert.h>
+#include <libdevmapper.h>
+#include <libdlm.h>
 
-#include "libdevmapper.h"
 #include "list.h"
 #include "lvm-types.h"
-#include "libdlm.h"
 #include "clvm.h"
 #include "clvmd-comms.h"
 #include "clvmd.h"

diff --git a/daemons/clvmd/system-lv.c b/daemons/clvmd/system-lv.c
index aa5459927fe3528a71ccaa738cc16945043c3f52..04c05fc3ed47d5a8a0581d65b0d708764875b410 100644 (file)
--- a/daemons/clvmd/system-lv.c
+++ b/daemons/clvmd/system-lv.c
@@ -36,8 +36,11 @@
 #include <dirent.h>
 #include <errno.h>
 #include <mntent.h>
+#include <libdlm.h>
+#ifdef HAVE_CCS
+#include <ccs.h>
+#endif
 
-#include "libdlm.h"
 #include "log.h"
 #include "list.h"
 #include "locking.h"
@@ -45,9 +48,6 @@
 #include "clvm.h"
 #include "clvmd-comms.h"
 #include "clvmd.h"
-#ifdef HAVE_CCS
-#include "ccs.h"
-#endif
 
 #define SYSTEM_LV_FILESYSTEM "ext2"
 #define SYSTEM_LV_MOUNTPOINT "/tmp/.clvmd-XXXXXX"

diff --git a/daemons/clvmd/tcp-comms.c b/daemons/clvmd/tcp-comms.c
index fd36189bd984878f8fc5adcb933987eb5554571e..ffbfe92d08a139c385ef1a86265e87d1941b9b61 100644 (file)
--- a/daemons/clvmd/tcp-comms.c
+++ b/daemons/clvmd/tcp-comms.c
@@ -34,8 +34,8 @@
 #include <syslog.h>
 #include <netdb.h>
 #include <assert.h>
+#include <libdevmapper.h>
 
-#include "libdevmapper.h"
 #include "clvm.h"
 #include "clvmd-comms.h"
 #include "clvmd.h"

diff --git a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
index 5a7f7439024c19514386630dcb1e25b0a48a2f0d..decac02beb5ff973b47d2da2ab3a46b28bc043b4 100644 (file)
--- a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
+++ b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
@@ -12,10 +12,10 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "libdevmapper.h"
-#include "libdevmapper-event.h"
 #include "lvm2cmd.h"
 
+#include <libdevmapper.h>
+#include <libdevmapper-event.h>
 #include <errno.h>
 #include <signal.h>
 #include <string.h>

diff --git a/dmeventd/mirror/dmeventd_mirror.c b/dmeventd/mirror/dmeventd_mirror.c
index 5a7f7439024c19514386630dcb1e25b0a48a2f0d..decac02beb5ff973b47d2da2ab3a46b28bc043b4 100644 (file)
--- a/dmeventd/mirror/dmeventd_mirror.c
+++ b/dmeventd/mirror/dmeventd_mirror.c
@@ -12,10 +12,10 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "libdevmapper.h"
-#include "libdevmapper-event.h"
 #include "lvm2cmd.h"
 
+#include <libdevmapper.h>
+#include <libdevmapper-event.h>
 #include <errno.h>
 #include <signal.h>
 #include <string.h>

diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 8084f5e970a370e7e89c4ba20902130cfc494915..a78c6a1053a25e9c2961e64cceafc8dceaaa9042 100644 (file)
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -168,7 +168,7 @@ int lvs_in_vg_activated(struct volume_group *vg)
 {
        return 0;
 }
-int lvs_in_vg_activated_by_uuid_only(struct volume_group *vg);
+int lvs_in_vg_activated_by_uuid_only(struct volume_group *vg)
 {
        return 0;
 }

diff --git a/lib/misc/lib.h b/lib/misc/lib.h
index 1f9716528c4808381b1edd2eecf2eb8506afc9ad..c3d523185705afb53641d7b70f64fd977ba1c238 100644 (file)
--- a/lib/misc/lib.h
+++ b/lib/misc/lib.h
@@ -19,7 +19,7 @@
 #ifndef _LVM_LIB_H
 #define _LVM_LIB_H
 
-#include <configure.h>
+#include "configure.h"
 
 #define _REENTRANT
 #define _GNU_SOURCE

diff --git a/make.tmpl.in b/make.tmpl.in
index e1907e546d95eb640635318687788adf002370fb..162f77f5e2fa78dda26be13110910e4cee063d19 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -94,7 +94,7 @@ STRIP=
 LIB_VERSION := $(shell cat $(top_srcdir)/VERSION | \
                 awk -F '.' '{printf "%s.%s",$$1,$$2}')
 
-INCLUDES += -I. -I$(top_srcdir)/include
+INCLUDES += -I$(top_srcdir)/include
 
 ifneq ("@DMDIR@", "")
   INCLUDES += -I@DMDIR@/include