Merge branch 'master' of git+ssh://sourceware.org/git/lvm2

daemons/lvmlockd/Makefile.in

@@ -42,10 +42,12 @@ LIBS += $(RT_LIBS) $(DAEMON_LIBS) $(PTHREAD_LIBS)
 
 lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
 		    $(top_builddir)/libdaemon/server/libdaemonserver.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LOCK_LIBS) -ldaemonserver \
+		$(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS)
 
 lvmlockctl: lvmlockctl.o $(top_builddir)/libdaemon/client/libdaemonclient.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o \
+		$(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS)
 
 install_lvmlockd: lvmlockd
 	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)

daemons/lvmpolld/Makefile.in

@@ -34,7 +34,8 @@ LIBS += $(DAEMON_LIBS) -ldaemonserver $(PTHREAD_LIBS)
 
 lvmpolld: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
 		    $(top_builddir)/libdaemon/server/libdaemonserver.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \
+		$(top_builddir)/device_mapper/libdevice-mapper.a $(LIBS)
 
 install_lvmpolld: lvmpolld
 	$(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)

include/.gitignore

@@ -1,4 +1 @@
-.symlinks
-.symlinks_created
-
 *.h

include/Makefile.in

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
-# Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2018 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -19,3 +19,84 @@ top_builddir = @top_builddir@
 include $(top_builddir)/make.tmpl
 
 DISTCLEAN_TARGETS += .configure.h lvm-version.h
+CLEAN_TARGETS += \
+ activate.h \
+ archiver.h \
+ bcache.h \
+ btree.h \
+ clvm.h \
+ config-util.h \
+ config.h \
+ config_settings.h \
+ crc.h \
+ daemon-client.h \
+ daemon-io.h \
+ defaults.h \
+ dev-cache.h \
+ dev-ext-udev-constants.h \
+ dev-type.h \
+ device-types.h \
+ device.h \
+ display.h \
+ dm-ioctl.h \
+ dm-log-userspace.h \
+ dm-logging.h \
+ dmlib.h \
+ filter.h \
+ format-text.h \
+ format1.h \
+ format_pool.h \
+ intl.h \
+ kdev_t.h \
+ label.h \
+ last-path-component.h \
+ lib.h \
+ libdevmapper-event.h \
+ libdevmapper.h \
+ locking.h \
+ log.h \
+ lv.h \
+ lvm-exec.h \
+ lvm-file.h \
+ lvm-flock.h \
+ lvm-globals.h \
+ lvm-logging.h \
+ lvm-maths.h \
+ lvm-percent.h \
+ lvm-signal.h \
+ lvm-string.h \
+ lvm-wrappers.h \
+ lvm2app.h \
+ lvm2cmd.h \
+ lvmcache.h \
+ lvmetad-client.h \
+ lvmetad.h \
+ lvmlockd-client.h \
+ lvmlockd.h \
+ lvmnotify.h \
+ lvmpolld-client.h \
+ lvmpolld-protocol.h \
+ lv_alloc.h \
+ memlock.h \
+ metadata-exported.h \
+ metadata.h \
+ pogen.h \
+ polldaemon.h \
+ polling_ops.h \
+ properties.h \
+ prop_common.h \
+ pv.h \
+ pv_alloc.h \
+ report.h \
+ segtype.h \
+ sharedlib.h \
+ str_list.h \
+ targets.h \
+ text_export.h \
+ text_import.h \
+ tool.h \
+ toolcontext.h \
+ util.h \
+ uuid.h \
+ vg.h \
+ xlate.h

lib/activate/activate.h

@@ -210,7 +210,7 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume
 			   const struct lv_activate_opts *laopts, int monitor);
 
 #ifdef DMEVENTD
-#  include "libdevmapper-event.h"
+#  include "daemons/dmeventd/libdevmapper-event.h"
 char *get_monitor_dso_path(struct cmd_context *cmd, int id);
 int target_registered_with_dmeventd(struct cmd_context *cmd, const char *dso,
 				    const struct logical_volume *lv, int *pending, int *monitored);

lib/metadata/lv.c

@@ -290,7 +290,7 @@ char *lvseg_cachemode_dup(struct dm_pool *mem, const struct lv_segment *seg)
 }
 
 #ifdef DMEVENTD
-#  include "libdevmapper-event.h"
+#  include "daemons/dmeventd/libdevmapper-event.h"
 #endif
 char *lvseg_monitor_dup(struct dm_pool *mem, const struct lv_segment *seg)
 {