From 6baa1b544c84a766d9f9d356e9940eccaf0a128f Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Wed, 8 Jun 2016 15:57:00 +0200 Subject: Remove Nmake build system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer Reviewed-by: Balint Reczey --- epan/dfilter/Makefile.am | 1 - epan/dfilter/Makefile.nmake | 80 --------------------------------------------- 2 files changed, 81 deletions(-) delete mode 100644 epan/dfilter/Makefile.nmake (limited to 'epan/dfilter') diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index 050a9eedae..81703011f4 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -70,7 +70,6 @@ EXTRA_DIST = \ .editorconfig \ $(GENERATOR_FILES) \ Makefile.common \ - Makefile.nmake \ CMakeLists.txt scanner_lex.h : scanner.c diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake deleted file mode 100644 index 0dae21c1cc..0000000000 --- a/epan/dfilter/Makefile.nmake +++ /dev/null @@ -1,80 +0,0 @@ -## Makefile for building wireshark.exe with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include Makefile.common - -LEMON=..\..\tools\lemon - -# We GENERATED_CFLAGS to get around flex's non-LLP64-compliant output -GENERATED_CFLAGS=\ - $(STANDARD_CFLAGS) \ - /I. /I.. /I..\.. $(GLIB_CFLAGS) \ - /I$(LEMON) \ - /I$(PCAP_DIR)\include \ - -DWS_BUILD_DLL - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -OBJECTS=\ - $(NONGENERATED_C_FILES:.c=.obj) \ - $(GENERATED_C_FILES:.c=.obj) \ - $(NODIST_GENERATED_C_FILES:.c=.obj) - -dfilter.lib : $(OBJECTS) - link /lib /out:dfilter.lib $(OBJECTS) - -$(OBJECTS): ..\..\config.h - -..\..\config.h: ..\..\config.h.win32 ..\..\config.nmake - cd ..\.. - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake config.h - cd epan\dfilter - -clean: - rm -f $(OBJECTS) dfilter.lib *.nativecodeanalysis.xml *.pdb *.sbr - -# -# We remove the generated files with "distclean" because one of them, -# "scanner.c", needs different #includes for UN*X and Windows -# (UN*X versions of Flex make it include , but that's a -# UN*X-only header), so if you're going to build from source, you need -# to build "scanner.c" from "scanner.l" with Flex. -# This might not be necessary for "grammar.{c,h}", but we handle them -# the same for now. -# -distclean: clean - rm -f $(GENERATED_C_FILES) \ - $(NODIST_GENERATED_C_FILES) \ - $(GENERATED_HEADER_FILES) \ - $(NODIST_GENERATED_HEADER_FILES) \ - grammar.out - -maintainer-clean: distclean - -RUNLEX=../../tools/runlex.sh - -scanner_lex.h : scanner.c -scanner.obj : scanner.c grammar.h - $(CC) $(GENERATED_CFLAGS) -Fd.\ -c scanner.c - -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: - cd ../../tools - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake lemon - cd ../epan/dfilter - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ - $(NONGENERATED_C_FILES) -- cgit v1.2.3