diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2013-02-12 17:25:28 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2013-02-12 17:25:28 +0000 |
| commit | 486c6d54453dc19f4d76f52076dd1a1b181c1b68 (patch) | |
| tree | 1a1b147c363288ed65cb49f1a9811c0f87f1f5f3 | |
| parent | a99e6fe84214289fc4d69fa9edfbcaa9ad5b6244 (diff) | |
Fix the grammar.h/grammar.c/grammar.lemon dependency so that
grammar.h is not always out of date. Use the same pattern as in the
Makefile.nmake files
svn path=/trunk/; revision=47643
| -rw-r--r-- | epan/Makefile.am | 5 | ||||
| -rw-r--r-- | epan/dfilter/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/mate/Makefile.am | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index a126b9af7c..35271ba31b 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -183,10 +183,9 @@ uat_load_lex.h: uat_load.c LEMON=../tools/lemon -dtd_grammar.c dtd_grammar.h: $(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 - 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 tvbtest.o exntest.o: exceptions.h diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index 3cc0d8a9e9..88528568c3 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -79,10 +79,10 @@ scanner.lo: grammar.h LEMON=../../tools/lemon -grammar.c grammar.h : $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/grammar.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 || \ (rm -f grammar.c grammar.h ; false) -grammar.h : grammar.c checkapi: $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index 895a365ce6..3e884a0c12 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -152,11 +152,11 @@ mate_parser_lex.h : mate_parser.c mate_parser.lo : mate_grammar.h -mate_grammar.c mate_grammar.h : mate_grammar.lemon mate.h mate_util.h $(LEMON)/lemon$(EXEEXT) +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 || \ (rm -f grammar.c grammar.h ; false) -mate_grammar.h : mate_grammar.c checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ |