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 /ui/cli | |
| parent | 88bd50c592b0d24a12dd178ae2858444400a012f (diff) | |
| download | wireshark-6baa1b544c84a766d9f9d356e9940eccaf0a128f.tar.gz | |
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 'ui/cli')
| -rw-r--r-- | ui/cli/Makefile.am | 3 | ||||
| -rw-r--r-- | ui/cli/Makefile.nmake | 63 |
2 files changed, 1 insertions, 65 deletions
diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am index a10dd5d6fb..8140d3850b 100644 --- a/ui/cli/Makefile.am +++ b/ui/cli/Makefile.am @@ -76,5 +76,4 @@ checkapi: EXTRA_DIST = \ .editorconfig \ $(GENERATOR_FILES) \ - Makefile.common \ - Makefile.nmake + Makefile.common diff --git a/ui/cli/Makefile.nmake b/ui/cli/Makefile.nmake deleted file mode 100644 index e3e24b2476..0000000000 --- a/ui/cli/Makefile.nmake +++ /dev/null @@ -1,63 +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 ######### - -# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output -GENERATED_CFLAGS=\ - $(STANDARD_CFLAGS) \ - /Zm800 \ - /I../.. $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \ - /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ - /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ - /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ - $(PORTAUDIO_CFLAGS) $(GEOIP_CFLAGS) \ - $(HHC_CFLAGS) - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) - -.c.obj:: - $(CC) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $< - -include Makefile.common - - -# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST -TSHARK_TAP_OBJECTS = $(TSHARK_TAP_SRC:.c=.obj) - - -libcliui.lib : ..\..\config.h $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj - link /lib /out:libcliui.lib $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj - -# -# Build "tshark-tap-register.c", which contains a function -# "register_all_tap_listeners()" -# that calls the register routines for all TShark tap listeners. -# -# We do this by grepping through sources. -# -# Formatting conventions: The name of the tap_listener_register_* -# routines must start in column zero, or must be preceded only by -# "void " starting in column zero, and must not be inside #if. -# -tshark-tap-register.c: Makefile.common $(TSHARK_TAP_SRC) ..\..\tools\make-tap-reg.py - @echo Making tshark-tap-register.c - @$(PYTHON) ..\..\tools\make-tap-reg.py . tshark-taps $(TSHARK_TAP_SRC) - -clean: - rm -f $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj libcliui.lib *.pdb \ - *.nativecodeanalysis.xml *.sbr doxygen.cfg html/*.* tshark-tap-register-cache.pkl \ - tshark-tap-register.c-tmp - if exist html rmdir html - -distclean: clean - -maintainer-clean: distclean - rm -f $(GENERATED_FILES) - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -build $(TSHARK_TAP_SRC) |