Skip to content

Commit

Permalink
Enable silent build rules by default
Browse files Browse the repository at this point in the history
Enable silent build rules by default.

You can still use verbose build rules by using any of the following
methods:

  * run "configure" with the "--disable-silent-rules" argument
  * run "make" with the "V=1" argument

Not all make recipes have been converted to be silent, but the
majority are standard recipes which are now silent.
  • Loading branch information
ndim committed Sep 18, 2024
1 parent 6df6fbb commit 569a7f4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dnl libtool 2014-10-27 2.4.3
dnl libtool 2011-10-18 2.4.2


AM_SILENT_RULES([no])
AM_SILENT_RULES([yes])


dnl Flag all GP_ strings in result as error unless specifically allowed.
Expand Down
4 changes: 2 additions & 2 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ LOCAL_CLEAN =
# FIXME: Depend on source files.
DOXYGEN_STAMPS += $(HTML_APIDOC_DIR).stamp
$(HTML_APIDOC_DIR).stamp: Doxyfile
doxygen Doxyfile
echo > $@
$(AM_V_GEN)doxygen $$($(AM_V_P) || printf "%s" "-q") Doxyfile
@: > $@

$(HTML_APIDOC_DIR).tar.gz: $(HTML_APIDOC_DIR).stamp
(cd $(DOXYGEN_OUTPUT_DIR) && $(AMTAR) chof - $(HTML_APIDOC_DIR) | GZIP=--best gzip -c) > $@
Expand Down
2 changes: 1 addition & 1 deletion libgphoto2_port/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ AM_INIT_AUTOMAKE([
])


AM_SILENT_RULES([no])
AM_SILENT_RULES([yes])


AC_LANG([C])
Expand Down
11 changes: 5 additions & 6 deletions libgphoto2_port/gphoto-m4/gp-gettext-setup.m4
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,20 @@ dnl if the consistency check has been successful, and have "make all" abort
dnl Error: Inconsistent values for GETTEXT_PACKAGE_LIBGPHOTO2 and po/Makevars DOMAIN.
dnl if the consistency check has failed.
dnl
m4_pattern_allow([AM_V_P])dnl
cat >>${GP_GETTEXT_SETUP_MK} <<EOF
@set -ex; \\
@set -e; \\
MAKEVARS_FILE="\$\$(test -f '$3/Makevars' || echo '\$(srcdir)/')$3/Makevars"; \\
MAKEVARS_DOMAIN="\$\$(\$(SED) -n 's/^DOMAIN \\{0,\\}= \\{0,\\}//p' "\$\$MAKEVARS_FILE")"; \\
MAKE_TIME_DOMAIN="\$($1)"; \\
echo " MAKEVARS_DOMAIN=\$\$MAKEVARS_DOMAIN"; \\
echo " $1=\$($1)"; \\
if test "x\$\$MAKEVARS_DOMAIN" = "x\$($1)"; then \\
echo "Good: Matching gettext domain values (\$($1))"; \\
if \$(AM_V_P); then printf " %-7s %s\n" CHECK "Good: Matching gettext domain values (\$($1))"; fi; \\
true; \\
elif test "x\$\$USE_NLS" = xyes; then \\
echo "Error: Mismatching gettext domain values (\$($1) vs \$\${MAKEVARS_DOMAIN})"; \\
printf " %-7s %s\n" CHECK "Error: Mismatching gettext domain values (\$($1) vs \$\${MAKEVARS_DOMAIN})"; \\
false; \\
else \\
echo "Warning: Mismatching gettext domain values (\$($1) vs \$\${MAKEVARS_DOMAIN})"; \\
printf " %-7s %s\n" CHECK "Warning: Mismatching gettext domain values (\$($1) vs \$\${MAKEVARS_DOMAIN})"; \\
true; \\
fi
EOF
Expand Down

0 comments on commit 569a7f4

Please sign in to comment.