From e6c5b859d284b312017f1b85a03810b0b2031922 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 1 Jul 2023 10:20:59 +0300 Subject: [PATCH 17/17] Respect automake silent mode when running tolua See osdn #47468 Signed-off-by: Marko Lindqvist --- client/luascript/Makefile.am | 3 ++- common/scriptcore/Makefile.am | 12 ++++++++---- server/scripting/Makefile.am | 6 ++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/client/luascript/Makefile.am b/client/luascript/Makefile.am index 75459a9bea..b0aa13abf0 100644 --- a/client/luascript/Makefile.am +++ b/client/luascript/Makefile.am @@ -33,7 +33,8 @@ libscripting_client_la_LIBADD = \ $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS) tolua_client_gen.c tolua_client_gen.h: tolua_client.pkg - $(TOLUA) -n client -o $(srcdir)/tolua_client_gen.c \ + @if ! $(AM_V_P) ; then echo " tolua tolua_client" ; fi + $(AM_V_at) $(TOLUA) -n client -o $(srcdir)/tolua_client_gen.c \ -H $(srcdir)/tolua_client_gen.h $(srcdir)/tolua_client.pkg # These files are not generated to builddir, but to srcdir */ diff --git a/common/scriptcore/Makefile.am b/common/scriptcore/Makefile.am index 344dc71dfb..162d467ff2 100644 --- a/common/scriptcore/Makefile.am +++ b/common/scriptcore/Makefile.am @@ -66,19 +66,23 @@ libscriptcore_la_LIBADD = \ $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS) tolua_common_a_gen.c tolua_common_a_gen.h: tolua_common_a.pkg - $(TOLUA) -n common_a -o $(srcdir)/tolua_common_a_gen.c \ + @if ! $(AM_V_P) ; then echo " tolua tolua_common_a" ; fi + $(AM_V_at) $(TOLUA) -n common_a -o $(srcdir)/tolua_common_a_gen.c \ -H $(srcdir)/tolua_common_a_gen.h $(srcdir)/tolua_common_a.pkg tolua_common_z_gen.c tolua_common_z_gen.h: tolua_common_z.pkg - $(TOLUA) -n common_z -o $(srcdir)/tolua_common_z_gen.c \ + @if ! $(AM_V_P) ; then echo " tolua tolua_common_z" ; fi + $(AM_V_at) $(TOLUA) -n common_z -o $(srcdir)/tolua_common_z_gen.c \ -H $(srcdir)/tolua_common_z_gen.h $(srcdir)/tolua_common_z.pkg tolua_game_gen.c tolua_game_gen.h: tolua_game.pkg - $(TOLUA) -n game -o $(srcdir)/tolua_game_gen.c \ + @if ! $(AM_V_P) ; then echo " tolua tolua_game" ; fi + $(AM_V_at) $(TOLUA) -n game -o $(srcdir)/tolua_game_gen.c \ -H $(srcdir)/tolua_game_gen.h $(srcdir)/tolua_game.pkg tolua_signal_gen.c tolua_signal_gen.h: tolua_signal.pkg - $(TOLUA) -n signal -o $(srcdir)/tolua_signal_gen.c \ + @if ! $(AM_V_P) ; then echo " tolua tolua_signal" ; fi + $(AM_V_at) $(TOLUA) -n signal -o $(srcdir)/tolua_signal_gen.c \ -H $(srcdir)/tolua_signal_gen.h $(srcdir)/tolua_signal.pkg # These files are not generated to builddir, but to srcdir */ diff --git a/server/scripting/Makefile.am b/server/scripting/Makefile.am index ba6aae7e65..1784b70757 100644 --- a/server/scripting/Makefile.am +++ b/server/scripting/Makefile.am @@ -64,11 +64,13 @@ BUILT_SOURCES = \ # can only rely on them getting included via libfreeciv.so. tolua_fcdb_gen.c tolua_fcdb_gen.h: tolua_fcdb.pkg - $(TOLUA) -n fcdb -o $(srcdir)/tolua_fcdb_gen.c \ + @if ! $(AM_V_P) ; then echo " tolua tolua_fcdb" ; fi + $(AM_V_at) $(TOLUA) -n fcdb -o $(srcdir)/tolua_fcdb_gen.c \ -H $(srcdir)/tolua_fcdb_gen.h $(srcdir)/tolua_fcdb.pkg tolua_server_gen.c tolua_server_gen.h: tolua_server.pkg - $(TOLUA) -n server -o $(srcdir)/tolua_server_gen.c \ + @if ! $(AM_V_P) ; then echo " tolua tolua_server" ; fi + $(AM_V_at) $(TOLUA) -n server -o $(srcdir)/tolua_server_gen.c \ -H $(srcdir)/tolua_server_gen.h $(srcdir)/tolua_server.pkg # These files are not generated to builddir, but to srcdir */ -- 2.40.1