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 /wsutil | |
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 'wsutil')
-rw-r--r-- | wsutil/Makefile.am | 1 | ||||
-rw-r--r-- | wsutil/Makefile.nmake | 86 |
2 files changed, 0 insertions, 87 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index 94baf38265..0bc24f969d 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -87,7 +87,6 @@ EXTRA_DIST = \ cfutils.h \ CMakeLists.txt \ Makefile.common \ - Makefile.nmake \ file_util.c \ file_util.h \ getopt_long.c \ diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake deleted file mode 100644 index bb2b42150f..0000000000 --- a/wsutil/Makefile.nmake +++ /dev/null @@ -1,86 +0,0 @@ -## Makefile for building wireshark.exe with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# - -include ..\config.nmake -include <win32.mak> -include ..\Makefile.nmake.inc - -############### no need to modify below this line ######### - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I. /I.. $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) $(ZLIB_CFLAGS) \ - /I$(PCAP_DIR)\include -DWS_BUILD_DLL - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LIBWSUTIL_SRC = $(LIBWSUTIL_COMMON_SRC) - -# For use when making libwsutil.dll -libwsutil_LIBS = $(GLIB_LIBS) \ - $(GNUTLS_LIBS) - -OBJECTS = file_util.obj \ - getopt_long.obj \ - inet_aton.obj \ - inet_ntop.obj \ - inet_pton.obj \ - $(LIBWSUTIL_SRC:.c=.obj) \ - popcount.obj \ - strptime.obj \ - ws_mempbrk_sse42.obj \ - ws_version_info.obj - -# For use when making libwsutil.dll -libwsutil.lib: libwsutil.dll -libwsutil.exp: libwsutil.dll - -libwsutil.dll : $(OBJECTS) ..\image\libwsutil.res - @echo Linking libwsutil.dll - $(link) $(dlllflags) $(conlibsdll) shell32.lib \ - $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ - /OUT:libwsutil.dll \ - /IMPLIB:libwsutil.lib \ - ..\image\libwsutil.res \ - $(OBJECTS) $(libwsutil_LIBS) - -# -# The following target will rebuild its obj -# if and when version.h should change. -# -ws_version_info.obj: ..\ws_version_info.c ..\version.h - $(CC) $(CFLAGS) -Fd.\ -c ..\ws_version_info.c - -clean: - rm -f $(OBJECTS) \ - libwsutil.lib \ - libwsutil.exp \ - libwsutil.dll \ - libwsutil.dll.manifest \ - *.nativecodeanalysis.xml *.pdb *.sbr - -distclean: clean - -maintainer-clean: distclean - -checkapi: -## $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \ - $(PERL) ../tools/checkAPIs.pl -g termoutput -build \ - $(LIBWSUTIL_SRC) \ -# file_util.c unicode-utils.c - -# -# Editor modelines - https://www.wireshark.org/tools/modelines.html -# -# Local variables: -# c-basic-offset: 8 -# tab-width: 8 -# indent-tabs-mode: t -# End: -# -# vi: set shiftwidth=8 tabstop=8 noexpandtab: -# :indentSize=8:tabSize=8:noTabs=false: -# |