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 --- echld/Makefile.am | 3 +-- echld/Makefile.nmake | 19 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 echld/Makefile.nmake (limited to 'echld') diff --git a/echld/Makefile.am b/echld/Makefile.am index b0a21dcb0f..7107813843 100644 --- a/echld/Makefile.am +++ b/echld/Makefile.am @@ -52,8 +52,7 @@ libechld_la_LIBADD = \ EXTRA_DIST = \ CMakeLists.txt \ - Makefile.common \ - Makefile.nmake + Makefile.common CLEANFILES = \ libechld.a \ diff --git a/echld/Makefile.nmake b/echld/Makefile.nmake deleted file mode 100644 index 5de6da7392..0000000000 --- a/echld/Makefile.nmake +++ /dev/null @@ -1,19 +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 - -############### no need to modify below this line ######### - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I. /I.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include -DWS_BUILD_DLL - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -# no fork() on windows this needs some thoughts... -- cgit v1.2.3