diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-01-11 20:53:11 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-01-11 19:57:45 +0000 |
| commit | 7d004dc887bcecb404241604242004edb6f6ceaa (patch) | |
| tree | 82f1bcb60f22a460b4c2a678e55035380876201b /epan | |
| parent | c8c9917f81a469e866e07448bee39732556df701 (diff) | |
Revert "Lemon: Update lemon tools"
This reverts commit 5855dd8d538eb81d4825961b1bf0d583bf96f751.
This Lemon update fails to compile on OSX and triggers asserts on other platforms
Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91
Reviewed-on: https://code.wireshark.org/review/6496
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.am | 2 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 2 | ||||
| -rw-r--r-- | epan/dfilter/Makefile.am | 2 | ||||
| -rw-r--r-- | epan/dfilter/Makefile.nmake | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index 6ce9f1ab5a..bf0c6e4be7 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 2a372e3aa2..f0ad957250 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 7db0fa2b46..81a9b4f690 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 3045e2e6b0..e2c5a3189e 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 |