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 /writecap | |
| 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 'writecap')
| -rw-r--r-- | writecap/Makefile.am | 3 | ||||
| -rw-r--r-- | writecap/Makefile.nmake | 71 |
2 files changed, 1 insertions, 73 deletions
diff --git a/writecap/Makefile.am b/writecap/Makefile.am index bdff5c6eb9..3733c913ab 100644 --- a/writecap/Makefile.am +++ b/writecap/Makefile.am @@ -40,8 +40,7 @@ EXTRA_DIST = \ $(GENERATOR_FILES) \ CMakeLists.txt \ doxygen.cfg.in \ - Makefile.common \ - Makefile.nmake + Makefile.common # All sources that should be put in the source distribution tarball libwritecap_a_SOURCES = \ diff --git a/writecap/Makefile.nmake b/writecap/Makefile.nmake deleted file mode 100644 index a3bab4b7ce..0000000000 --- a/writecap/Makefile.nmake +++ /dev/null @@ -1,71 +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) - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) - -.c.obj:: - $(CC) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $< - -# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST -WRITECAP_OBJECTS = \ - $(WRITECAP_SRC:.c=.obj) - -RUNLEX=../tools/runlex.sh - -libwritecap.lib : ..\config.h $(WRITECAP_OBJECTS) - link /lib /out:libwritecap.lib $(WRITECAP_OBJECTS) - -clean: - rm -f $(WRITECAP_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libwritecap.lib \ - *.nativecodeanalysis.xml *.pdb *.sbr \ - doxygen.cfg html/*.* - 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 \ - $(WRITECAP_SRC) - -checkapi-todo: - $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ - $(WRITECAP_SRC) |