simplified silent mode

diff --git a/lib/Makefile b/lib/Makefile
index 2f6e21c280827d840b72eccb817c2a8bb7132d9c..fc9d6a6ceb86247a3da472d78b8154fbe227e6fb 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -8,7 +8,8 @@
 # You may select, at your option, one of the above-listed licenses.
 # ################################################################
 
-Q = $(if $(filter 1,$(V) $(VERBOSE)),,@)
+# define silent mode as default (verbose mode with V=1 or VERBOSE=1)
+$(V)$(VERBOSE).SILENT:
 
 # When cross-compiling from linux to windows,
 # you might need to specify this as "Windows."
@@ -224,7 +225,7 @@ ifeq ($(BUILD_DIR),0)
 
 .PHONY: libzstd.a  # not the actual recipe
 libzstd.a:
-       $(Q)$(MAKE) --no-print-directory $@ \
+       $(MAKE) --no-print-directory $@ \
         BUILD_DIR=obj/conf_$(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) | $(HASH) | head -c 16) \
         CPPFLAGS="$(CPPFLAGS)"
 
@@ -238,11 +239,11 @@ $(ZSTD_STATLIB): ARFLAGS ?= rcs
 $(ZSTD_STATLIB): | $(ZSTD_STATLIB_DIR)
 $(ZSTD_STATLIB): $(ZSTD_STATLIB_OBJ)
        @echo compiling static library
-       $(Q)$(AR) $(ARFLAGS) $@ $^
+       $(AR) $(ARFLAGS) $@ $^
 
 .PHONY: libzstd.a  # must be run every time
 libzstd.a: $(ZSTD_STATLIB)
-       $(Q)ln -sf $< $@
+       ln -sf $< $@
 
 endif
 
@@ -264,7 +265,7 @@ ifeq ($(BUILD_DIR),0)
 
 .PHONY: $(LIBZSTD)  # not the actual recipe
 $(LIBZSTD):
-       $(Q)$(MAKE) --no-print-directory $@ \
+       $(MAKE) --no-print-directory $@ \
         BUILD_DIR=obj/conf_$(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) | $(HASH) | head -c 16) \
         CPPFLAGS="$(CPPFLAGS)" \
         CFLAGS="$(CFLAGS)" \
@@ -280,14 +281,14 @@ ZSTD_DYNLIB_OBJ := $(addprefix $(ZSTD_DYNLIB_DIR)/,$(ZSTD_LOCAL_OBJ))
 $(ZSTD_DYNLIB): | $(ZSTD_DYNLIB_DIR)
 $(ZSTD_DYNLIB): $(ZSTD_DYNLIB_OBJ)
        @echo compiling dynamic library $(LIBVER)
-       $(Q)$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
+       $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
        @echo creating versioned links
-       $(Q)ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
-       $(Q)ln -sf $@ libzstd.$(SHARED_EXT)
+       ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
+       ln -sf $@ libzstd.$(SHARED_EXT)
 
 .PHONY: $(LIBZSTD)  # must be run every time
 $(LIBZSTD): $(ZSTD_DYNLIB)
-       $(Q)ln -sf $< $@
+       ln -sf $< $@
 
 endif  # if BUILD_DIR
 endif  # if windows
@@ -318,15 +319,15 @@ DEPFLAGS = -MT $@ -MMD -MP -MF
 
 $(ZSTD_DYNLIB_DIR)/%.o : %.c $(ZSTD_DYNLIB_DIR)/%.d | $(ZSTD_DYNLIB_DIR)
        @echo $@
-       $(Q)$(COMPILE.c) $(DEPFLAGS) $(ZSTD_DYNLIB_DIR)/$*.d $(OUTPUT_OPTION) $<
+       $(COMPILE.c) $(DEPFLAGS) $(ZSTD_DYNLIB_DIR)/$*.d $(OUTPUT_OPTION) $<
 
 $(ZSTD_STATLIB_DIR)/%.o : %.c $(ZSTD_STATLIB_DIR)/%.d | $(ZSTD_STATLIB_DIR)
        @echo $@
