diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-11-27 02:28:17 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-01-28 18:13:48 +0000 |
| commit | 265a41e14da6b3ebf1e49e726eee62d1372110bf (patch) | |
| tree | f1a524f8e66ebd43691de84649f231f32ee125f6 /plugins/mate | |
| parent | 97a1a50e200a6c50e0014dde7e8ec932c30190a1 (diff) | |
| download | wireshark-265a41e14da6b3ebf1e49e726eee62d1372110bf.tar.gz | |
autotools: Don't use "user variables" to set build flags
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 <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'plugins/mate')
| -rw-r--r-- | plugins/mate/Makefile.am | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index dfbc07dbff..5062a823c8 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/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_FILES) # # XXX - how to make this apply only to clean files? # #if HAVE_WARNINGS_AS_ERRORS -#AM_CFLAGS = -Werror +#AM_CFLAGS += -Werror #endif plugindir = @plugindir@ @@ -143,17 +142,13 @@ EXTRA_DIST = \ matelib/rtsp.mate \ matelib/sip.mate -RUNLEX = $(top_srcdir)/tools/runlex.sh - -LEMON = $(top_builddir)/tools/lemon - mate_parser_lex.h : mate_parser.c mate_parser.lo : mate_grammar.h mate_grammar.h : mate_grammar.c -mate_grammar.c : mate_grammar.lemon mate.h mate_util.h $(LEMON)/lemon$(EXEEXT) - $(AM_V_LEMON)$(LEMON)/lemon$(EXEEXT) T=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/mate_grammar.lemon || \ +mate_grammar.c : mate_grammar.lemon mate.h mate_util.h $(LEMON) + $(AM_V_LEMON)$(LEMON) T=$(lemon_srcdir)/lempar.c $(srcdir)/mate_grammar.lemon || \ (rm -f grammar.c grammar.h ; false) checkapi: |