From daee4714ee3761e2d92f764a724e83875a79a3f0 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 5 Oct 2015 11:04:15 -0700 Subject: Improve AM_SILENT_RULES coverage 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 --- backends/ChangeLog | 4 ++++ backends/Makefile.am | 4 ++-- config/ChangeLog | 4 ++++ config/eu.am | 4 ++-- libasm/ChangeLog | 4 ++++ libasm/Makefile.am | 4 ++-- libcpu/ChangeLog | 6 ++++++ libcpu/Makefile.am | 10 +++++----- libdw/ChangeLog | 4 ++++ libdw/Makefile.am | 4 ++-- libelf/ChangeLog | 4 ++++ libelf/Makefile.am | 4 ++-- src/ChangeLog | 6 ++++++ src/Makefile.am | 10 +++++----- tests/ChangeLog | 4 ++++ tests/Makefile.am | 2 +- 16 files changed, 57 insertions(+), 21 deletions(-) diff --git a/backends/ChangeLog b/backends/ChangeLog index 791b9db9..e6f37633 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,7 @@ +2015-10-05 Josh Stone + + * Makefile.am (libebl_%.so): Add AM_V_at and AM_V_CCLD silencers. + 2015-10-06 Jose E. Marchesi * sparc_attrs.c: New file. diff --git a/backends/Makefile.am b/backends/Makefile.am index cefe5ebb..f7002fb5 100644 --- 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 1037b080..ba5cb387 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2015-10-05 Josh Stone + + * eu.am (%.os): Add AM_V_CC silencers. + 2015-09-24 Jose E. Marchesi * eu.am (%.os): Use -fPIC instead of -fpic to avoid relocation diff --git a/config/eu.am b/config/eu.am index 1368ae53..6ad8f822 100644 --- 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 7433cb72..beb6211c 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,3 +1,7 @@ +2015-10-05 Josh Stone + + * Makefile.am (libasm.so): Add AM_V_CCLD and AM_V_at silencers. + 2015-09-23 Mark Wielaard * asm_align.c (__libasm_ensure_section_space): Mark as diff --git a/libasm/Makefile.am b/libasm/Makefile.am index 6ea2a8e8..a4bf293a 100644 --- 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 88ce6616..c953c7b3 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,9 @@ +2015-10-05 Josh Stone + + * 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 * Makefile.am (AM_CFLAGS): Use -fPIC instead of -fpic to avoid diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index 0aff4742..f0caaea6 100644 --- 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 8f3e401d..efe6ccb8 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,7 @@ +2015-10-05 Josh Stone + + * Makefile.am (libdw.so): Add AM_V_CCLD and AM_V_at silencers. + 2015-09-24 Jose E. Marchesi * Makefile.am (AM_CFLAGS): Use -fPIC instead of -fpic to avoid diff --git a/libdw/Makefile.am b/libdw/Makefile.am index 1264035b..2da0db67 100644 --- 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 52cc5986..1faa9c25 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,7 @@ +2015-10-05 Josh Stone + + * Makefile.am (libelf.so): Add AM_V_CCLD and AM_V_at silencers. + 2015-09-24 Jose E. Marchesi * Makefile.am (AM_CFLAGS): Use -fPIC instead of -fpic to avoid diff --git a/libelf/Makefile.am b/libelf/Makefile.am index 1fe7e316..91a7d073 100644 --- 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 411c70bf..daa76cf2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2015-10-05 Josh Stone + + * 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 * unstrip.c (copy_elided_sections): Use SH_INFO_LINK_P, not just diff --git a/src/Makefile.am b/src/Makefile.am index cd2755b0..afb38fc0 100644 --- 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 9d079123..66781d0c 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2015-10-05 Josh Stone + + * Makefile.am (backtrace-child-biarch): Add AM_V_CC silencer. + 2015-10-02 Mark Wielaard * elfstrmerge.c: New check program. diff --git a/tests/Makefile.am b/tests/Makefile.am index 4ff48e64..fc9b648d 100644 --- 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) \ -- cgit v1.2.1