summaryrefslogtreecommitdiff
path: root/wiretap/Makefile.nmake
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-12-05 01:49:22 -0800
committerMichael Mann <mmann78@netscape.net>2015-12-05 12:08:52 +0000
commitb56f53884be3bab935058b2bbbb4da0b8bbbe7f6 (patch)
treea03a91e0be6188dad8ce6b436f68ac94207dd57f /wiretap/Makefile.nmake
parent4d337f421389e901bf1d4246f9ecb2f7b363aef0 (diff)
downloadwireshark-b56f53884be3bab935058b2bbbb4da0b8bbbe7f6.tar.gz
Build Flex-generated files with "warnings are errors".
We shouldn't be getting warnings at this point. Change-Id: I363a48546cb8d916425f42962ae1697d52ed9a29 Reviewed-on: https://code.wireshark.org/review/12436 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wiretap/Makefile.nmake')
-rw-r--r--wiretap/Makefile.nmake10
1 files changed, 3 insertions, 7 deletions
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 58ae255ec1..e6d846e8b3 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -6,16 +6,12 @@ include ..\Makefile.nmake.inc
include Makefile.common
-# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
-GENERATED_CFLAGS=\
- $(STANDARD_CFLAGS) \
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
-DYYMALLOC=malloc -DYYFREE=free \
/I. /I.. $(GLIB_CFLAGS) \
$(ZLIB_CFLAGS) /I$(PCAP_DIR)/include \
-DWS_BUILD_DLL
-CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
-
.c.obj::
$(CC) $(CFLAGS) -Fd.\ -c $<
@@ -43,11 +39,11 @@ RUNLEX = ../tools/runlex.sh
k12text_lex.h : k12text.c
k12text.obj : k12text.c
- $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $?
+ $(CC) $(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
+ $(CC) $(CFLAGS) -Fd.\ -c ascend_scanner.c
ascend_scanner.c : ascend.h