]> git.ipfire.org Git - thirdparty/elfutils.git/commitdiff
projects / thirdparty / elfutils.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0e3ce39)
Improve AM_SILENT_RULES coverage
authorJosh Stone <jistone@redhat.com>
Mon, 5 Oct 2015 18:04:15 +0000 (11:04 -0700)
committerJosh Stone <jistone@redhat.com>
Wed, 7 Oct 2015 00:50:10 +0000 (17:50 -0700)
Note, elfutils does not explicitly enable AM_SILENT_RULES.  It's only
available starting from automake 1.11, but starting from automake 1.13
silent rules are always generated, defaulting to verbose.  $(AM_V_foo)
additions should be no-ops on systems that don't support silent rules.

To be silent, use "./configure --enable-silent-rules" or "make V=0".

Signed-off-by: Josh Stone <jistone@redhat.com>
16 files changed:
backends/ChangeLog patch | blob | blame | history
backends/Makefile.am patch | blob | blame | history
config/ChangeLog patch | blob | blame | history
config/eu.am patch | blob | blame | history
libasm/ChangeLog patch | blob | blame | history
libasm/Makefile.am patch | blob | blame | history
libcpu/ChangeLog patch | blob | blame | history
libcpu/Makefile.am patch | blob | blame | history
libdw/ChangeLog patch | blob | blame | history
libdw/Makefile.am patch | blob | blame | history
libelf/ChangeLog patch | blob | blame | history
libelf/Makefile.am patch | blob | blame | history
src/ChangeLog patch | blob | blame | history
src/Makefile.am patch | blob | blame | history
tests/ChangeLog patch | blob | blame | history
tests/Makefile.am patch | blob | blame | history

diff --git a/backends/ChangeLog b/backends/ChangeLog
index 791b9db90724ef3a2813cdaae33b3649578b8515..e6f376336eff5c6ebc2ff136973c80b75800f45e 100644 (file)
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-05  Josh Stone  <jistone@redhat.com>
+
+       * Makefile.am (libebl_%.so): Add AM_V_at and AM_V_CCLD silencers.
+
 2015-10-06  Jose E. Marchesi  <jose.marchesi@oracle.com>
 
        * sparc_attrs.c: New file.
diff --git a/backends/Makefile.am b/backends/Makefile.am
index cefe5ebb9fc0c69601dc80b834ae299ac7e62bed..f7002fb569641c887afe0bd28deb8ae0b20d9195 100644 (file)
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -114,9 +114,9 @@ am_libebl_tilegx_pic_a_OBJECTS = $(tilegx_SRCS:.c=.os)
 
 libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw)
        @rm -f $(@:.so=.map)
-       echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' \
+       $(AM_V_at)echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' \
          > $(@:.so=.map)
-       $(LINK) -shared -o $(@:.map=.so) \
+       $(AM_V_CCLD)$(LINK) -shared -o $(@:.map=.so) \
                -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
                -Wl,--version-script,$(@:.so=.map) \
                -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
diff --git a/config/ChangeLog b/config/ChangeLog
index 1037b08017dfdd8481374eac1a180387ca8fcbc6..ba5cb387ab23adf61701a866d41aeff5664e056e 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-05  Josh Stone  <jistone@redhat.com>
+
+       * eu.am (%.os): Add AM_V_CC silencers.
+
 2015-09-24  Jose E. Marchesi  <jose.marchesi@oracle.com>
 
        * eu.am (%.os): Use -fPIC instead of -fpic to avoid relocation
diff --git a/config/eu.am b/config/eu.am
index 1368ae533bdf99236d5b080e19612d27a89eb530..6ad8f822bdb37f6c7bf0f563c8a51b3abfb4c422 100644 (file)
--- a/config/eu.am
+++ b/config/eu.am
@@ -55,14 +55,14 @@ endif
 
 %.os: %.c %.o
 if AMDEP
