diff options
author | David Teigland <teigland@redhat.com> | 2017-02-09 10:04:38 -0600 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2017-02-09 13:29:01 -0600 |
commit | 485e2999db1f42224794dfb1178f4f78dd2d72ab (patch) | |
tree | 72ea2ab380c8f428bd752d8443448d7cd5af3cdb | |
parent | fec9641436db7a4ef02f7ffe7f35d4c1f839acf7 (diff) | |
download | lvm2-485e2999db1f42224794dfb1178f4f78dd2d72ab.tar.gz |
makefile: fixes, improvements, see also section
-rw-r--r-- | doc/license.txt | 14 | ||||
-rw-r--r-- | man/Makefile.in | 24 | ||||
-rw-r--r-- | man/see_also.end | 67 | ||||
-rw-r--r-- | tools/Makefile.in | 36 | ||||
-rwxr-xr-x | tools/command-lines-input.sh | 11 |
5 files changed, 113 insertions, 39 deletions
diff --git a/doc/license.txt b/doc/license.txt new file mode 100644 index 000000000..5ba3e66d4 --- /dev/null +++ b/doc/license.txt @@ -0,0 +1,14 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved. + * + * This file is part of LVM2. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ diff --git a/man/Makefile.in b/man/Makefile.in index 12a9306f9..45907bc23 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -46,8 +46,6 @@ MAN8GEN=lvm-config.8 lvm-dumpconfig.8 lvm-fullreport.8 lvm-lvpoll.8 \ vgrename.8 vgs.8 vgscan.8 vgsplit.8 \ lvmsar.8 lvmsadc.8 lvmdiskscan.8 lvmchange.8 -MAN8+=$(MAN8GEN) - ifeq ($(MAKECMDGOALS),all_man) MAN_ALL="yes" endif @@ -117,8 +115,8 @@ MAN8DIR=$(mandir)/man8 include $(top_builddir)/make.tmpl -CLEAN_TARGETS+=$(MAN5) $(MAN7) $(MAN8) $(MAN8CLUSTER) \ - $(MAN8SYSTEMD_GENERATORS) $(MAN8DM) +CLEAN_TARGETS+=$(MAN5) $(MAN7) $(MAN8) $(MAN8GEN) $(MAN8CLUSTER) \ + $(MAN8SYSTEMD_GENERATORS) $(MAN8DM) *.gen man-generator DISTCLEAN_TARGETS+=$(FSADMMAN) $(BLKDEACTIVATEMAN) $(DMEVENTDMAN) \ $(LVMETADMAN) $(LVMPOLLDMAN) $(LVMLOCKDMAN) $(CLVMDMAN) $(CMIRRORDMAN) \ $(LVMCACHEMAN) $(LVMTHINMAN) $(LVMDBUSDMAN) $(LVMRAIDMAN) @@ -129,11 +127,11 @@ all: man device-mapper device-mapper: $(MAN8DM) -man: $(MAN5) $(MAN7) $(MAN8) $(MAN8CLUSTER) $(MAN8SYSTEMD_GENERATORS) +man: $(MAN5) $(MAN7) $(MAN8) $(MAN8GEN) $(MAN8CLUSTER) $(MAN8SYSTEMD_GENERATORS) all_man: man -$(MAN5) $(MAN7) $(MAN8) $(MAN8DM) $(MAN8CLUSTER): Makefile +$(MAN5) $(MAN7) $(MAN8) $(MAN8GEN) $(MAN8DM) $(MAN8CLUSTER): Makefile Makefile: Makefile.in @: @@ -144,14 +142,15 @@ Makefile: Makefile.in *) echo "Creating $@" ; $(SED) -e "s+#VERSION#+$(LVM_VERSION)+;s+#DEFAULT_SYS_DIR#+$(DEFAULT_SYS_DIR)+;s+#DEFAULT_ARCHIVE_DIR#+$(DEFAULT_ARCHIVE_DIR)+;s+#DEFAULT_BACKUP_DIR#+$(DEFAULT_BACKUP_DIR)+;s+#DEFAULT_PROFILE_DIR#+$(DEFAULT_PROFILE_DIR)+;s+#DEFAULT_CACHE_DIR#+$(DEFAULT_CACHE_DIR)+;s+#DEFAULT_LOCK_DIR#+$(DEFAULT_LOCK_DIR)+;s+#CLVMD_PATH#+@CLVMD_PATH@+;s+#LVM_PATH#+@LVM_PATH@+;s+#DEFAULT_RUN_DIR#+@DEFAULT_RUN_DIR@+;s+#DEFAULT_PID_DIR#+@DEFAULT_PID_DIR@+;s+#SYSTEMD_GENERATOR_DIR#+$(SYSTEMD_GENERATOR_DIR)+;s+#DEFAULT_MANGLING#+$(DEFAULT_MANGLING)+;" $< > $@ ;; \ esac -generator: - $(CC) -DMAN_PAGE_GENERATOR $(top_builddir)/tools/command.c -o man-generator +man-generator: + $(CC) -DMAN_PAGE_GENERATOR -I$(top_builddir)/tools $(CFLAGS) $(top_srcdir)/tools/command.c -o $@ -$(MAN8GEN): generator +$(MAN8GEN): man-generator echo "Generating $@" ; - ./man-generator `basename -s .8 $@` > $@.in - if [ -f $@.end ]; then cat $@.end >> $@.in; fi; - $(SED) -e "s+#VERSION#+$(LVM_VERSION)+;s+#DEFAULT_SYS_DIR#+$(DEFAULT_SYS_DIR)+;s+#DEFAULT_ARCHIVE_DIR#+$(DEFAULT_ARCHIVE_DIR)+;s+#DEFAULT_BACKUP_DIR#+$(DEFAULT_BACKUP_DIR)+;s+#DEFAULT_PROFILE_DIR#+$(DEFAULT_PROFILE_DIR)+;s+#DEFAULT_CACHE_DIR#+$(DEFAULT_CACHE_DIR)+;s+#DEFAULT_LOCK_DIR#+$(DEFAULT_LOCK_DIR)+;s+#CLVMD_PATH#+@CLVMD_PATH@+;s+#LVM_PATH#+@LVM_PATH@+;s+#DEFAULT_RUN_DIR#+@DEFAULT_RUN_DIR@+;s+#DEFAULT_PID_DIR#+@DEFAULT_PID_DIR@+;s+#SYSTEMD_GENERATOR_DIR#+$(SYSTEMD_GENERATOR_DIR)+;s+#DEFAULT_MANGLING#+$(DEFAULT_MANGLING)+;" $@.in > $@ + ./man-generator $(basename $@) > $@.gen + if [ -f $(top_srcdir)/man/$@.end ]; then cat $(top_srcdir)/man/$@.end >> $@.gen; fi; + cat $(top_srcdir)/man/see_also.end >> $@.gen + $(SED) -e "s+#VERSION#+$(LVM_VERSION)+;s+#DEFAULT_SYS_DIR#+$(DEFAULT_SYS_DIR)+;s+#DEFAULT_ARCHIVE_DIR#+$(DEFAULT_ARCHIVE_DIR)+;s+#DEFAULT_BACKUP_DIR#+$(DEFAULT_BACKUP_DIR)+;s+#DEFAULT_PROFILE_DIR#+$(DEFAULT_PROFILE_DIR)+;s+#DEFAULT_CACHE_DIR#+$(DEFAULT_CACHE_DIR)+;s+#DEFAULT_LOCK_DIR#+$(DEFAULT_LOCK_DIR)+;s+#CLVMD_PATH#+@CLVMD_PATH@+;s+#LVM_PATH#+@LVM_PATH@+;s+#DEFAULT_RUN_DIR#+@DEFAULT_RUN_DIR@+;s+#DEFAULT_PID_DIR#+@DEFAULT_PID_DIR@+;s+#SYSTEMD_GENERATOR_DIR#+$(SYSTEMD_GENERATOR_DIR)+;s+#DEFAULT_MANGLING#+$(DEFAULT_MANGLING)+;" $@.gen > $@ install_man5: $(MAN5) $(INSTALL) -d $(MAN5DIR) @@ -164,6 +163,7 @@ install_man7: $(MAN7) install_man8: $(MAN8) $(MAN8GEN) $(INSTALL) -d $(MAN8DIR) $(INSTALL_DATA) $(MAN8) $(MAN8DIR)/ + $(INSTALL_DATA) $(MAN8GEN) $(MAN8DIR)/ install_lvm2: install_man5 install_man7 install_man8 diff --git a/man/see_also.end b/man/see_also.end new file mode 100644 index 000000000..70eeb89cf --- /dev/null +++ b/man/see_also.end @@ -0,0 +1,67 @@ +.SH SEE ALSO + +.BR lvm (8) +.BR lvm.conf (5) +.BR lvmconfig (8) + +.BR pvchange (8) +.BR pvck (8) +.BR pvcreate (8) +.BR pvdisplay (8) +.BR pvmove (8) +.BR pvremove (8) +.BR pvresize (8) +.BR pvs (8) +.BR pvscan (8) + +.BR vgcfgbackup (8) +.BR vgcfgrestore (8) +.BR vgchange (8) +.BR vgck (8) +.BR vgcreate (8) +.BR vgconvert (8) +.BR vgdisplay (8) +.BR vgexport (8) +.BR vgextend (8) +.BR vgimport (8) +.BR vgimportclone (8) +.BR vgmerge (8) +.BR vgmknodes (8) +.BR vgreduce (8) +.BR vgremove (8) +.BR vgrename (8) +.BR vgs (8) +.BR vgscan (8) +.BR vgsplit (8) + +.BR lvcreate (8) +.BR lvchange (8) +.BR lvconvert (8) +.BR lvdisplay (8) +.BR lvextend (8) +.BR lvreduce (8) +.BR lvremove (8) +.BR lvrename (8) +.BR lvresize (8) +.BR lvs (8) +.BR lvscan (8) + +.BR lvm2-activation-generator (8) +.BR blkdeactivate (8) +.BR lvmdump (8) + +.BR dmeventd (8) +.BR lvmetad (8) +.BR lvmpolld (8) +.BR lvmlockd (8) +.BR lvmlockctl (8) +.BR clvmd (8) +.BR cmirrord (8) +.BR lvmdbusd (8) + +.BR lvmsystemid (7) +.BR lvmreport (7) +.BR lvmraid (7) +.BR lvmthin (7) +.BR lvmcache (7) + diff --git a/tools/Makefile.in b/tools/Makefile.in index cb3c76eb7..2d1013f50 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,3 @@ - # # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. # Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved. @@ -78,9 +77,6 @@ SOURCES2 =\ TARGETS =\ .commands \ - cmds.h \ - command-count.h \ - command-lines-input.h \ liblvm2cmd.a \ lvm @@ -105,7 +101,7 @@ CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) $(TARGETS_DM) \ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) lvm-static.o \ liblvm2cmd-static.a dmsetup.static lvm.static \ $(LDDEPS) .exported_symbols_generated \ - command-lines-input.h command-lines-count.h + cmds.h command-lines-input.h command-count.h ifeq ("@CMDLIB@", "yes") TARGETS += liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) @@ -185,26 +181,34 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX) WC = /usr/bin/wc GREP = /bin/grep SORT = /bin/sort -CUT = /bin/cut -SED = /bin/sed - -# FIXME Add licence text from template file command-count.h: $(srcdir)/command-lines.in Makefile set -o pipefail && \ - (echo -n "#define COMMAND_COUNT " && \ - $(GREP) '^ID:' $(srcdir)/command-lines.in | $(WC) -l \ + ( cat $(top_builddir)/doc/license.txt && \ + echo "/* Do not edit. This file is generated by the Makefile. */" && \ + echo -n "#define COMMAND_COUNT " && \ + $(GREP) '^ID:' $(srcdir)/command-lines.in | $(WC) -l \ ) > $@ cmds.h: $(srcdir)/command-lines.in Makefile - echo "cmd(CMD_NONE, none)" > cmds.h - cat command-lines.in | grep '^ID:' | sort | uniq | awk '{print "cmd(" $$2 "_CMD, " $$2 ")"}' >> cmds.h - echo "cmd(CMD_COUNT, count)" >> cmds.h + set -o pipefail && \ + ( cat $(top_builddir)/doc/license.txt && \ + echo "/* Do not edit. This file is generated by the Makefile. */" && \ + echo "cmd(CMD_NONE, none)" && \ + $(GREP) '^ID:' $(srcdir)/command-lines.in | $(SORT) -u | $(AWK) '{print "cmd(" $$2 "_CMD, " $$2 ")"}' && \ + echo "cmd(CMD_COUNT, count)" \ + ) > $@ command-lines-input.h: $(srcdir)/command-lines.in Makefile - $(srcdir)/command-lines-input.sh + set -o pipefail && \ + ( cat $(top_builddir)/doc/license.txt && \ + echo "/* Do not edit. This file is generated by the Makefile. */" && \ + echo -en "const char _command_input[] =\n\n\"" && \ + $(GREP) -Ev '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 'BEGIN {ORS = "\\n\"\n\""} //' && \ + echo "\\n\";" \ + ) > $@ -$(SOURCES:%.c=%.d): command-lines-input.h command-count.h cmds.h +$(SOURCES:%.c=%.d) $(SOURCES2:%.c=%.d): command-lines-input.h command-count.h cmds.h ifneq ("$(CFLOW_CMD)", "") CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) diff --git a/tools/command-lines-input.sh b/tools/command-lines-input.sh deleted file mode 100755 index 3e0dafb44..000000000 --- a/tools/command-lines-input.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -cat command-lines.in | grep -v '^#' | grep -v '\-\-\-' | grep -v '^$' > command-lines.tmp -echo "" >> command-lines.tmp -echo "const char _command_input[] =" > command-lines-input.h -while read -r line; do - echo "" >> command-lines-input.h - printf '\"%s\\n\"' "$line" >> command-lines-input.h -done < command-lines.tmp -echo ";" >> command-lines-input.h - |