osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

As suggested by Xavier Raynaud in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6425 : 

scanner.c includes (depends on) grammar.h so mark it so in the Makefiles.

svn path=/trunk/; revision=45020
This commit is contained in:
Jeff Morriss 2012-09-20 03:04:48 +00:00
parent 5983528b69
commit 8f0d5f99c6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dfilter/Makefile.am
View File

@ -5,17 +5,17 @@
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2001 Gerald Combs
#
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@ -67,15 +67,16 @@ libdfilter_la_DEPENDENCIES = libdfilter_generated.la
EXTRA_DIST = \
$(GENERATOR_FILES) \
Makefile.common \
Makefile.nmake
Makefile.nmake
RUNLEX=$(top_srcdir)/tools/runlex.sh
scanner_lex.h : scanner.c
scanner.c: grammar.h
LEMON=../../tools/lemon
grammar.h : grammar.c
grammar.h : grammar.c
grammar.c : $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/grammar.lemon
$(LEMON)/lemon$(EXEEXT) t=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/grammar.lemon || \
(rm -f grammar.c grammar.h ; false)

4
epan/dfilter/Makefile.nmake
View File

@ -57,9 +57,11 @@ scanner_lex.h : scanner.c
scanner.obj : scanner.c grammar.h
$(CC) $(GENERATED_CFLAGS) -Fd.\ -c scanner.c
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