-       if $(COMPILE.os) -c -o $@ -fPIC $(DEFS.os) -MT $@ -MD -MP \
+       $(AM_V_CC)if $(COMPILE.os) -c -o $@ -fPIC $(DEFS.os) -MT $@ -MD -MP \
          -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
        then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \
             rm -f "$(DEPDIR)/$*.Tpo"; \
        else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
        fi
 else
-       $(COMPILE.os) -c -o $@ -fPIC $(DEFS.os) $<
+       $(AM_V_CC)$(COMPILE.os) -c -o $@ -fPIC $(DEFS.os) $<
 endif
 
 CLEANFILES = *.gcno *.gcda
diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index 7433cb72db0c733815053ec351f6176018403e88..beb6211c58943ac93fd6d5da3c6c77fe35f6d01f 100644 (file)
--- a/libasm/ChangeLog
+++ b/libasm/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-05  Josh Stone  <jistone@redhat.com>
+
+       * Makefile.am (libasm.so): Add AM_V_CCLD and AM_V_at silencers.
+
 2015-09-23  Mark Wielaard  <mjw@redhat.com>
 
        * asm_align.c (__libasm_ensure_section_space): Mark as
diff --git a/libasm/Makefile.am b/libasm/Makefile.am
index 6ea2a8e842359a3bf38d1d4e7ee952c0df7accad..a4bf293a4806b6d4cb7717b227aa6b1fb3bb42fc 100644 (file)
--- a/libasm/Makefile.am
+++ b/libasm/Makefile.am
@@ -62,12 +62,12 @@ endif
 
 libasm_so_SOURCES =
 libasm.so$(EXEEXT): libasm_pic.a libasm.map
-       $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
+       $(AM_V_CCLD)$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
                -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \
                -Wl,--soname,$@.$(VERSION) \
                ../libebl/libebl.a ../libelf/libelf.so  $(libasm_so_LDLIBS)
        @$(textrel_check)
-       ln -fs $@ $@.$(VERSION)
+       $(AM_V_at)ln -fs $@ $@.$(VERSION)
 
 install: install-am libasm.so
        $(mkinstalldirs) $(DESTDIR)$(libdir)
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog
index 88ce6616e4616438ec97d0008beb927a0c84b242..c953c7b385ecb07c042a4c6b811378fe75fff498 100644 (file)
--- a/libcpu/ChangeLog
+++ b/libcpu/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-05  Josh Stone  <jistone@redhat.com>
+
+       * Makefile.am (%_defs): Add AM_V_GEN and AM_V_at silencers.
+       ($(srcdir)/%_dis.h): Ditto.
+       (%.mnemonics): Add AM_V_GEN silencer.
+
 2014-10-29  Jose E. Marchesi  <jose.marchesi@oracle.com>
 
        * Makefile.am (AM_CFLAGS): Use -fPIC instead of -fpic to avoid
diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am
index 0aff4742d60ebf7e651d355c7c77367aca0e68e0..f0caaea6e97a4c72bdae90fe3d07dd29529949a5 100644 (file)
--- a/libcpu/Makefile.am
+++ b/libcpu/Makefile.am
@@ -46,8 +46,8 @@ i386_disasm.o: i386.mnemonics $(srcdir)/i386_dis.h
 x86_64_disasm.o: x86_64.mnemonics $(srcdir)/x86_64_dis.h
 
 %_defs: $(srcdir)/defs/i386
-       m4 -D$* -DDISASSEMBLER $< > $@T
-       mv -f $@T $@
+       $(AM_V_GEN)m4 -D$* -DDISASSEMBLER $< > $@T
+       $(AM_V_at)mv -f $@T $@
 
 if MAINTAINER_MODE
 noinst_HEADERS = memory-access.h i386_parse.h i386_data.h
