From cab8ea7c62e1621dc77ebf1a720b6fa92a7650cc Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Wed, 18 Aug 2004 18:57:40 +0000 Subject: Cluster-extension-only installation. --- WHATS_NEW | 1 + daemons/clvmd/Makefile.in | 3 +++ include/Makefile.in | 4 +++- lib/format1/Makefile.in | 2 -- lib/format_pool/Makefile.in | 2 -- lib/locking/Makefile.in | 4 +--- lib/mirror/Makefile.in | 2 -- lib/snapshot/Makefile.in | 2 -- make.tmpl.in | 13 +++++++++---- man/Makefile.in | 13 +++++++++++++ 10 files changed, 30 insertions(+), 16 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 9386f9bd..47039c54 100644 --- 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 96d5f2a7..da1d0167 100644 --- 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 a922aa66..b623f768 100644 --- 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 bc5038d1..cf870c39 100644 --- 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 8476680b..c731a253 100644 --- 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 d28cfbfe..c8290fed 100644 --- 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 edb56f16..102d96fc 100644 --- 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 9ae65195..513149a6 100644 --- 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 1615c02e..44941553 100644 --- 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 b8d76282..b3765530 100644 --- 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 -- cgit