aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-08-27 22:20:12 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2015-01-11 18:56:08 +0000
commit5855dd8d538eb81d4825961b1bf0d583bf96f751 (patch)
tree421a08623d0cf688c50a1b559000d99825543f5a /epan
parent74b20dca8c255672259d0c43004665d1e9f192dd (diff)
Lemon: Update lemon tools
Fix warning: declaration shadows a variable in the global scope [-Wshadow] Add include <config.h> Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) Fix implicit conversion loses integer precision Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] Fix function declaration isn’t a prototype [-Wstrict-prototypes] Fix warning: old-style function definition [-Wold-style-definition] Fix trailing whitespace Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake Fix -Wmissing-prototypes Remove unused function (acttab_free) Add basename the filename with only filename (no path...) Change-Id: Ia79f61e29f828575df61cc89134c6c553044e86d Reviewed-on: https://code.wireshark.org/review/3976 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/Makefile.am2
-rw-r--r--epan/Makefile.nmake2
-rw-r--r--epan/dfilter/Makefile.am2
-rw-r--r--epan/dfilter/Makefile.nmake2
4 files changed, 4 insertions, 4 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am
index bf0c6e4be7..6ce9f1ab5a 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -177,7 +177,7 @@ LEMON=../tools/lemon
dtd_grammar.h: dtd_grammar.c
dtd_grammar.c : $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/dtd_grammar.lemon
- $(AM_V_LEMON)$(LEMON)/lemon$(EXEEXT) t=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/dtd_grammar.lemon
+ $(AM_V_LEMON)$(LEMON)/lemon$(EXEEXT) T=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/dtd_grammar.lemon
tvbtest.o exntest.o oids_test.o: exceptions.h
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index f0ad957250..2a372e3aa2 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -427,7 +427,7 @@ LEMON=..\tools\lemon
dtd_grammar.h: dtd_grammar.c
dtd_grammar.c: $(LEMON)\lemon.exe $(LEMON)\lempar.c dtd_grammar.lemon
- $(LEMON)\lemon t=$(LEMON)\lempar.c dtd_grammar.lemon
+ $(LEMON)\lemon T=$(LEMON)\lempar.c dtd_grammar.lemon
#
# We compile these specially because they're test programs, not library
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 81a9b4f690..7db0fa2b46 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -79,7 +79,7 @@ LEMON=../../tools/lemon
grammar.h : grammar.c
grammar.c : $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/grammar.lemon
- $(AM_V_LEMON)$(LEMON)/lemon$(EXEEXT) t=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/grammar.lemon || \
+ $(AM_V_LEMON)$(LEMON)/lemon$(EXEEXT) T=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/grammar.lemon || \
(rm -f grammar.c grammar.h ; false)
checkapi:
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index e2c5a3189e..3045e2e6b0 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -68,7 +68,7 @@ scanner.c: grammar.h
grammar.h : grammar.c
grammar.c : $(LEMON)\lemon.exe $(LEMON)\lempar.c grammar.lemon
- $(LEMON)\lemon.exe t=$(LEMON)\lempar.c grammar.lemon
+ $(LEMON)\lemon.exe T=$(LEMON)\lempar.c grammar.lemon
$(LEMON)\lemon.exe:
cd ../../tools