@@ -55,8 +55,8 @@ noinst_HEADERS = memory-access.h i386_parse.h i386_data.h
 noinst_PROGRAMS = i386_gendis
 
 $(srcdir)/%_dis.h: %_defs i386_gendis
-       ./i386_gendis $< > $@T
-       mv -f $@T $@
+       $(AM_V_GEN)./i386_gendis $< > $@T
+       $(AM_V_at)mv -f $@T $@
 
 else
 
@@ -67,7 +67,7 @@ $(srcdir)/%_dis.h:
 endif
 
 %.mnemonics: %_defs
-       sed '1,/^%%/d;/^#/d;/^[[:space:]]*$$/d;s/[^:]*:\([^[:space:]]*\).*/MNE(\1)/;s/{[^}]*}//g;/INVALID/d' \
+       $(AM_V_GEN)sed '1,/^%%/d;/^#/d;/^[[:space:]]*$$/d;s/[^:]*:\([^[:space:]]*\).*/MNE(\1)/;s/{[^}]*}//g;/INVALID/d' \
          $< | sort -u > $@
 
 i386_lex_no_Werror = yes
diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 8f3e401da61622d64a140d6ae52c455e68df4299..efe6ccb8e2b129139488107bb66fad307d1ae7fd 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-05  Josh Stone  <jistone@redhat.com>
+
+       * Makefile.am (libdw.so): Add AM_V_CCLD and AM_V_at silencers.
+
 2015-09-24  Jose E. Marchesi  <jose.marchesi@oracle.com>
 
        * Makefile.am (AM_CFLAGS): Use -fPIC instead of -fpic to avoid
diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index 1264035be78d829cebdc5737c0fc0a8ef8150e52..2da0db677de0cc6a5d4e641e6ec3f6851c9cb9f0 100644 (file)
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -108,13 +108,13 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a ../libdwelf/libdwelf_pic.a \
          ../libelf/libelf.so
 # The rpath is necessary for libebl because its $ORIGIN use will
 # not fly in a setuid executable that links in libdw.
-       $(LINK) -shared -o $@ -Wl,--soname,$@.$(VERSION),-z,defs \
+       $(AM_V_CCLD)$(LINK) -shared -o $@ -Wl,--soname,$@.$(VERSION),-z,defs \
                -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
                -Wl,--version-script,$<,--no-undefined \
                -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
                -ldl $(argp_LDADD) $(zip_LIBS)
        @$(textrel_check)
-       ln -fs $@ $@.$(VERSION)
+       $(AM_V_at)ln -fs $@ $@.$(VERSION)
 
 install: install-am libdw.so
        $(mkinstalldirs) $(DESTDIR)$(libdir)
diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 52cc5986456a2dfb2430e9326a918d41753d6dc7..1faa9c25eb5b0d95fd969dbb1015d1c2117434a7 100644 (file)
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-05  Josh Stone  <jistone@redhat.com>
+
+       * Makefile.am (libelf.so): Add AM_V_CCLD and AM_V_at silencers.
+
 2015-09-24  Jose E. Marchesi  <jose.marchesi@oracle.com>
 
        * Makefile.am (AM_CFLAGS): Use -fPIC instead of -fpic to avoid
diff --git a/libelf/Makefile.am b/libelf/Makefile.am
index 1fe7e31663c902bfac6ac340aa9d0eddb50f57d9..91a7d073e1640c81ce0779648f47368249cba19f 100644 (file)
--- a/libelf/Makefile.am
+++ b/libelf/Makefile.am
@@ -100,11 +100,11 @@ endif
 
 libelf_so_SOURCES =
 libelf.so$(EXEEXT): libelf_pic.a libelf.map
-       $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
+       $(AM_V_CCLD)$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
                -Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \
                -Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)
        @$(textrel_check)
-       ln -fs $@ $@.$(VERSION)
+       $(AM_V_at)ln -fs $@ $@.$(VERSION)
 
 install: install-am libelf.so
        $(mkinstalldirs) $(DESTDIR)$(libdir)