-       $(Q)$(COMPILE.c) $(DEPFLAGS) $(ZSTD_STATLIB_DIR)/$*.d $(OUTPUT_OPTION) $<
+       $(COMPILE.c) $(DEPFLAGS) $(ZSTD_STATLIB_DIR)/$*.d $(OUTPUT_OPTION) $<
 
 MKDIR ?= mkdir
 $(BUILD_DIR) $(ZSTD_DYNLIB_DIR) $(ZSTD_STATLIB_DIR):
-       $(Q)$(MKDIR) -p $@
+       $(MKDIR) -p $@
 
 DEPFILES := $(ZSTD_DYNLIB_OBJ:.o=.d) $(ZSTD_STATLIB_OBJ:.o=.d)
 $(DEPFILES):
@@ -341,13 +342,13 @@ libzstd-nomt: LDFLAGS += -shared -fPIC -fvisibility=hidden
 libzstd-nomt: $(ZSTD_NOMT_FILES)
        @echo compiling single-thread dynamic library $(LIBVER)
        @echo files : $(ZSTD_NOMT_FILES)
-       $(Q)$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
+       $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
 
 clean:
-       $(Q)$(RM) -r *.dSYM   # macOS-specific
-       $(Q)$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
-       $(Q)$(RM) dll/libzstd.dll dll/libzstd.lib libzstd-nomt*
-       $(Q)$(RM) -r obj/*
+       $(RM) -r *.dSYM   # macOS-specific
+       $(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
+       $(RM) dll/libzstd.dll dll/libzstd.lib libzstd-nomt*
+       $(RM) -r obj/*
        @echo Cleaning library completed
 
 #-----------------------------------------------------------------------------
@@ -408,7 +409,7 @@ INSTALL_DATA    ?= $(INSTALL) -m 644
 libzstd.pc:
 libzstd.pc: libzstd.pc.in
        @echo creating pkgconfig
-       $(Q)@sed $(SED_ERE_OPT) -e 's|@PREFIX@|$(PREFIX)|' \
+       @sed $(SED_ERE_OPT) -e 's|@PREFIX@|$(PREFIX)|' \
           -e 's|@LIBDIR@|$(PCLIBDIR)|' \
           -e 's|@INCLUDEDIR@|$(PCINCDIR)|' \
           -e 's|@VERSION@|$(VERSION)|' \
@@ -418,37 +419,37 @@ install: install-pc install-static install-shared install-includes
        @echo zstd static and shared library installed
 
 install-pc: libzstd.pc
-       $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/
-       $(Q)$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/
+       $(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/
+       $(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/
 
 install-static: libzstd.a
        @echo Installing static library
-       $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
-       $(Q)$(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
+       $(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR)
 
 install-shared: libzstd
        @echo Installing shared library
-       $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
-       $(Q)$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
-       $(Q)ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
-       $(Q)ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
+       $(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
+       ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
+       ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
 
 install-includes:
        @echo Installing includes
-       $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/
-       $(Q)$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)
-       $(Q)$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
-       $(Q)$(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/
+       $(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
 
 uninstall:
-       $(Q)$(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
-       $(Q)$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
-       $(Q)$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
-       $(Q)$(RM) $(DESTDIR)$(LIBDIR)/$(LIBZSTD)
-       $(Q)$(RM) $(DESTDIR)$(PKGCONFIGDIR)/libzstd.pc
-       $(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
-       $(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
-       $(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
+       $(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
+       $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
+       $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
+       $(RM) $(DESTDIR)$(LIBDIR)/$(LIBZSTD)
+       $(RM) $(DESTDIR)$(PKGCONFIGDIR)/libzstd.pc
+       $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
+       $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
+       $(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
        @echo zstd libraries successfully uninstalled
 
 endif