summaryrefslogtreecommitdiff
path: root/libdm
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2021-02-28 21:20:54 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2021-03-02 22:54:40 +0100
commit39eee85fff1930047a7dffe11183b4cafb6eb653 (patch)
tree2e14bb7ee026fa0c5cb11d14088462d41196272d /libdm
parent456b659b4edfc758b5aa0b72af25677a4f5042ea (diff)
downloadlvm2-39eee85fff1930047a7dffe11183b4cafb6eb653.tar.gz
makefiles: better logging
Show only filename instead of full path name when building in builddir != srcdir
Diffstat (limited to 'libdm')
-rw-r--r--libdm/dm-tools/Makefile.in4
-rw-r--r--libdm/make.tmpl.in12
2 files changed, 8 insertions, 8 deletions
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 += \