diff --git a/src/ChangeLog b/src/ChangeLog
index 411c70bf5e77a013a3b0c0e67f6eed08f6775bcf..daa76cf2cc499b26b2b04a95138016e273150f2e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-05  Josh Stone  <jistone@redhat.com>
+
+       * Makefile.am (libld_elf_i386.so): Add AM_V_CCLD silencer.
+       (.deps/none_ld.Po): Always silence the dummy command.
+       (make-debug-archive): Add AM_V_GEN and AM_V_at silencers.
+
 2015-10-02  Mark Wielaard  <mjw@redhat.com>
 
        * unstrip.c (copy_elided_sections): Use SH_INFO_LINK_P, not just
diff --git a/src/Makefile.am b/src/Makefile.am
index cd2755b03db6f50756a322bab59d3590bd828edf..afb38fc0f31384a3e61ccccdc6c5bf4b569518c2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -138,7 +138,7 @@ am_libld_elf_i386_pic_a_OBJECTS = i386_ld.os
 
 libld_elf_i386_so_SOURCES =
 libld_elf_i386.so: libld_elf_i386_pic.a libld_elf_i386.map
-       $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
+       $(AM_V_CCLD)$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
                $(libelf) $(libeu) \
                -Wl,--version-script,$(srcdir)/libld_elf_i386.map
        @$(textrel_check)
@@ -147,7 +147,7 @@ endif
 # Special rule to make it possible to define libld_elf_a_SOURCES as we do.
 # Otherwise make would complain.
 .deps/none_ld.Po: none_ld.os
-       -:
+       @-:
 
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
@@ -172,11 +172,11 @@ MAINTAINERCLEANFILES = ldlex.c ldscript.c ldscript.h
 
 
 make-debug-archive: $(srcdir)/make-debug-archive.in
-       UNSTRIP=$(bindir)/`echo unstrip | sed '$(transform)'`; \
+       $(AM_V_GEN)UNSTRIP=$(bindir)/`echo unstrip | sed '$(transform)'`; \
        AR=$(bindir)/`echo ar | sed '$(transform)'`; \
        sed -e "s,[@]UNSTRIP[@],$$UNSTRIP,g" -e "s,[@]AR[@],$$AR,g" \
            -e "s%[@]PACKAGE_NAME[@]%$(PACKAGE_NAME)%g" \
            -e "s%[@]PACKAGE_VERSION[@]%$(PACKAGE_VERSION)%g" \
            $(srcdir)/make-debug-archive.in > $@.new
-       chmod +x $@.new
-       mv -f $@.new $@
+       $(AM_V_at)chmod +x $@.new
+       $(AM_V_at)mv -f $@.new $@
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 9d079123e3cdc4035d9c16fd2aca2937a2eff85d..66781d0cee740e9f5be74cd0ea63c27d23e1ed4b 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-05  Josh Stone  <jistone@redhat.com>
+
+       * Makefile.am (backtrace-child-biarch): Add AM_V_CC silencer.
+
 2015-10-02  Mark Wielaard  <mjw@redhat.com>
 
        * elfstrmerge.c: New check program.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4ff48e64ef493d18c42e4e59f71f462c92bb2154..fc9b648d2f02bd7c0c73c69d7640a7730d399b55 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -63,7 +63,7 @@ endif
 
 # Substitute $(COMPILE).
 backtrace-child-biarch$(EXEEXT): backtrace-child.c
-       $(CC_BIARCH) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_V_CC)$(CC_BIARCH) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
                     $(AM_CPPFLAGS) $(CPPFLAGS) \
                     $(AM_CFLAGS) $(CFLAGS) $(backtrace_child_CFLAGS) \
                     $(AM_LDFLAGS) $(LDFLAGS) $(backtrace_child_LDFLAGS) \
Mirror of https://sourceware.org/git/elfutils.git