diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-08 15:57:00 +0200 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-06-15 19:21:57 +0000 |
commit | 6baa1b544c84a766d9f9d356e9940eccaf0a128f (patch) | |
tree | fc5431419180335703edcbf01e6b260d2c0dcbfd /wiretap | |
parent | 88bd50c592b0d24a12dd178ae2858444400a012f (diff) |
Remove Nmake build system
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Reviewed-on: https://code.wireshark.org/review/15777
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'wiretap')
-rw-r--r-- | wiretap/Makefile.am | 1 | ||||
-rw-r--r-- | wiretap/Makefile.nmake | 82 |
2 files changed, 0 insertions, 83 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 50a072e005..fe1814f71a 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -64,7 +64,6 @@ EXTRA_DIST = \ README.airmagnet \ README.developer \ Makefile.common \ - Makefile.nmake \ CMakeLists.txt \ $(GENERATOR_FILES) \ $(GENERATED_FILES) diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake deleted file mode 100644 index 219f3eaa28..0000000000 --- a/wiretap/Makefile.nmake +++ /dev/null @@ -1,82 +0,0 @@ -# - -include ..\config.nmake -include <win32.mak> -include ..\Makefile.nmake.inc - -include Makefile.common - -# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output -GENERATED_CFLAGS=\ - $(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 $< - -OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) $(GENERATED_C_FILES:.c=.obj) - -wiretap_LIBS = \ - $(GLIB_LIBS) \ - ..\wsutil\libwsutil.lib \ - $(ZLIB_LIBS) - -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) ..\image\wiretap.res - $(link) $(dlllflags) $(conlibsdll) \ - $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ - /OUT:wiretap-$(WTAP_VERSION).dll \ - /IMPLIB:wiretap-$(WTAP_VERSION).lib \ - ..\image\wiretap.res \ - $(OBJECTS) ..\wsutil\ws_version_info.obj $(wiretap_LIBS) - -RUNLEX = ../tools/runlex.sh - -k12text_lex.h : k12text.c -k12text.obj : k12text.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.c ascend.h : ascend.y - $(YACC) $(YACC_OPTS) -d -p ascend ascend.y -o ascend.c - -clean : - rm -f $(OBJECTS) \ - wiretap-*.lib \ - wiretap-*.exp \ - wiretap-*.dll \ - wiretap-*.dll.manifest \ - *.nativecodeanalysis.xml *.pdb *.sbr - -# -# We remove the generated files with "distclean" because one of them, -# "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.{c,h}", but as -# long as you need Flex, you might as well get Bison.... -# -distclean: clean - rm -f $(GENERATED_FILES) - -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 -build $(NONGENERATED_C_FILES) |