From 9c4e762a713dfbd998e11f1837ee1198c7e810fd Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 26 Sep 2021 06:42:57 +0300 Subject: [PATCH 12/12] Revert "Makerules.mk: Make moc rule to respect automake's silent mode" This reverts commit bec6fb57f6d139b01fd64b6293162dd7ecf8e194. It caused build to fail with automake < 1.12.2, and our minimum supported automake version in S2_6 is 1.10. See osdn #42927 --- bootstrap/Makerules.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bootstrap/Makerules.mk b/bootstrap/Makerules.mk index ea308e22f5..64f3323cc3 100644 --- a/bootstrap/Makerules.mk +++ b/bootstrap/Makerules.mk @@ -1,4 +1,4 @@ -#/*********************************************************************** +#/********************************************************************** # Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold # # This program is free software; you can redistribute it and/or modify @@ -15,5 +15,4 @@ # Generate Qt meta object source from header $(MOC_FILES) : meta_%.cpp: %.h - @if ! $(AM_V_P) ; then echo " MOC $@" ; fi - $(AM_V_at) $(MOCCMD) -o $@ $< + $(MOCCMD) -o $@ $< -- 2.33.0