Cluster-extension-only installation.

diff --git a/WHATS_NEW b/WHATS_NEW
index 9386f9bd3729427d054ca0076a4859711cbb29b9..47039c5413770a432abc43e23a8d865600a096b6 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.00.21 - 
 =============================
+  Use 'make install_cluster' to install cluster extensions only.
   Cope with DT_UNKNOWN in sysfs.
   Fix extents_moved metadata size comment.
   Remove duplicate line in pvremove help text.

diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in
index 96d5f2a742b68e6ed2361e11a490721409eee411..da1d016708ed65b1656f51e9a43042e2d6cf5dcb 100644 (file)
--- a/daemons/clvmd/Makefile.in
+++ b/daemons/clvmd/Makefile.in
@@ -44,3 +44,6 @@ install_clvmd: $(TARGETS)
                $(sbindir)/clvmd
 
 install: $(INSTALL_TARGETS)
+
+install_cluster: $(INSTALL_TARGETS)
+

diff --git a/include/Makefile.in b/include/Makefile.in
index a922aa664a6981eb77944c8fce9f6a0b78350055..b623f7686ccdf79254a703e1d9447cc39a267ba8 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -20,6 +20,8 @@ VPATH = @srcdir@
 
 LN_S = @LN_S@
 
+.PHONY: clean distclean all install pofile install_cluster
+
 all: .symlinks_created
 
 .symlinks_created: .symlinks
@@ -37,5 +39,5 @@ clean:
 
 install:
 
-.PHONY: clean distclean all install pofile
+install_cluster:
 

diff --git a/lib/format1/Makefile.in b/lib/format1/Makefile.in
index bc5038d11e4dcbaef78993fd02ce0533dd82e90d..cf870c39d7c7d1d464d7cda79e78a486b6eac99c 100644 (file)
--- a/lib/format1/Makefile.in
+++ b/lib/format1/Makefile.in
@@ -29,8 +29,6 @@ LIB_SHARED = liblvm2format1.so
 
 include $(top_srcdir)/make.tmpl
 
-.PHONY: install
-
 install: liblvm2format1.so
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
                $(libdir)/liblvm2format1.so.$(LIB_VERSION)

diff --git a/lib/format_pool/Makefile.in b/lib/format_pool/Makefile.in
index 8476680bce6d1fdbeeeae6f8e64f3f0787028f7f..c731a2532d6407bb422433b7f2025907ddbf4a5d 100644 (file)
--- a/lib/format_pool/Makefile.in
+++ b/lib/format_pool/Makefile.in
@@ -26,8 +26,6 @@ LIB_SHARED = liblvm2formatpool.so
 
 include $(top_srcdir)/make.tmpl
 
-.PHONY: install
-
 install: liblvm2formatpool.so
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
                $(libdir)/liblvm2formatpool.so.$(LIB_VERSION)

diff --git a/lib/locking/Makefile.in b/lib/locking/Makefile.in
index d28cfbfe53818bf47a230bef67fba5b09406e568..c8290fed3ff65bfe2f37b2436ab31a8f69ef9e6e 100644 (file)
--- a/lib/locking/Makefile.in
+++ b/lib/locking/Makefile.in
@@ -22,9 +22,7 @@ LIB_SHARED = liblvm2clusterlock.so
 
 include $(top_srcdir)/make.tmpl
 
-.PHONY: install
-
-install: liblvm2clusterlock.so
+install install_cluster: liblvm2clusterlock.so
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
                $(libdir)/liblvm2clusterlock.so.$(LIB_VERSION)
        $(LN_S) -f liblvm2clusterlock.so.$(LIB_VERSION) \

diff --git a/lib/mirror/Makefile.in b/lib/mirror/Makefile.in
index edb56f1683d1a60beb9a7f53bcf237e01dff3b0f..102d96fc8460f33705e69b661dc0105bdf4525d3 100644 (file)
--- a/lib/mirror/Makefile.in
+++ b/lib/mirror/Makefile.in
@@ -22,8 +22,6 @@ LIB_SHARED = liblvm2mirror.so
 
 include $(top_srcdir)/make.tmpl
 
