diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2018-12-14 22:17:08 +0100 |
|---|---|---|
| committer | Marian Csontos <mcsontos@redhat.com> | 2018-12-17 16:14:45 +0100 |
| commit | a81e9e29125ec078f6d46526fbc6784617229363 (patch) | |
| tree | 9f7cd7fcf47c055d9912916b88296f3237de4a2c | |
| parent | 1a0bf79b72d84c67732e102ba2699a2b39562dcd (diff) | |
| download | lvm2-a81e9e29125ec078f6d46526fbc6784617229363.tar.gz | |
cmirror: link with libdm
Since there is very little change there will be any new devel going
to happing with cmirror - avoid eating extra disk space and link
with already installed libdm which implements all use basic
function of dm list
(cherry picked from commit a8cdd9e16a04ca837401cbcaa4677b2af50007b7)
| -rw-r--r-- | daemons/cmirrord/Makefile.in | 4 | ||||
| -rw-r--r-- | daemons/cmirrord/cluster.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/daemons/cmirrord/Makefile.in b/daemons/cmirrord/Makefile.in index 0bcd73cca..ff45225cd 100644 --- a/daemons/cmirrord/Makefile.in +++ b/daemons/cmirrord/Makefile.in @@ -28,10 +28,10 @@ LMLIBS += $(CPG_LIBS) CFLAGS += $(CPG_CFLAGS) $(EXTRA_EXEC_CFLAGS) LDFLAGS += $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -cmirrord: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a +cmirrord: $(OBJECTS) @echo " [CC] $@" $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \ - $(LVMLIBS) $(LMLIBS) $(INTERNAL_LIBS) $(LIBS) + $(LMLIBS) -L$(top_builddir)/libdm -ldevmapper $(LIBS) install: $(TARGETS) @echo " [INSTALL] $<" diff --git a/daemons/cmirrord/cluster.h b/daemons/cmirrord/cluster.h index 01d4871c4..0efbd64bf 100644 --- a/daemons/cmirrord/cluster.h +++ b/daemons/cmirrord/cluster.h @@ -12,8 +12,8 @@ #ifndef _LVM_CLOG_CLUSTER_H #define _LVM_CLOG_CLUSTER_H -#include "device_mapper/misc/dm-log-userspace.h" -#include "device_mapper/all.h" +#include "libdm/misc/dm-log-userspace.h" +#include "libdm/libdevmapper.h" #define DM_ULOG_RESPONSE 0x1000U /* in last byte of 32-bit value */ #define DM_ULOG_CHECKPOINT_READY 21 |