From cd3475a8cbf090bc541ec468264c3ab5b07ca6f5 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 6 May 2010 10:07:46 +0000 Subject: [PATCH] Install plugins to subdirs Target install_dm_plugin installs files to libdir/device-mapper. Target install_lvm2_plugin installs files to libdir/lvm2. Both targets creates relative links to libdir to keep the code compatible with current dlopen handling. Once we will be able to read plugins from subdir, links could be removed. --- daemons/dmeventd/plugins/mirror/Makefile.in | 2 +- daemons/dmeventd/plugins/snapshot/Makefile.in | 2 +- lib/format1/Makefile.in | 2 +- lib/format_pool/Makefile.in | 2 +- lib/locking/Makefile.in | 2 +- lib/mirror/Makefile.in | 2 +- lib/snapshot/Makefile.in | 2 +- make.tmpl.in | 17 +++++++++++++---- 8 files changed, 20 insertions(+), 11 deletions(-) diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in index 146361fc5..5966f245a 100644 --- a/daemons/dmeventd/plugins/mirror/Makefile.in +++ b/daemons/dmeventd/plugins/mirror/Makefile.in @@ -32,6 +32,6 @@ include $(top_builddir)/make.tmpl LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS) -install_lvm2: install_lib_shared_plugin +install_lvm2: install_dm_plugin install: install_lvm2 diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in index f36f916c3..32a74af2b 100644 --- a/daemons/dmeventd/plugins/snapshot/Makefile.in +++ b/daemons/dmeventd/plugins/snapshot/Makefile.in @@ -28,6 +28,6 @@ include $(top_builddir)/make.tmpl LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS) -install_lvm2: install_lib_shared_plugin +install_lvm2: install_dm_plugin install: install_lvm2 diff --git a/lib/format1/Makefile.in b/lib/format1/Makefile.in index f0f04d2d4..e102fe8dc 100644 --- a/lib/format1/Makefile.in +++ b/lib/format1/Makefile.in @@ -30,4 +30,4 @@ LIB_VERSION = $(LIB_VERSION_LVM) include $(top_builddir)/make.tmpl -install: install_lib_shared_plugin +install: install_lvm2_plugin diff --git a/lib/format_pool/Makefile.in b/lib/format_pool/Makefile.in index 0671ee85e..be5195c34 100644 --- a/lib/format_pool/Makefile.in +++ b/lib/format_pool/Makefile.in @@ -27,4 +27,4 @@ LIB_VERSION = $(LIB_VERSION_LVM) include $(top_builddir)/make.tmpl -install: install_lib_shared_plugin +install: install_lvm2_plugin diff --git a/lib/locking/Makefile.in b/lib/locking/Makefile.in index fee03820f..1aae87823 100644 --- a/lib/locking/Makefile.in +++ b/lib/locking/Makefile.in @@ -23,4 +23,4 @@ LIB_VERSION = $(LIB_VERSION_LVM) include $(top_builddir)/make.tmpl -install install_cluster: install_lib_shared_plugin +install install_cluster: install_lvm2_plugin diff --git a/lib/mirror/Makefile.in b/lib/mirror/Makefile.in index 2769d44d1..5168eda02 100644 --- a/lib/mirror/Makefile.in +++ b/lib/mirror/Makefile.in @@ -23,4 +23,4 @@ LIB_VERSION = $(LIB_VERSION_LVM) include $(top_builddir)/make.tmpl -install: install_lib_shared_plugin +install: install_lvm2_plugin diff --git a/lib/snapshot/Makefile.in b/lib/snapshot/Makefile.in index 7f8a54400..72399f3ba 100644 --- a/lib/snapshot/Makefile.in +++ b/lib/snapshot/Makefile.in @@ -23,4 +23,4 @@ LIB_VERSION = $(LIB_VERSION_LVM) include $(top_builddir)/make.tmpl -install: install_lib_shared_plugin +install: install_lvm2_plugin diff --git a/make.tmpl.in b/make.tmpl.in index a2fe0035e..2375e183a 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -163,7 +163,7 @@ POTFILES = $(SOURCES:%.c=%.pot) .PHONY: all pofile distclean clean cleandir cflow device-mapper .PHONY: install install_cluster install_device-mapper install_lvm2 -.PHONY: install_lib_shared install_lib_shared_plugin +.PHONY: install_lib_shared install_dm_plugin install_lvm2_plugin .PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean) .PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow) .PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper) @@ -306,9 +306,18 @@ install_lib_shared: $(LIB_SHARED) $(INSTALL) -d $(usrlibdir) $(LN_S) -f $(USRLIB_RELPATH)$(