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 --- caputils/Makefile.am | 3 +- caputils/Makefile.nmake | 84 ------------------------------------------------- 2 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 caputils/Makefile.nmake (limited to 'caputils') diff --git a/caputils/Makefile.am b/caputils/Makefile.am index 6b12d13f17..043ad29ff4 100644 --- a/caputils/Makefile.am +++ b/caputils/Makefile.am @@ -56,8 +56,7 @@ EXTRA_DIST = \ capture_wpcap_packet.h \ CMakeLists.txt \ doxygen.cfg.in \ - Makefile.common \ - Makefile.nmake + Makefile.common # All sources that should be put in the source distribution tarball libcaputils_a_SOURCES = \ diff --git a/caputils/Makefile.nmake b/caputils/Makefile.nmake deleted file mode 100644 index 901b8a84f9..0000000000 --- a/caputils/Makefile.nmake +++ /dev/null @@ -1,84 +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 - -############### no need to modify below this line ######### - -# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output -GENERATED_CFLAGS=\ - $(STANDARD_CFLAGS) \ - /Zm800 \ - /I.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ - /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ - /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) - -.c.obj:: - $(CC) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $< - -PLATFORM_CAPUTILS_SRC = \ - capture_win_ifnames.c \ - capture-wpcap.c \ - capture_wpcap_packet.c - -CAPUTILS_SRC = \ - $(COMMON_CAPUTILS_SRC) \ - $(PLATFORM_CAPUTILS_SRC) \ - airpcap_loader.c - -# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST -CAPUTILS_OBJECTS = \ - $(CAPUTILS_SRC:.c=.obj) - -RUNLEX=../tools/runlex.sh - -libcaputils.lib : ..\config.h $(CAPUTILS_OBJECTS) - link /lib /out:libcaputils.lib $(CAPUTILS_OBJECTS) - -clean: - rm -f $(CAPUTILS_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libcaputils.lib \ - *.nativecodeanalysis.xml *.pdb *.sbr \ - doxygen.cfg html/*.* wireshark-tap-register-cache.pkl - if exist html rmdir html - -distclean: clean - -maintainer-clean: distclean - rm -f $(GENERATED_FILES) - -# convert doxygen.cfg.in to doxygen.cfg with stamped version info -doxygen.cfg: ..\config.nmake doxygen.cfg.in -!IFDEF DOXYGEN - sed -e s/@VERSION@/$(VERSION)/ \ - < doxygen.cfg.in > $@ -!ENDIF - -doxygen-run: -!IFDEF DOXYGEN - $(DOXYGEN) doxygen.cfg -!ENDIF - -# MS html help compiler hhc returns 1 on success, but as nmake expects 0 it would stop here. -# the prepended -1 will raise the accepted error levels of nmake, so it will continue -doxygen.chm: -!IFDEF HHC - -1 $(HHC) html\index.hhp -!ENDIF - -doxygen: doxygen.cfg doxygen-run doxygen.chm - -checkapi: checkapi-base checkapi-todo - -checkapi-base: - $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk -build \ - $(CAPUTILS_SRC) - -checkapi-todo: - $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ - $(CAPUTILS_SRC) -- cgit v1.2.3