From beroset:

[metze/wireshark/wip.git] / wiretap / Makefile.nmake

diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index bacda61b1775d430b2fc81846ebd2ca1211ab170..e09edd061c755b0be36f92a3e90acde01115e433 100644 (file)
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -9,15 +9,17 @@ include ..\Makefile.nmake.inc
 include Makefile.common
 
 # We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
-GENERATED_CFLAGS=-DYYMALLOC=malloc -DYYFREE=free -DHAVE_CONFIG_H /I. /I.. \
-       $(GLIB_CFLAGS) $(ZLIB_CFLAGS) /I$(PCAP_DIR)/include \
-       -D_U_="" $(LOCAL_CFLAGS)
-CFLAGS=-WX $(GENERATED_CFLAGS)
+GENERATED_CFLAGS=\
+       $(STANDARD_CFLAGS) \
+       -DYYMALLOC=malloc -DYYFREE=free \
+       /I. /I.. $(GLIB_CFLAGS) \
+       $(ZLIB_CFLAGS) /I$(PCAP_DIR)/include \
+       -DWS_BUILD_DLL
 
-CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 
 .c.obj::
-       $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
+       $(CC) $(CFLAGS) -Fd.\ -c $<
 
 OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) $(GENERATED_C_FILES:.c=.obj)
 
@@ -31,26 +33,28 @@ all: wiretap-$(WTAP_VERSION).dll
 wiretap-$(WTAP_VERSION).lib: wiretap-$(WTAP_VERSION).dll
 wiretap-$(WTAP_VERSION).exp: wiretap-$(WTAP_VERSION).dll
 
-wiretap-$(WTAP_VERSION).dll : $(OBJECTS) wtap.def ..\image\wiretap.res
+wiretap-$(WTAP_VERSION).dll : $(OBJECTS) ..\image\wiretap.res
        $(link) $(dlllflags) $(conlibsdll) \
                $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \
-               /DEF:wtap.def /OUT:wiretap-$(WTAP_VERSION).dll \
+               /OUT:wiretap-$(WTAP_VERSION).dll \
                /IMPLIB:wiretap-$(WTAP_VERSION).lib \
                ..\image\wiretap.res \
                $(OBJECTS) $(wiretap_LIBS)
 
 RUNLEX = ..\tools\runlex.sh
 
-ascend-scanner_lex.h : ascend-scanner.c
-ascend-scanner.obj : ascend-scanner.c ascend-grammar.h
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c $?
-
 k12text_lex.h : k12text.c
 k12text.obj : k12text.c
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -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
+
+ascend_scanner.c : ascend.h
 
-ascend-grammar.c ascend-grammar.h : ascend-grammar.y
-       $(YACC) $(YACC_OPTS) -d -p ascend ascend-grammar.y -o ascend-grammar.c
+ascend.c ascend.h : ascend.y
+       $(YACC) $(YACC_OPTS) -d -p ascend ascend.y -o ascend.c
 
 clean :
        rm -f $(OBJECTS) \
@@ -58,15 +62,15 @@ clean :
                wiretap-*.exp \
                wiretap-*.dll \
                wiretap-*.dll.manifest \
-               *.pdb
+               *.pdb *.sbr
 
 #
 # We remove the generated files with "distclean" because one of them,
-# "ascend-scanner.c", needs different #includes for UN*X and Windows
+# "ascend_scanner.c", needs different #includes for UN*X and Windows
 # (UN*X versions of Flex make it include <unistd.h>, but that's a
 # UN*X-only header), so if you're going to build from source, you need
-# to build "ascend-scanner.c" from "ascend-scanner.l" with Flex.
-# This might not be necessary for "ascend-grammar.{c,h}", but as
+# to build "ascend_scanner.c" from "ascend_scanner.l" with Flex.
+# This might not be necessary for "ascend.{c,h}", but as
 # long as you need Flex, you might as well get Bison....
 #
 distclean: clean
@@ -77,4 +81,4 @@ maintainer-clean: distclean
 checkapi:
 ## 'abort' checking disabled for now pending resolution of existing use of g_assert & g_error
 ##     $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput $(NONGENERATED_C_FILES) $(GENERATOR_FILES)
-       $(PERL) ../tools/checkAPIs.pl -g termoutput $(NONGENERATED_C_FILES) $(GENERATOR_FILES)
+       $(PERL) ../tools/checkAPIs.pl -g termoutput -build $(NONGENERATED_C_FILES) $(GENERATOR_FILES)