-.PHONY: install
-
 install: liblvm2mirror.so
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
                $(libdir)/liblvm2mirror.so.$(LIB_VERSION)

diff --git a/lib/snapshot/Makefile.in b/lib/snapshot/Makefile.in
index 9ae651952001b3860176e1bab724f59458a35126..513149a61a1c7b6d21e20e336a14bac1a346f20a 100644 (file)
--- a/lib/snapshot/Makefile.in
+++ b/lib/snapshot/Makefile.in
@@ -22,8 +22,6 @@ LIB_SHARED = liblvm2snapshot.so
 
 include $(top_srcdir)/make.tmpl
 
-.PHONY: install
-
 install: liblvm2snapshot.so
        $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
                $(libdir)/liblvm2snapshot.so.$(LIB_VERSION)

diff --git a/make.tmpl.in b/make.tmpl.in
index 1615c02e80e98629854e93d38ac4199b98494eb1..44941553fb2a05e5e78cb2035b522ca8ec4514e6 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -99,20 +99,22 @@ DEPS = $(top_srcdir)/make.tmpl $(top_srcdir)/VERSION Makefile $(INC_LNS)
 OBJECTS = $(SOURCES:%.c=%.o)
 POTFILES = $(SOURCES:%.c=%.pot)
 
+.PHONY: all install install_cluster pofile distclean clean
+.PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
+.PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster)
+
 SUBDIRS.install := $(SUBDIRS:=.install)
+SUBDIRS.install_cluster := $(SUBDIRS:=.install_cluster)
 SUBDIRS.pofile := $(SUBDIRS:=.pofile)
 SUBDIRS.clean := $(SUBDIRS:=.clean)
 SUBDIRS.distclean := $(SUBDIRS:=.distclean)
 
-.PHONY: all install pofile distclean clean
-.PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
-.PHONY: $(SUBDIRS.pofile)
-
 TARGETS += $(LIB_SHARED) $(LIB_STATIC)
 
 all: $(SUBDIRS) $(TARGETS)
 
 install: all $(SUBDIRS.install)
+install_cluster: all $(SUBDIRS.install_cluster)
 
 $(SUBDIRS):
        $(MAKE) -C $@
@@ -120,6 +122,9 @@ $(SUBDIRS):
 $(SUBDIRS.install): $(SUBDIRS)
        $(MAKE) -C $(@:.install=) install
 
+$(SUBDIRS.install_cluster): $(SUBDIRS)
+       $(MAKE) -C $(@:.install_cluster=) install_cluster
+
 $(SUBDIRS.clean):
        -$(MAKE) -C $(@:.clean=) clean
 

diff --git a/man/Makefile.in b/man/Makefile.in
index b8d762828f4828cf0c6cc653520e1113bef34c80..b37655306dc2236eec2b33e5cb75cb42f9405053 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -24,11 +24,16 @@ MAN8=lvchange.8 lvcreate.8 lvdisplay.8 lvextend.8 lvm.8 lvmchange.8 \
        vgconvert.8 vgdisplay.8 vgexport.8 vgextend.8 vgimport.8 \
        vgmerge.8 vgmknodes.8 vgreduce.8 vgremove.8 vgrename.8 \
        vgs.8 vgscan.8 vgsplit.8
+MAN8CLUSTER=clvmd.8
 MAN5DIR=${mandir}/man5
 MAN8DIR=${mandir}/man8
 
 include $(top_srcdir)/make.tmpl
 
+ifeq ("@CLVMD@", "yes")
+  install: install_cluster
+endif
+
 install:
        @echo "Installing $(MAN8) in $(MAN8DIR)"
        @for f in $(MAN8); \
@@ -43,3 +48,11 @@ install:
           $(RM) $(MAN5DIR)/$$f; \
           @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN5DIR)/$$f; \
        done
+
+install_cluster:
+       @echo "Installing $(MAN8CLUSTER) in $(MAN8DIR)"
+       @for f in $(MAN8CLUSTER); \
+       do \
+          $(RM) $(MAN8DIR)/$$f; \
+          @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
+       done