main - cmdline: lvcreate adds vdopool as vg name provider
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e946a5e6904455284ae...
Commit: e946a5e6904455284ae4eeaa1d149a9324b0f00e
Parent: f87d1a2abb9102f47d240bd0e6f2c343ddb47310
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Feb 25 17:41:39 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
cmdline: lvcreate adds vdopool as vg name provider
Add same logic as with thinpool or cachepool.
---
tools/lvmcmdline.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 4e87f0cbf..b6ad66d62 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1519,7 +1519,7 @@ static int _command_required_pos_matches(struct cmd_context *cmd, int ci, int rp
* the VG position is allowed to be empty if --name VG/LV is used, or if the
* LVM_VG_NAME env var is set.
*
- * --thinpool VG/LV and --cachepool VG/LV can also function like --name
+ * --thinpool|--cachepool|--vdopool VG/LV can also function like --name
* to provide the VG name in place of the positional arg.
*/
if (!strcmp(cmd->name, "lvcreate") &&
@@ -1528,6 +1528,7 @@ static int _command_required_pos_matches(struct cmd_context *cmd, int ci, int rp
(arg_is_set(cmd, name_ARG) ||
arg_is_set(cmd, thinpool_ARG) ||
arg_is_set(cmd, cachepool_ARG) ||
+ arg_is_set(cmd, vdopool_ARG) ||
getenv("LVM_VG_NAME"))) {
if (getenv("LVM_VG_NAME"))
@@ -1547,6 +1548,9 @@ static int _command_required_pos_matches(struct cmd_context *cmd, int ci, int rp
if (strstr(name, "/"))
return 1;
}
+
+ if ((name = arg_str_value(cmd, vdopool_ARG, NULL)) && strstr(name, "/"))
+ return 1;
}
return 0;
3 years, 2 months
main - commands.h: keep entries alphabetically sorted
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f87d1a2abb9102f47d2...
Commit: f87d1a2abb9102f47d240bd0e6f2c343ddb47310
Parent: 6846af6612674d854613e9936deb358f6c1b3cfe
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Thu Feb 25 22:24:32 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
commands.h: keep entries alphabetically sorted
For binary search usage commands need to be sorted.
Later patch also adds check if the order would be broken.
---
tools/commands.h | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/tools/commands.h b/tools/commands.h
index b12e451f2..fa5359afe 100644
--- a/tools/commands.h
+++ b/tools/commands.h
@@ -29,14 +29,14 @@ xx(formats,
"List available metadata formats",
PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
-xx(help,
- "Display help for commands",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
-
xx(fullreport,
"Display full report",
PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | ALLOW_HINTS | ALLOW_EXPORTED)
+xx(help,
+ "Display help for commands",
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
+
xx(lastlog,
"Display last command's log report",
PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
@@ -85,6 +85,10 @@ xx(lvmsar,
"Create activity report",
0)
+xx(lvpoll,
+ "Continue already initiated poll operation on a logical volume",
+ 0)
+
xx(lvreduce,
"Reduce the size of a logical volume",
ALLOW_HINTS)
@@ -113,10 +117,6 @@ xx(pvchange,
"Change attributes of physical volume(s)",
0)
-xx(pvresize,
- "Resize physical volume(s)",
- 0)
-
xx(pvck,
"Check metadata on physical volumes",
LOCKD_VG_SH | ALLOW_EXPORTED)
@@ -139,14 +139,14 @@ xx(pvmove,
"Move extents from one physical volume to another",
ALL_VGS_IS_DEFAULT | DISALLOW_TAG_ARGS)
-xx(lvpoll,
- "Continue already initiated poll operation on a logical volume",
- 0)
-
xx(pvremove,
"Remove LVM label(s) from physical volume(s)",
ENABLE_ALL_DEVS)
+xx(pvresize,
+ "Resize physical volume(s)",
+ 0)
+
xx(pvs,
"Display information about physical volumes",
PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS | ALLOW_EXPORTED)
@@ -167,6 +167,10 @@ xx(tags,
"List tags defined on this host",
PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
+xx(version,
+ "Display software and driver version information",
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
+
xx(vgcfgbackup,
"Backup volume group configuration(s)",
PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | ALLOW_EXPORTED)
@@ -246,7 +250,3 @@ xx(vgscan,
xx(vgsplit,
"Move physical volumes into a new or existing volume group",
0)
-
-xx(version,
- "Display software and driver version information",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
3 years, 2 months
main - makefiles: retry faster deps again
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6846af6612674d85461...
Commit: 6846af6612674d854613e9936deb358f6c1b3cfe
Parent: 39eee85fff1930047a7dffe11183b4cafb6eb653
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Mar 2 21:20:42 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
makefiles: retry faster deps again
>From commit 29abba378520a270c3a9385724c8ef5df66497b1 we have hopefully
fixed most of troubles for deps tracking we had in past - so retry
again.
Drop explicit configure.h from DEPS - as it's automatically gathered
by gcc dependency tracking anyway.
---
libdm/make.tmpl.in | 23 ++++++++---------------
make.tmpl.in | 23 ++++++++---------------
2 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index 1192e87e8..af55a7f91 100644
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -280,7 +280,7 @@ INCLUDES += -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)/include -include confi
DEPS = $(top_builddir)/libdm/make.tmpl $(top_srcdir)/VERSION \
- $(top_builddir)/libdm/Makefile $(top_builddir)/include/configure.h
+ $(top_builddir)/libdm/Makefile
OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o)
POTFILES = $(SOURCES:%.c=%.pot)
@@ -397,14 +397,16 @@ endif
.LIBPATTERNS = lib%.so lib%.a
+DEPFLAGS=-MT $@ -MMD -MP -MF $*.d
+
# still needed in 2018 for 32bit builds
DEFS+=-D_FILE_OFFSET_BITS=64
-%.o: %.c
+%.o: %.c $(DEPS)
@echo " [CC] $(<F)"
- $(Q) $(CC) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
+ $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
-%.o: %.cpp
+%.o: %.cpp $(DEPS)
@echo " [CXX] $(<F)"
$(Q) $(CXX) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
@@ -462,17 +464,8 @@ $(LIB_STATIC): $(OBJECTS)
$(Q) $(RM) $@
$(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null
-%.d: %.c
- @echo " [DEP] $(<F)"
- $(Q) $(MKDIR_P) $(dir $@); \
- set -e; \
- FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \
- DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \
- $(CC) -MM $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) -o $@ $<; \
- sed -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \
- DEPLIST=`sed 's/ \\\\//;s/.*://;' < $@`; \
- echo $$DEPLIST | fmt -1 | sed 's/ //g;s/\(.*\)/\1:/' >> $@; \
- [ -s $@ ] || $(RM) $@
+%.d:
+.PRECIOUS: %.d
%.mo: %.po
@echo " [MSGFMT] $(<F)"
diff --git a/make.tmpl.in b/make.tmpl.in
index 024302ff2..2611dcd90 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -300,7 +300,7 @@ INCLUDES += -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)/include -include confi
#VDO_INCLUDES=-I@VDO_INCLUDE@
DEPS = $(top_builddir)/make.tmpl $(top_srcdir)/VERSION \
- $(top_builddir)/Makefile $(top_builddir)/include/configure.h
+ $(top_builddir)/Makefile
OBJECTS = $(SOURCES:%.c=%.o) $(CXXSOURCES:%.cpp=%.o)
POTFILES = $(SOURCES:%.c=%.pot)
@@ -436,14 +436,16 @@ endif
.LIBPATTERNS = lib%.so lib%.a
+DEPFLAGS=-MT $@ -MMD -MP -MF $*.d
+
# still needed in 2018 for 32bit builds
DEFS+=-D_FILE_OFFSET_BITS=64
-%.o: %.c
+%.o: %.c $(DEPS)
@echo " [CC] $(<F)"
- $(Q) $(CC) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
+ $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
-%.o: %.cpp
+%.o: %.cpp $(DEPS)
@echo " [CXX] $(<F)"
$(Q) $(CXX) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
@@ -501,17 +503,8 @@ $(LIB_STATIC): $(OBJECTS)
$(Q) $(RM) $@
$(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null
-%.d: %.c
- @echo " [DEP] $(<F)"
- $(Q) $(MKDIR_P) $(dir $@); \
- set -e; \
- FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \
- DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \
- $(CC) -MM $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) -o $@ $<; \
- sed -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \
- DEPLIST=`sed 's/ \\\\//;s/.*://;' < $@`; \
- echo $$DEPLIST | fmt -1 | sed 's/ //g;s/\(.*\)/\1:/' >> $@; \
- [ -s $@ ] || $(RM) $@
+%.d:
+.PRECIOUS: %.d
%.mo: %.po
@echo " [MSGFMT] $(<F)"
3 years, 2 months
main - makefiles: better logging
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=39eee85fff1930047a7...
Commit: 39eee85fff1930047a7dffe11183b4cafb6eb653
Parent: 456b659b4edfc758b5aa0b72af25677a4f5042ea
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 28 21:20:54 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
makefiles: better logging
Show only filename instead of full path name when building
in builddir != srcdir
---
daemons/dmeventd/Makefile.in | 2 +-
daemons/lvmlockd/Makefile.in | 2 +-
libdm/dm-tools/Makefile.in | 4 ++--
libdm/make.tmpl.in | 12 ++++++------
make.tmpl.in | 12 ++++++------
man/Makefile.in | 6 ++++--
scripts/Makefile.in | 10 +++++-----
tools/Makefile.in | 26 +++++++++++++-------------
8 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in
index 6bd36d032..99e4a816f 100644
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
@@ -82,7 +82,7 @@ CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
endif
install_include: $(srcdir)/libdevmapper-event.h
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] $(<F)"
$(Q) $(INSTALL_DATA) -D $< $(includedir)/$(<F)
install_pkgconfig: libdevmapper-event.pc
diff --git a/daemons/lvmlockd/Makefile.in b/daemons/lvmlockd/Makefile.in
index 9c0340145..bd577d1e6 100644
--- a/daemons/lvmlockd/Makefile.in
+++ b/daemons/lvmlockd/Makefile.in
@@ -56,7 +56,7 @@ lvmlockd: $(OBJECTS) $(top_builddir)/libdaemon/client/libdaemonclient.a \
lvmlockctl: lvmlockctl.o $(top_builddir)/libdaemon/client/libdaemonclient.a
@echo " [CC] $@"
- $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lvmlockctl.o $(INTERNAL_LIBS) $(LIBS)
+ $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(INTERNAL_LIBS) $(LIBS)
install_lvmlockd: lvmlockd
@echo " [INSTALL] $<"
diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in
index 15a9d8ef5..0b2ef9605 100644
--- a/libdm/dm-tools/Makefile.in
+++ b/libdm/dm-tools/Makefile.in
@@ -71,12 +71,12 @@ install_dmsetup_static: dmsetup.static
$(Q) $(LN_S) -f $(<F) $(staticdir)/dmstats
-dmfilemapd: $(LIB_SHARED) dmfilemapd.o
+dmfilemapd: dmfilemapd.o $(LIB_SHARED)
@echo " [CC] $@"
$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \
-o $@ $+ $(DMLIBS)
-dmfilemapd.static: $(LIB_STATIC) dmfilemapd.o
+dmfilemapd.static: dmfilemapd.o $(LIB_STATIC)
@echo " [CC] $@"
$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static \
-o $@ $+ $(DMLIBS) $(STATIC_LIBS)
diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index 46916d23f..1192e87e8 100644
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -401,11 +401,11 @@ endif
DEFS+=-D_FILE_OFFSET_BITS=64
%.o: %.c
- @echo " [CC] $<"
+ @echo " [CC] $(<F)"
$(Q) $(CC) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
%.o: %.cpp
- @echo " [CXX] $<"
+ @echo " [CXX] $(<F)"
$(Q) $(CXX) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
%.pot: %.c Makefile
@@ -413,7 +413,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
$(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@
%.so: %.o
- @echo " [CC] $<"
+ @echo " [CC] $(<F)"
$(Q) $(CC) -c $(CFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@
ifneq (,$(LIB_SHARED))
@@ -431,7 +431,7 @@ ifeq ("@LIB_SUFFIX@","dylib")
endif
$(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
- @echo " [LN] $<"
+ @echo " [LN] $(<F)"
$(Q) $(LN_S) -f $(<F) $@
CLEAN_TARGETS += $(LDDEPS) .exported_symbols_generated
@@ -463,7 +463,7 @@ $(LIB_STATIC): $(OBJECTS)
$(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null
%.d: %.c
- @echo " [DEP] $<"
+ @echo " [DEP] $(<F)"
$(Q) $(MKDIR_P) $(dir $@); \
set -e; \
FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \
@@ -475,7 +475,7 @@ $(LIB_STATIC): $(OBJECTS)
[ -s $@ ] || $(RM) $@
%.mo: %.po
- @echo " [MSGFMT] $<"
+ @echo " [MSGFMT] $(<F)"
$(Q) $(MSGFMT) -o $@ $<
CLEAN_TARGETS += \
diff --git a/make.tmpl.in b/make.tmpl.in
index 4bd089d24..024302ff2 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -440,19 +440,19 @@ endif
DEFS+=-D_FILE_OFFSET_BITS=64
%.o: %.c
- @echo " [CC] $<"
+ @echo " [CC] $(<F)"
$(Q) $(CC) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
%.o: %.cpp
- @echo " [CXX] $<"
+ @echo " [CXX] $(<F)"
$(Q) $(CXX) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(CXXFLAGS) $(CXXFLAGS_$@) $< -o $@
%.pot: %.c Makefile
- @echo " [CC] $@"
+ @echo " [CC] $(<F)"
$(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@
%.so: %.o
- @echo " [CC] $<"
+ @echo " [CC] $(<F)"
$(Q) $(CC) -c $(CFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@
ifneq (,$(LIB_SHARED))
@@ -502,7 +502,7 @@ $(LIB_STATIC): $(OBJECTS)
$(Q) $(AR) rsv $@ $(OBJECTS) > /dev/null
%.d: %.c
- @echo " [DEP] $<"
+ @echo " [DEP] $(<F)"
$(Q) $(MKDIR_P) $(dir $@); \
set -e; \
FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \
@@ -514,7 +514,7 @@ $(LIB_STATIC): $(OBJECTS)
[ -s $@ ] || $(RM) $@
%.mo: %.po
- @echo " [MSGFMT] $<"
+ @echo " [MSGFMT] $(<F)"
$(Q) $(MSGFMT) -o $@ $<
CLEAN_TARGETS += \
diff --git a/man/Makefile.in b/man/Makefile.in
index 6bca8cabc..786671e3a 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -112,7 +112,8 @@ $(MAN5) $(MAN7) $(MAN8) $(MAN8SO) $(MAN8DM) $(MAN8CLUSTER) $(MAN8SYSTEMD_GENERAT
# Test whether or not the man page generator works
$(TESTMAN): $(MANGENERATOR) Makefile
- - $(MANGENERATOR) --primary lvmconfig > $@
+ @echo " [TSTMAN] $@"
+ $(Q) - $(MANGENERATOR) --primary lvmconfig > $@
SEE_ALSO=$(srcdir)/see_also.end
@@ -246,7 +247,8 @@ install_all_man: install install_systemd_generators
# Copy generated man pages back to source tree as fallback for machines where generator doesn't work
pregenerated_man: all
- set -e ; for i in $(srcdir)/*.8_des; do \
+ @echo " [GENERATE] $^"
+ $(Q) set -e ; for i in $(srcdir)/*.8_des; do \
CMD=`basename $$i .8_des`; \
cat $${CMD}.8_gen > $(srcdir)/$$CMD.8_pregen ; \
done
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index e3843977e..e8f674282 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -59,7 +59,7 @@ install: install_lvm2 install_ocf install_device-mapper
# FIXME Customise for other distributions
install_initscripts:
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] initscripts"
$(Q) $(INSTALL_DIR) $(initdir)
ifeq ("@BUILD_DMEVENTD@", "yes")
$(Q) $(INSTALL_SCRIPT) lvm2_monitoring_init_red_hat $(initdir)/lvm2-monitor
@@ -81,12 +81,12 @@ lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(LVMINTERNAL_LIBS)
$(Q) $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) $(LVMINTERNAL_LIBS) $(LIBS)
install_systemd_generators:
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] systemd_generators"
$(Q) $(INSTALL_DIR) $(systemd_generator_dir)
$(Q) $(INSTALL_PROGRAM) lvm2_activation_generator_systemd_red_hat $(systemd_generator_dir)/lvm2-activation-generator
install_systemd_units: install_dbus_service
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] systemd_units"
$(Q) $(INSTALL_DIR) $(systemd_unit_dir)
$(Q) $(INSTALL_DATA) lvm2-pvscan.service $(systemd_unit_dir)/lvm2-pvscan@.service
ifeq ("@BUILD_DMEVENTD@", "yes")
@@ -114,7 +114,7 @@ endif
ifeq ("@BUILD_LVMDBUSD@", "yes")
install_dbus_service:
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] dbus_service"
$(Q) $(INSTALL_DIR) $(dbusconfdir)
$(Q) $(INSTALL_DIR) $(dbusservicedir)
$(Q) $(INSTALL_DATA) $(top_srcdir)/scripts/com.redhat.lvmdbus1.conf $(dbusconfdir)
@@ -124,7 +124,7 @@ install_systemd_units: install_dbus_service
endif
install_tmpfiles_configuration:
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] configuration"
$(Q) $(INSTALL_DIR) $(tmpfiles_dir)
$(Q) $(INSTALL_DATA) lvm2_tmpfiles_red_hat.conf $(tmpfiles_dir)/lvm2.conf
diff --git a/tools/Makefile.in b/tools/Makefile.in
index c89c75fa5..a099973e1 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -155,16 +155,16 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
@echo " [CC] $@"
$(Q) $(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \
$(CFLAGS) $(CLDFLAGS) -o $@ \
- @CLDWHOLEARCHIVE@ liblvm2cmd.a @CLDNOWHOLEARCHIVE@ \
+ @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ \
$(LVMINTERNAL_LIBS) $(LVMLIBS)
liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
@echo " [LN] $@"
$(Q) $(LN_S) -f $< $@
-.commands: $(srcdir)/commands.h $(srcdir)/cmdnames.h Makefile
- @echo " [CC] $<"
- $(Q) $(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
+.commands: $(srcdir)/cmdnames.h $(srcdir)/commands.h Makefile
+ @echo " [CC] $(<F)"
+ $(Q) $(CC) -E -P $< 2> /dev/null | \
$(EGREP) -v '^ *(|#.*|config|devtypes|dumpconfig|formats|fullreport|help|lastlog|lvmchange|lvpoll|pvdata|segtypes|systemid|tags|version) *$$' > .commands
command-count.h: $(srcdir)/command-lines.in Makefile
@@ -173,13 +173,13 @@ command-count.h: $(srcdir)/command-lines.in Makefile
( cat $(top_srcdir)/tools/license.inc && \
echo "/* Do not edit. This file is generated by the Makefile. */" && \
echo -n "#define COMMAND_COUNT " && \
- $(GREP) '^ID:' $(srcdir)/command-lines.in | $(WC) -l \
+ $(GREP) '^ID:' $< | $(WC) -l \
) > $@
cmds.h: $(srcdir)/command-lines.in Makefile
@echo " [GEN] $@"
$(Q) set -o pipefail && \
- ( cat $(top_srcdir)/tools/license.inc && \
+ ( cat $(srcdir)/license.inc && \
echo "/* Do not edit. This file is generated by the Makefile. */" && \
echo "cmd(CMD_NONE, none)" && \
$(GREP) '^ID:' $(srcdir)/command-lines.in | LANG=C $(SORT) -u | $(AWK) '{print "cmd(" $$2 "_CMD, " $$2 ")"}' && \
@@ -189,7 +189,7 @@ cmds.h: $(srcdir)/command-lines.in Makefile
command-lines-input.h: $(srcdir)/command-lines.in Makefile
@echo " [GEN] $@"
$(Q) set -o pipefail && \
- ( cat $(top_srcdir)/tools/license.inc && \
+ ( cat $(srcdir)/license.inc && \
echo "/* Do not edit. This file is generated by the Makefile. */" && \
echo -en "const char _command_input[] =\n\n\"" && \
$(EGREP) -v '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 'BEGIN {ORS = "\\n\"\n\""} //' && \
@@ -208,7 +208,7 @@ endif
install_tools_dynamic install_tools_static
install_cmdlib_include: $(srcdir)/lvm2cmd.h
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] $(<F)"
$(Q) $(INSTALL_DATA) -D $< $(includedir)/$(<F)
install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
@@ -223,12 +223,12 @@ install_cmdlib_static: liblvm2cmd-static.a
install_tools_dynamic: lvm .commands
@echo " [INSTALL] $<"
- $(Q) $(INSTALL_PROGRAM) -D lvm $(sbindir)/lvm
+ $(Q) $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
@echo Creating symbolic links for individual commands in $(sbindir)
- @for v in `cat .commands`; do \
- test -n "$(Q)" || echo "$(LN_S) -f lvm $(sbindir)/$$v"; \
- $(LN_S) -f lvm $(sbindir)/$$v; \
- done;
+ @cat .commands | while read v ; do \
+ test -n "$(Q)" || echo "$(LN_S) -f $(<F) $(sbindir)/$$v"; \
+ $(LN_S) -f $(<F) $(sbindir)/$$v; \
+ done
install_tools_static: lvm.static
@echo " [INSTALL] $<"
3 years, 2 months
main - makefiles: integrate DESTDIR
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=456b659b4edfc758b5a...
Commit: 456b659b4edfc758b5aa0b72af25677a4f5042ea
Parent: 8bfa4439e1c9a342d8e0d9ee36932f2a89721342
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Mar 2 16:29:07 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
makefiles: integrate DESTDIR
Always use lvmdbusdir with DESTDIR.
---
daemons/lvmdbusd/Makefile.in | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in
index da96c344b..56d5c6602 100644
--- a/daemons/lvmdbusd/Makefile.in
+++ b/daemons/lvmdbusd/Makefile.in
@@ -15,7 +15,7 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
-lvmdbusdir = $(python3dir)/lvmdbusd
+lvmdbusdir = $(DESTDIR)$(python3dir)/lvmdbusd
LVMDBUS_SRCDIR_FILES = \
automatedproperties.py \
@@ -53,16 +53,16 @@ include $(top_builddir)/make.tmpl
all:
$(Q) test -x $(LVMDBUSD) || chmod 755 $(LVMDBUSD)
-install_lvmdbusd:
+install_lvmdbusd: $(LVMDBUSD)
@echo " [INSTALL] $<"
$(Q) $(INSTALL_DIR) $(sbindir)
$(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir)
- $(Q) $(INSTALL_DIR) $(DESTDIR)$(lvmdbusdir)
- $(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(DESTDIR)$(lvmdbusdir))
- $(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(DESTDIR)$(lvmdbusdir)
+ $(Q) $(INSTALL_DIR) $(lvmdbusdir)
+ $(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(lvmdbusdir))
+ $(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(lvmdbusdir)
$(Q) PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbusdir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES)
- $(Q) $(CHMOD) 755 $(DESTDIR)$(lvmdbusdir)/__pycache__
- $(Q) $(CHMOD) 444 $(DESTDIR)$(lvmdbusdir)/__pycache__/*.py[co]
+ $(Q) $(CHMOD) 755 $(lvmdbusdir)/__pycache__
+ $(Q) $(CHMOD) 444 $(lvmdbusdir)/__pycache__/*.py[co]
install_lvm2: install_lvmdbusd
3 years, 2 months
main - makefiles: fix pofile generation
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8bfa4439e1c9a342d8e...
Commit: 8bfa4439e1c9a342d8e0d9ee36932f2a89721342
Parent: 4e976d9960f28278563ba7d0cd4c3795a4eba949
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Mar 2 01:10:25 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
makefiles: fix pofile generation
If there is any user of --enable-nls and wants to get
usable .po language file - use 'make pofile'
---
libdm/make.tmpl.in | 2 +-
make.tmpl.in | 2 +-
po/Makefile.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index 4a32b8f94..46916d23f 100644
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -410,7 +410,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
%.pot: %.c Makefile
@echo " [CC] $@"
- $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/include/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@
+ $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@
%.so: %.o
@echo " [CC] $<"
diff --git a/make.tmpl.in b/make.tmpl.in
index 2346bfda2..4bd089d24 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -449,7 +449,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
%.pot: %.c Makefile
@echo " [CC] $@"
- $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/include/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@
+ $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@
%.so: %.o
@echo " [CC] $<"
diff --git a/po/Makefile.in b/po/Makefile.in
index c8fa32ce7..6201f5965 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -19,7 +19,7 @@ LANGS=de
#TARGETS=$(LANGS:%=lvm2_%.mo) $(LANGS:%=dm_%.mo)
-DM_POSOURCES = $(top_builddir)/tools/dmsetup.pot $(top_builddir)/libdm/*.pot \
+DM_POSOURCES = $(top_builddir)/libdm/dm-tools/dmsetup.pot $(top_builddir)/libdm/*.pot \
$(top_builddir)/libdm/*/*.pot
LVM_POSOURCES = $(top_builddir)/tools/*.pot $(top_builddir)/lib/*/*.pot
3 years, 2 months
main - makefiles: cmirrord install through install_cluster
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4e976d9960f28278563...
Commit: 4e976d9960f28278563ba7d0cd4c3795a4eba949
Parent: e080e35c839ab7c166acfc40b03beb7c1c1b2e56
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Mar 2 00:23:45 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
makefiles: cmirrord install through install_cluster
There is not much left for this target...
---
daemons/cmirrord/Makefile.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/daemons/cmirrord/Makefile.in b/daemons/cmirrord/Makefile.in
index ff45225cd..301e6c6a2 100644
--- a/daemons/cmirrord/Makefile.in
+++ b/daemons/cmirrord/Makefile.in
@@ -33,6 +33,8 @@ cmirrord: $(OBJECTS)
$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \
$(LMLIBS) -L$(top_builddir)/libdm -ldevmapper $(LIBS)
-install: $(TARGETS)
+install_cluster: $(TARGETS)
@echo " [INSTALL] $<"
- $(Q) $(INSTALL_PROGRAM) -D cmirrord $(usrsbindir)/cmirrord
+ $(Q) $(INSTALL_PROGRAM) -D $< $(usrsbindir)/$(<F)
+
+install: install_cluster
3 years, 2 months
main - makefiles: sed
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e080e35c839ab7c166a...
Commit: e080e35c839ab7c166acfc40b03beb7c1c1b2e56
Parent: 520bd9356e9ecccfa824ca639c468fdcaf3b34c8
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Mar 2 21:21:38 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
makefiles: sed
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index a4278cade..6bc3a9414 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,7 +117,7 @@ rpm: dist
$(LN_S) -f $(abs_top_srcdir)/spec/packages.inc $(rpmbuilddir)/SOURCES
DM_VER=$$(cut -d- -f1 $(top_srcdir)/VERSION_DM);\
GIT_VER=$$(cd $(top_srcdir); git describe | cut -d- --output-delimiter=. -f2,3 || echo 0);\
- sed -e "s,\(device_mapper_version\) [0-9.]*$$,\1 $$DM_VER," \
+ $(SED) -e "s,\(device_mapper_version\) [0-9.]*$$,\1 $$DM_VER," \
-e "s,^\(Version:[^0-9%]*\)[0-9.]*$$,\1 $(LVM_VER)," \
-e "s,^\(Release:[^0-9%]*\)[0-9.]\+,\1 $$GIT_VER," \
$(top_srcdir)/spec/source.inc >$(rpmbuilddir)/SOURCES/source.inc
3 years, 2 months
main - makefiles: simplify and cleanup
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=520bd9356e9ecccfa82...
Commit: 520bd9356e9ecccfa824ca639c468fdcaf3b34c8
Parent: da29afe028c9709b5590a58bd727d1150df6a5ae
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 28 01:21:12 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
makefiles: simplify and cleanup
Print all installed man pages with INSTALL
Simplify distclean handling.
---
man/Makefile.in | 46 +++++++++++++++-------------------------------
1 file changed, 15 insertions(+), 31 deletions(-)
diff --git a/man/Makefile.in b/man/Makefile.in
index 3d4569673..6bca8cabc 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -29,14 +29,11 @@ DMFILEMAPDMAN = dmfilemapd.8
LVMPOLLDMAN = lvmpolld.8
LVMLOCKDMAN = lvmlockd.8 lvmlockctl.8
CMIRRORDMAN = cmirrord.8
-LVMCACHEMAN = lvmcache.7
-LVMTHINMAN = lvmthin.7
LVMDBUSDMAN = lvmdbusd.8
-LVMRAIDMAN = lvmraid.7
-LVMVDOMAN = lvmvdo.7
MAN5=lvm.conf.5
-MAN7=lvmsystemid.7 lvmreport.7
+MAN7=lvmsystemid.7 lvmreport.7 \
+ lvmcache.7 lvmraid.7 lvmthin.7 lvmvdo.7
MAN8=lvm.8 lvmdump.8 lvm-fullreport.8 lvm-lvpoll.8 \
lvcreate.8 lvchange.8 lvmconfig.8 lvconvert.8 lvdisplay.8 \
lvextend.8 lvreduce.8 lvremove.8 lvrename.8 lvresize.8 lvs.8 \
@@ -51,15 +48,7 @@ MAN8DM=dmsetup.8 dmstats.8
MAN8CLUSTER=
MAN8SYSTEMD_GENERATORS=lvm2-activation-generator.8
-ifeq ($(MAKECMDGOALS),all_man)
- MAN_ALL="yes"
-endif
-
-ifeq ($(MAKECMDGOALS),install_all_man)
- MAN_ALL="yes"
-endif
-
-ifeq ($(MAN_ALL),"yes")
+ifeq (,$(findstring $(MAKECMDGOALS), distclean all_man install_all_man))
MAN8+=$(FSADMMAN) $(LVMPOLLDMAN) $(LVMLOCKDMAN) $(LVMDBUSDMAN)
MAN8DM+=$(BLKDEACTIVATEMAN) $(DMEVENTDMAN) $(DMFILEMAPDMAN)
MAN8CLUSTER+=$(CMIRRORDMAN)
@@ -97,7 +86,6 @@ else
endif
endif
-MAN7+=$(LVMCACHEMAN) $(LVMTHINMAN) $(LVMRAIDMAN) $(LVMVDOMAN)
MAN5DIR=$(mandir)/man5
MAN7DIR=$(mandir)/man7
MAN8DIR=$(mandir)/man8
@@ -109,10 +97,6 @@ include $(top_builddir)/make.tmpl
CLEAN_TARGETS+=$(MAN5) $(MAN7) $(MAN8) $(MAN8SO) $(MAN8:%.8=%.8_gen) $(MAN8CLUSTER) \
$(MAN8SYSTEMD_GENERATORS) $(MAN8DM) $(TESTMAN)
-DISTCLEAN_TARGETS+=$(FSADMMAN) $(BLKDEACTIVATEMAN) $(DMEVENTDMAN) \
- $(LVMPOLLDMAN) $(LVMLOCKDMAN) $(CMIRRORDMAN) \
- $(LVMCACHEMAN) $(LVMTHINMAN) $(LVMDBUSDMAN) $(LVMRAIDMAN) \
- $(DMFILEMAPDMAN)
all: man device-mapper
@@ -223,38 +207,38 @@ $(MAN8SO): lvmconfig.8
$(Q) echo ".so $<" > $@
install_man5: $(MAN5)
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] $^"
$(Q) $(INSTALL) -d $(MAN5DIR)
- $(Q) $(INSTALL_DATA) $(MAN5) $(MAN5DIR)/
+ $(Q) $(INSTALL_DATA) $^ $(MAN5DIR)/
install_man7: $(MAN7)
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] $^"
$(Q) $(INSTALL) -d $(MAN7DIR)
- $(Q) $(INSTALL_DATA) $(MAN7) $(MAN7DIR)/
+ $(Q) $(INSTALL_DATA) $^ $(MAN7DIR)/
install_man8: $(MAN8) $(MAN8SO)
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] $^"
$(Q) $(INSTALL) -d $(MAN8DIR)
- $(Q) $(INSTALL_DATA) $(MAN8) $(MAN8SO) $(MAN8DIR)/
+ $(Q) $(INSTALL_DATA) $^ $(MAN8DIR)/
install_lvm2: install_man5 install_man7 install_man8
install_cluster: $(MAN8CLUSTER)
ifdef MAN8CLUSTER
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] $^"
$(Q) $(INSTALL) -d $(MAN8DIR)
- $(Q) $(INSTALL_DATA) $(MAN8CLUSTER) $(MAN8DIR)/
+ $(Q) $(INSTALL_DATA) $^ $(MAN8DIR)/
endif
install_device-mapper: $(MAN8DM)
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] $^"
$(Q) $(INSTALL) -d $(MAN8DIR)
- $(Q) $(INSTALL_DATA) $(MAN8DM) $(MAN8DIR)/
+ $(Q) $(INSTALL_DATA) $^ $(MAN8DIR)/
install_systemd_generators: $(MAN8SYSTEMD_GENERATORS)
- @echo " [INSTALL] $<"
+ @echo " [INSTALL] $^"
$(Q) $(INSTALL) -d $(MAN8DIR)
- $(Q) $(INSTALL_DATA) $(MAN8SYSTEMD_GENERATORS) $(MAN8DIR)/
+ $(Q) $(INSTALL_DATA) $^ $(MAN8DIR)/
install: install_lvm2 install_device-mapper install_cluster
3 years, 2 months
main - makefiles: drop invalid dependency on all
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=da29afe028c9709b559...
Commit: da29afe028c9709b5590a58bd727d1150df6a5ae
Parent: 5509e764f1c542768b2dd5e39d2b900a96a3b281
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 28 01:20:28 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Mar 2 22:54:40 2021 +0100
makefiles: drop invalid dependency on all
---
make.tmpl.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/make.tmpl.in b/make.tmpl.in
index 35d8267df..2346bfda2 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -337,8 +337,8 @@ LVMINTERNAL_LIBS = $(top_builddir)/lib/liblvm-internal.a $(INTERNAL_LIBS)
all: $(SUBDIRS) $(TARGETS)
-install: all $(SUBDIRS.install)
-install_cluster: all $(SUBDIRS.install_cluster)
+install: $(SUBDIRS.install)
+install_cluster: $(SUBDIRS.install_cluster)
install_device-mapper: $(SUBDIRS.install_device-mapper)
install_device_mapper: install_device-mapper
install_lvm2: $(SUBDIRS.install_lvm2)
3 years, 2 months