Merge pull request #1108 from vojtechtrefny/master_lvm-common

Move common LVM code to a separate file

Author: vojtechtrefny

Makefile.am

@@ -76,7 +76,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.sub \
     configure depcomp install-sh ltmain.sh missing py-compile compile ar-lib \
     m4/*.m4
 
-LIBDIRS = src/utils/.libs:src/plugins/.libs:src/plugins/fs/.libs:src/plugins/nvme/.libs:src/plugins/smart/.libs:src/lib/.libs
+LIBDIRS = src/utils/.libs:src/plugins/.libs:src/plugins/fs/.libs:src/plugins/lvm/.libs:src/plugins/nvme/.libs:src/plugins/smart/.libs:src/lib/.libs
 GIDIR = src/lib
 
 if WITH_PYTHON3

configure.ac

@@ -21,6 +21,7 @@ LT_INIT
 AC_CONFIG_FILES([Makefile src/Makefile \
                           src/plugins/Makefile \
                           src/plugins/fs/Makefile \
+                          src/plugins/lvm/Makefile \
                           src/plugins/nvme/Makefile \
                           src/plugins/smart/Makefile \
                           src/utils/Makefile \

include/blockdev/Makefile.am

@@ -1,5 +1,6 @@
 all-local:
 	for header in ${srcdir}/../../src/plugins/*.h; do ln -sf $${header} ./; done
+	for header in ${srcdir}/../../src/plugins/lvm/lvm.h; do ln -sf $${header} ./; done
 	for header in ${srcdir}/../../src/plugins/nvme/nvme.h; do ln -sf $${header} ./; done
 	for header in ${srcdir}/../../src/plugins/smart/smart.h; do ln -sf $${header} ./; done
 	for header in ${srcdir}/../../src/utils/*.h; do ln -sf $${header} ./; done

src/plugins/Makefile.am

@@ -8,6 +8,7 @@ if WITH_NVME
 SUBDIRS += nvme
 endif
 
+SUBDIRS += lvm
 SUBDIRS += smart
 
 lib_LTLIBRARIES =
@@ -28,14 +29,6 @@ if WITH_LOOP
 lib_LTLIBRARIES += libbd_loop.la
 endif
 
-if WITH_LVM
-lib_LTLIBRARIES += libbd_lvm.la
-endif
-
-if WITH_LVM_DBUS
-lib_LTLIBRARIES += libbd_lvm-dbus.la
-endif
-
 if WITH_MDRAID
 lib_LTLIBRARIES += libbd_mdraid.la
 endif
@@ -98,22 +91,6 @@ libbd_loop_la_CPPFLAGS = -I${builddir}/../../include/
 libbd_loop_la_SOURCES = loop.c loop.h
 endif
 
-if WITH_LVM
-libbd_lvm_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(DEVMAPPER_CFLAGS) $(YAML_CFLAGS) -Wall -Wextra -Werror
-libbd_lvm_la_LIBADD = ${builddir}/../utils/libbd_utils.la -lm $(GLIB_LIBS) $(GIO_LIBS) $(DEVMAPPER_LIBS) $(YAML_LIBS)
-libbd_lvm_la_LDFLAGS = -L${srcdir}/../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*'
-libbd_lvm_la_CPPFLAGS = -I${builddir}/../../include/
-libbd_lvm_la_SOURCES = lvm.c lvm.h check_deps.c check_deps.h dm_logging.c dm_logging.h vdo_stats.c vdo_stats.h
-endif
-
-if WITH_LVM_DBUS
-libbd_lvm_dbus_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(DEVMAPPER_CFLAGS) $(YAML_CFLAGS) -Wall -Wextra -Werror
-libbd_lvm_dbus_la_LIBADD = ${builddir}/../utils/libbd_utils.la -lm $(GLIB_LIBS) $(GIO_LIBS) $(DEVMAPPER_LIBS) $(YAML_LIBS)
-libbd_lvm_dbus_la_LDFLAGS = -L${srcdir}/../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*'
-libbd_lvm_dbus_la_CPPFLAGS = -I${builddir}/../../include/
-libbd_lvm_dbus_la_SOURCES = lvm-dbus.c lvm.h check_deps.c check_deps.h dm_logging.c dm_logging.h vdo_stats.c vdo_stats.h
-endif
-
 if WITH_MDRAID
 libbd_mdraid_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BYTESIZE_CFLAGS) -Wall -Wextra -Werror
 libbd_mdraid_la_LIBADD = ${builddir}/../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BYTESIZE_LIBS)
@@ -182,14 +159,6 @@ if WITH_LOOP
 libinclude_HEADERS += loop.h
 endif
 
-if WITH_LVM
-libinclude_HEADERS += lvm.h
-else
-if WITH_LVM_DBUS
-libinclude_HEADERS += lvm.h
-endif
-endif
-
 if WITH_MDRAID
 libinclude_HEADERS += mdraid.h
 endif

src/plugins/lvm/Makefile.am

@@ -0,0 +1,59 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
+lib_LTLIBRARIES =
+libincludedir = $(includedir)/blockdev
+
+if WITH_LVM
+libinclude_HEADERS = lvm.h
+else
+if WITH_LVM_DBUS
+libinclude_HEADERS = lvm.h
+endif
+endif
+
+
+if WITH_LVM
+
+lib_LTLIBRARIES += libbd_lvm.la
+
+libbd_lvm_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(DEVMAPPER_CFLAGS) $(YAML_CFLAGS) -Wall -Wextra -Werror
+libbd_lvm_la_LIBADD = ${builddir}/../../utils/libbd_utils.la -lm $(GLIB_LIBS) $(GIO_LIBS) $(DEVMAPPER_LIBS) $(YAML_LIBS)
+libbd_lvm_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*'
+libbd_lvm_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ -I. -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\"
+
+libbd_lvm_la_SOURCES = \
+	lvm.c \
+	lvm.h \
+	lvm-private.h \
+	lvm-common.c \
+	vdo_stats.c \
+	vdo_stats.h \
+	../check_deps.c \
+	../check_deps.h \
+	../dm_logging.c \
+	../dm_logging.h
+
+endif
+
+if WITH_LVM_DBUS
+
+lib_LTLIBRARIES += libbd_lvm-dbus.la
+
+libbd_lvm_dbus_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(DEVMAPPER_CFLAGS) $(YAML_CFLAGS) -Wall -Wextra -Werror
+libbd_lvm_dbus_la_LIBADD = ${builddir}/../../utils/libbd_utils.la -lm $(GLIB_LIBS) $(GIO_LIBS) $(DEVMAPPER_LIBS) $(YAML_LIBS)
+libbd_lvm_dbus_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*'
+libbd_lvm_dbus_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ -I. -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\"
+
+libbd_lvm_dbus_la_SOURCES = \
+	lvm-dbus.c \
+	lvm.h \
+	lvm-private.h \
+	lvm-common.c \
+	vdo_stats.c \
+	vdo_stats.h \
+	../check_deps.c \
+	../check_deps.h \
+	../dm_logging.c \
+	../dm_logging.h
+
+endif