diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-06-19 19:53:03 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-06-19 19:53:03 +0000 |
| commit | ff0d1ec3fa4fe7629e6ee5d9926e26e58e1653b0 (patch) | |
| tree | d59e53bc4008a157bd2aab11f0e0a8d3106b428e | |
| parent | 760559b957ce8f3acc7fc0334e30f3110c12beed (diff) | |
ascend_scanner.c includes ascend.h. Add corresponding makefile
dependencies, otherwise we might have a race condition when doing
parallel makes. Hopefully this will fix intermitten buildbot failures
we've been getting lately.
svn path=/trunk/; revision=43387
| -rw-r--r-- | wiretap/Makefile.am | 4 | ||||
| -rw-r--r-- | wiretap/Makefile.nmake | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index c18f3d6318..e1ca14c4cb 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -77,9 +77,11 @@ libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libw RUNLEX = $(top_srcdir)/tools/runlex.sh +k12text_lex.h : k12text.c + ascend_scanner_lex.h : ascend_scanner.c -k12text_lex.h : k12text.c +ascend_scanner.c: ascend.h ascend.c ascend.h: ascend.y @if [ -z "$(YACC)" ]; then \ diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index b2c9e4247b..a036c44b2c 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -42,13 +42,15 @@ wiretap-$(WTAP_VERSION).dll : $(OBJECTS) wtap.def ..\image\wiretap.res RUNLEX = ..\tools\runlex.sh +k12text_lex.h : k12text.c +k12text.obj : k12text.c + $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $? + ascend_scanner_lex.h : ascend_scanner.c ascend_scanner.obj : ascend_scanner.c ascend.h $(CC) $(GENERATED_CFLAGS) -Fd.\ -c ascend_scanner.c -k12text_lex.h : k12text.c -k12text.obj : k12text.c - $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $? +ascend_scanner.c : ascend.h ascend.c ascend.h : ascend.y $(YACC) $(YACC_OPTS) -d -p ascend ascend.y -o ascend.c |