summaryrefslogtreecommitdiff
path: root/libdaemon/client
diff options
context:
space:
mode:
authorJoe Thornber <ejt@redhat.com>2018-05-14 10:30:20 +0100
committerJoe Thornber <ejt@redhat.com>2018-05-14 10:30:20 +0100
commit7f97c7ea9ade36bab817aca9eeee5c5177550127 (patch)
tree2fac9b50b16b91dd22ca155223c26beba9677377 /libdaemon/client
parent02b99be57eab4f55bd0db045a3873bdf5e500b92 (diff)
downloadlvm2-7f97c7ea9ade36bab817aca9eeee5c5177550127.tar.gz
build: Don't generate symlinks in include/ dir
As we start refactoring the code to break dependencies (see doc/refactoring.txt), I want us to use full paths in the includes (eg, #include "base/data-struct/list.h"). This makes it more obvious when we're breaking abstraction boundaries, eg, including a file in metadata/ from base/
Diffstat (limited to 'libdaemon/client')
-rw-r--r--libdaemon/client/config-util.c6
-rw-r--r--libdaemon/client/daemon-client.c8
-rw-r--r--libdaemon/client/daemon-client.h2
-rw-r--r--libdaemon/client/daemon-io.c4
-rw-r--r--libdaemon/client/daemon-io.h2
5 files changed, 11 insertions, 11 deletions
diff --git a/libdaemon/client/config-util.c b/libdaemon/client/config-util.c
index 32f36f6eb..12baa998b 100644
--- a/libdaemon/client/config-util.c
+++ b/libdaemon/client/config-util.c
@@ -14,10 +14,10 @@
#define _REENTRANT
-#include "tool.h"
+#include "tools/tool.h"
-#include "daemon-io.h"
-#include "dm-logging.h"
+#include "libdaemon/client/daemon-io.h"
+#include "libdm/misc/dm-logging.h"
#include <math.h> /* fabs() */
#include <float.h> /* DBL_EPSILON */
diff --git a/libdaemon/client/daemon-client.c b/libdaemon/client/daemon-client.c
index 5ce1fc09a..b5dfbf130 100644
--- a/libdaemon/client/daemon-client.c
+++ b/libdaemon/client/daemon-client.c
@@ -14,11 +14,11 @@
#define _REENTRANT
-#include "tool.h"
+#include "tools/tool.h"
-#include "daemon-io.h"
-#include "daemon-client.h"
-#include "dm-logging.h"
+#include "libdaemon/client/daemon-io.h"
+#include "libdaemon/client/daemon-client.h"
+#include "libdm/misc/dm-logging.h"
#include <sys/un.h>
#include <sys/socket.h>
diff --git a/libdaemon/client/daemon-client.h b/libdaemon/client/daemon-client.h
index 5235beaea..e1671a792 100644
--- a/libdaemon/client/daemon-client.h
+++ b/libdaemon/client/daemon-client.h
@@ -15,7 +15,7 @@
#ifndef _LVM_DAEMON_CLIENT_H
#define _LVM_DAEMON_CLIENT_H
-#include "config-util.h"
+#include "libdaemon/client/config-util.h"
typedef struct {
int socket_fd; /* the fd we use to talk to the daemon */
diff --git a/libdaemon/client/daemon-io.c b/libdaemon/client/daemon-io.c
index 5419d4053..bd24cdb01 100644
--- a/libdaemon/client/daemon-io.c
+++ b/libdaemon/client/daemon-io.c
@@ -14,9 +14,9 @@
#define _REENTRANT
-#include "tool.h"
+#include "tools/tool.h"
-#include "daemon-io.h"
+#include "libdaemon/client/daemon-io.h"
#include <errno.h>
diff --git a/libdaemon/client/daemon-io.h b/libdaemon/client/daemon-io.h
index 013b0c8f3..761d4688b 100644
--- a/libdaemon/client/daemon-io.h
+++ b/libdaemon/client/daemon-io.h
@@ -15,7 +15,7 @@
#ifndef _LVM_DAEMON_IO_H
#define _LVM_DAEMON_IO_H
-#include "config-util.h"
+#include "libdaemon/client/config-util.h"
/* TODO function names */