diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-11-29 22:34:04 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-11-29 22:34:04 +0000 |
| commit | f1c066bbee43fc081835463b28e22abf7c9ef084 (patch) | |
| tree | 28aed42b8a631c782f3af105073743936c66e0cc /epan/dfilter | |
| parent | 050d9379ef50e240d31de5fa846d5b73c134756d (diff) | |
Move some checkapi targets into Makefile.common
svn path=/trunk/; revision=35073
Diffstat (limited to 'epan/dfilter')
| -rw-r--r-- | epan/dfilter/Makefile.am | 10 | ||||
| -rw-r--r-- | epan/dfilter/Makefile.common | 5 | ||||
| -rw-r--r-- | epan/dfilter/Makefile.nmake | 7 |
3 files changed, 11 insertions, 11 deletions
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index 2f10f0c05b..33a5fd16f5 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -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,7 +67,7 @@ libdfilter_la_DEPENDENCIES = libdfilter_generated.la EXTRA_DIST = \ $(GENERATOR_FILES) \ Makefile.common \ - Makefile.nmake + Makefile.nmake RUNLEX=$(top_srcdir)/tools/runlex.sh @@ -75,7 +75,7 @@ scanner_lex.h : scanner.c 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) diff --git a/epan/dfilter/Makefile.common b/epan/dfilter/Makefile.common index eaaa4d6662..f92156a971 100644 --- a/epan/dfilter/Makefile.common +++ b/epan/dfilter/Makefile.common @@ -76,3 +76,8 @@ GENERATED_HEADER_FILES = \ # All the generated files. GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES) + +checkapi: + $(PERL) ../../tools/checkAPIs.pl -g termoutput \ + $(GENERATOR_FILES) \ + $(NONGENERATED_C_FILES) diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake index d79e33e3d7..5dd5946c29 100644 --- a/epan/dfilter/Makefile.nmake +++ b/epan/dfilter/Makefile.nmake @@ -57,14 +57,9 @@ scanner.obj : 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 $(MAKE) /$(MAKEFLAGS) -f makefile.nmake lemon cd ../epan/dfilter - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput \ - $(GENERATOR_FILES) \ - $(NONGENERATED_C_FILES) |