summaryrefslogtreecommitdiffstats
path: root/libcpu
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2015-10-05 11:04:15 -0700
committerJosh Stone <jistone@redhat.com>2015-10-06 17:50:10 -0700
commitdaee4714ee3761e2d92f764a724e83875a79a3f0 (patch)
tree9c6bab2d7253ea23706f665bd9bf4da0b2b02988 /libcpu
parent0e3ce39c8f154cb7df7f3a9bf29d347fe9cca036 (diff)
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 <jistone@redhat.com>
Diffstat (limited to 'libcpu')
-rw-r--r--libcpu/ChangeLog6
-rw-r--r--libcpu/Makefile.am10
2 files changed, 11 insertions, 5 deletions
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 <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 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