From 265a41e14da6b3ebf1e49e726eee62d1372110bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Fri, 27 Nov 2015 02:28:17 +0000 Subject: autotools: Don't use "user variables" to set build flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GNU coding standards recommend against it and automake is designed around it. This allows overriding the global build flags using AM_CFLAGS, etc., or per object flags, something that is difficult or impossible currently because of automake precedence rules. Change-Id: I3f1ea12e560af5a46b2f04b342b1882bbf123f12 Reviewed-on: https://code.wireshark.org/review/13455 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- plugins/wimaxasncp/Makefile.am | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'plugins/wimaxasncp') diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index 15c6bc3d99..83c89d5046 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -20,17 +20,16 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS = -I$(top_srcdir) - -include Makefile.common +#AM_CFLAGS = $(GENERATED_CFLAGS) # # XXX - how to make this apply only to clean files? # #if HAVE_WARNINGS_AS_ERRORS -#AM_CFLAGS = -Werror +#AM_CFLAGS += -Werror #endif plugindir = @plugindir@ @@ -120,8 +119,6 @@ EXTRA_DIST = \ wimaxasncp_dict.l \ CMakeLists.txt -RUNLEX = $(top_srcdir)/tools/runlex.sh - wimaxasncp_dict_lex.h: wimaxasncp_dict.c wimaxasncp_dict.c: wimaxasncp_dict.h -- cgit v1.2.1