makefiles: better logging

Show only filename instead of full path name when building
in builddir != srcdir

1 files changed, 13 insertions, 13 deletions

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] $<"