From cdf315e158c29c2a123a8c76255d38bbf45f861a Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Mon, 3 Dec 2018 18:15:44 +0100 Subject: [PATCH] headers: use full path header instead of -I directive Replace Makefile -I with full path to headers like we use now everywhere else. (cherry picked from commit 63b0f0dab8b9a86b5cae6592f8cbea2eac0b70a3) --- daemons/dmeventd/plugins/mirror/Makefile.in | 1 - daemons/dmeventd/plugins/mirror/dmeventd_mirror.c | 2 +- daemons/dmeventd/plugins/raid/Makefile.in | 1 - daemons/dmeventd/plugins/raid/dmeventd_raid.c | 4 ++-- daemons/dmeventd/plugins/snapshot/Makefile.in | 1 - daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c | 2 +- daemons/dmeventd/plugins/thin/Makefile.in | 1 - daemons/dmeventd/plugins/thin/dmeventd_thin.c | 2 +- daemons/dmeventd/plugins/vdo/Makefile.in | 1 - daemons/dmeventd/plugins/vdo/dmeventd_vdo.c | 2 +- 10 files changed, 6 insertions(+), 11 deletions(-) diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in index a28b9e5ac..2c0d5d7f2 100644 --- a/daemons/dmeventd/plugins/mirror/Makefile.in +++ b/daemons/dmeventd/plugins/mirror/Makefile.in @@ -16,7 +16,6 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2 CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2 SOURCES = dmeventd_mirror.c diff --git a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c index ca483fd58..5f1db3203 100644 --- a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c +++ b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c @@ -13,8 +13,8 @@ */ #include "lib/misc/lib.h" +#include "daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h" #include "daemons/dmeventd/libdevmapper-event.h" -#include "dmeventd_lvm.h" #include "lib/activate/activate.h" /* FIXME Reformat to 80 char lines. */ diff --git a/daemons/dmeventd/plugins/raid/Makefile.in b/daemons/dmeventd/plugins/raid/Makefile.in index d38ca1576..c00e624a7 100644 --- a/daemons/dmeventd/plugins/raid/Makefile.in +++ b/daemons/dmeventd/plugins/raid/Makefile.in @@ -15,7 +15,6 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2 CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2 SOURCES = dmeventd_raid.c diff --git a/daemons/dmeventd/plugins/raid/dmeventd_raid.c b/daemons/dmeventd/plugins/raid/dmeventd_raid.c index 7871500e5..aa2b5789d 100644 --- a/daemons/dmeventd/plugins/raid/dmeventd_raid.c +++ b/daemons/dmeventd/plugins/raid/dmeventd_raid.c @@ -13,9 +13,9 @@ */ #include "lib/misc/lib.h" -#include "lib/config/defaults.h" -#include "dmeventd_lvm.h" +#include "daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h" #include "daemons/dmeventd/libdevmapper-event.h" +#include "lib/config/defaults.h" /* Hold enough elements for the mximum number of RAID images */ #define RAID_DEVS_ELEMS ((DEFAULT_RAID_MAX_IMAGES + 63) / 64) diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in index ab46b43ee..adbb3e2d5 100644 --- a/daemons/dmeventd/plugins/snapshot/Makefile.in +++ b/daemons/dmeventd/plugins/snapshot/Makefile.in @@ -16,7 +16,6 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2 CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2 SOURCES = dmeventd_snapshot.c diff --git a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c index 9e9053c0e..9c49a729b 100644 --- a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c +++ b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c @@ -13,7 +13,7 @@ */ #include "lib/misc/lib.h" -#include "dmeventd_lvm.h" +#include "daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h" #include "daemons/dmeventd/libdevmapper-event.h" #include diff --git a/daemons/dmeventd/plugins/thin/Makefile.in b/daemons/dmeventd/plugins/thin/Makefile.in index b1e3e1bd6..7968504b6 100644 --- a/daemons/dmeventd/plugins/thin/Makefile.in +++ b/daemons/dmeventd/plugins/thin/Makefile.in @@ -15,7 +15,6 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2 CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2 SOURCES = dmeventd_thin.c diff --git a/daemons/dmeventd/plugins/thin/dmeventd_thin.c b/daemons/dmeventd/plugins/thin/dmeventd_thin.c index 64fe6caff..5ff5bb8e4 100644 --- a/daemons/dmeventd/plugins/thin/dmeventd_thin.c +++ b/daemons/dmeventd/plugins/thin/dmeventd_thin.c @@ -13,7 +13,7 @@ */ #include "lib/misc/lib.h" -#include "dmeventd_lvm.h" +#include "daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h" #include "daemons/dmeventd/libdevmapper-event.h" #include diff --git a/daemons/dmeventd/plugins/vdo/Makefile.in b/daemons/dmeventd/plugins/vdo/Makefile.in index bda738a3c..8e90e27df 100644 --- a/daemons/dmeventd/plugins/vdo/Makefile.in +++ b/daemons/dmeventd/plugins/vdo/Makefile.in @@ -15,7 +15,6 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -INCLUDES += -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2 CLDFLAGS += -L$(top_builddir)/daemons/dmeventd/plugins/lvm2 SOURCES = dmeventd_vdo.c diff --git a/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c b/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c index abed41ed9..b5e2766a9 100644 --- a/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c +++ b/daemons/dmeventd/plugins/vdo/dmeventd_vdo.c @@ -13,7 +13,7 @@ */ #include "lib/misc/lib.h" -#include "dmeventd_lvm.h" +#include "daemons/dmeventd/plugins/lvm2/dmeventd_lvm.h" #include "daemons/dmeventd/libdevmapper-event.h" #include "device_mapper/vdo/target.h"