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 | |
| 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>
244 files changed, 42 insertions, 12291 deletions
diff --git a/.editorconfig b/.editorconfig index 0cffa1f635..d531f437e2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -15,8 +15,8 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true -# Autotools, Make, Nmake -[{Makefile.am,Makefile,Makefile.nmake,config.nmake}] +# Autotools, Make +[{Makefile.am,Makefile}] indent_style = tab indent_size = 8 diff --git a/.gitignore b/.gitignore index d1adc11046..52e4b4470d 100644 --- a/.gitignore +++ b/.gitignore @@ -259,7 +259,6 @@ packaging/nsis/config.nsh packaging/nsis/qt-dll-manifest.nsh packaging/portableapps/Files/ packaging/portableapps/appinfo.ini -packaging/portableapps/distribution.nmake packaging/rpm/SPECS/wireshark.spec packaging/svr4/checkinstall packaging/svr4/pkginfo diff --git a/CMakeLists.txt b/CMakeLists.txt index 4405cbce7d..006b2aaad2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -314,7 +314,6 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC") ${WARNINGS_CFLAGS} ) - # Set in Makefile.nmake set(WS_LINK_FLAGS "/LARGEADDRESSAWARE /MANIFEST:NO /INCREMENTAL:NO /RELEASE") else() diff --git a/Makefile.am b/Makefile.am index 1e438a9394..83d4ccbbae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -680,8 +680,6 @@ EXTRA_DIST = \ INSTALL.configure \ Makefile.am.inc \ Makefile.common \ - Makefile.nmake \ - Makefile.nmake.inc \ README.aix \ README.bsd \ README.DECT \ @@ -695,8 +693,6 @@ EXTRA_DIST = \ autogen.sh \ cfilters \ colorfilters \ - config.h.win32 \ - config.nmake \ debian \ dfilters \ doxygen_global.cfg \ diff --git a/Makefile.nmake b/Makefile.nmake deleted file mode 100644 index 5c8359bf21..0000000000 --- a/Makefile.nmake +++ /dev/null @@ -1,1535 +0,0 @@ -## Makefile for building wireshark.exe with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# We "Deploy using XCopy," which is described at -# http://msdn.microsoft.com/en-us/library/ms235291.aspx - -include config.nmake -include <win32.mak> - -##### Deprecation ##### -# Support for NMake and QMake will be removed in June 2016. Removal includes -# the following files: -# -# Makefile.nmake in the top level and most subdirectories. -# Makefile.nmake.inc -# config.nmake -# epan/dissectors/asn1/Makefile.inc.nmake -# epan/dissectors/asn1/Makefile.preinc.nmake -# packaging/nsis/Custom.nmake -# plugins/*/moduleinfo.nmake -# tools/native-nmake.cmd -# tools/win-setup.sh -# -# Additionally, the following files reference the nmake environment: -# make-version.pl -# The autotools 'dist' target - -############### no need to modify below this line ######### - -CC = cl -LINK= link -BSCMAKE= bscmake - -WIN_SETUP=tools/win-setup.sh - -# ------------- -# Checking that the Wireshark Libraries are up-to-date: -# 1. win-setup.sh --checktag <tag> is invoked during nmake "preprocessing". -# If an error status is returned (ie: the libraries are not up-to-date) -# then CHECK_TAG is defined as a non-null string. -# 2. The $(LIBS_CHECK) target is invoked during the nmake: -# If $(CHECK_TAG) is non-null, then a "libraries not up to date" exit will occur. -# If $(CHECK_TAG) is null, but either config.nmake or Makefile.nmake -# are newer than the $(LIBS_CHECK) target, then a detailed verification -# as to the required library package files will be made. -# -LIBS_CHECK=_libs_check_ -!IF [$(SH) $(WIN_SETUP) --checktag "$(WIRESHARK_LIB_DIR)" "$(DOWNLOAD_TAG)"] != 0 -CHECK_TAG=_check_tag_ -!ELSE -CHECK_TAG= -!ENDIF -# ------------- - -LDFLAGS = /NOLOGO /INCREMENTAL:NO $(LOCAL_LDFLAGS) - -# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output -GENERATED_CFLAGS=\ - $(STANDARD_CFLAGS) \ - /I. $(GLIB_CFLAGS) \ - $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ - $(C_ARES_CFLAGS) $(GNUTLS_CFLAGS) \ - $(SMI_CFLAGS) $(GEOIP_CFLAGS) $(LIBSSH_CFLAGS) $(WINSPARKLE_CFLAGS) - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -include Makefile.common - -wireshark_gtk_OBJECTS = $(WIRESHARK_COMMON_SRC:.c=.obj) $(EXTCAP_COMMON_SRC:.c=.obj) -tshark_OBJECTS = $(tshark_SOURCES:.c=.obj) $(EXTCAP_COMMON_SRC:.c=.obj) -tfshark_OBJECTS = $(tfshark_SOURCES:.c=.obj) -rawshark_OBJECTS = $(rawshark_SOURCES:.c=.obj) -# -# XXX - one of the files in text2pcap_SOURCES is a .l file, so -# this doesn't work. -# -###text2pcap_OBJECTS = $(text2pcap_SOURCES:.c=.obj) -mergecap_OBJECTS = $(mergecap_SOURCES:.c=.obj) -editcap_OBJECTS = $(editcap_SOURCES:.c=.obj) -capinfos_OBJECTS = $(capinfos_SOURCES:.c=.obj) -captype_OBJECTS = $(captype_SOURCES:.c=.obj) -dftest_OBJECTS = $(dftest_SOURCES:.c=.obj) -dumpcap_OBJECTS = $(dumpcap_SOURCES:.c=.obj) -randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj) -reordercap_OBJECTS = $(reordercap_SOURCES:.c=.obj) - -# -# psapi.lib see http://msdn.microsoft.com/en-us/library/windows/desktop/ms683219(v=vs.85).aspx -# - -wireshark_gtk_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib shell32.lib comctl32.lib ole32.lib psapi.lib \ - $(HHC_LIBS) \ - wsutil\libwsutil.lib \ - $(GNUTLS_LIBS) \ - $(WINSPARKLE_LIBS) \ -!IFDEF ENABLE_LIBWIRESHARK - epan\libwireshark.lib \ -!ELSE - epan\dissectors\dissectors.lib \ - epan\wireshark.lib \ - epan\crypt\airpdcap.lib \ - epan\dfilter\dfilter.lib \ - epan\ftypes\ftypes.lib \ - $(C_ARES_LIBS) \ - $(ZLIB_LIBS) -!ENDIF - -tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib psapi.lib \ - $(GLIB_LIBS) \ - wsutil\libwsutil.lib \ - $(GNUTLS_LIBS) \ -!IFDEF ENABLE_LIBWIRESHARK - epan\libwireshark.lib \ -!ELSE - epan\dissectors\dissectors.lib \ - epan\wireshark.lib \ - epan\crypt\airpdcap.lib \ - epan\dfilter\dfilter.lib \ - epan\ftypes\ftypes.lib \ - $(C_ARES_LIBS) \ - $(ZLIB_LIBS) -!ENDIF - -tfshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib psapi.lib \ - $(GLIB_LIBS) \ - wsutil\libwsutil.lib \ - $(GNUTLS_LIBS) \ -!IFDEF ENABLE_LIBWIRESHARK - epan\libwireshark.lib \ -!ELSE - epan\dissectors\dissectors.lib \ - epan\wireshark.lib \ - epan\dfilter\dfilter.lib \ - epan\ftypes\ftypes.lib \ - epan\wmem\wmem.lib -!ENDIF - -rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib psapi.lib \ - $(GLIB_LIBS) \ - wsutil\libwsutil.lib \ - $(GNUTLS_LIBS) \ -!IFDEF ENABLE_LIBWIRESHARK - epan\libwireshark.lib \ -!ELSE - epan\dissectors\dissectors.lib \ - epan\wireshark.lib \ - epan\crypt\airpdcap.lib \ - epan\dfilter\dfilter.lib \ - epan\ftypes\ftypes.lib \ - $(C_ARES_LIBS) \ - $(ZLIB_LIBS) -!ENDIF - -capinfos_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib shell32.lib \ - wsutil\libwsutil.lib \ - $(GLIB_LIBS) \ - $(GCRYPT_LIBS) - -captype_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib shell32.lib \ - wsutil\libwsutil.lib \ - $(GLIB_LIBS) - -editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib shell32.lib \ - wsutil\libwsutil.lib \ - $(GLIB_LIBS) - -mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ - wsutil\libwsutil.lib \ - $(GLIB_LIBS) - -reordercap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ - wsutil\libwsutil.lib \ - $(GLIB_LIBS) - -text2pcap_LIBS= \ - wsock32.lib user32.lib \ - writecap\libwritecap.lib \ - wsutil\libwsutil.lib \ - $(GLIB_LIBS) - -dumpcap_LIBS= \ - wsock32.lib user32.lib \ - caputils\libcaputils.lib \ - writecap\libwritecap.lib \ - wsutil\libwsutil.lib \ - $(GLIB_LIBS) - -dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib psapi.lib \ - $(GLIB_LIBS) \ - wsutil\libwsutil.lib \ - $(GNUTLS_LIBS) \ -!IFDEF ENABLE_LIBWIRESHARK - epan\libwireshark.lib \ -!ELSE - epan\dissectors\dissectors.lib \ - epan\wireshark.lib \ - epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ - $(C_ARES_LIBS) \ - $(ZLIB_LIBS) \ - $(SMI_LIBS) -!ENDIF - -randpkt_LIBS= randpkt_core\librandpkt_core.lib \ - wiretap\wiretap-$(WTAP_VERSION).lib \ - user32.lib \ - wsutil\libwsutil.lib \ - $(GLIB_LIBS) - -EXECUTABLES=$(PROGRAM_NAME_GTK).exe tshark.exe tfshark.exe rawshark.exe \ - capinfos.exe captype.exe editcap.exe mergecap.exe text2pcap.exe \ - randpkt.exe reordercap.exe dumpcap.exe dftest.exe - -!IFDEF QT5_BASE_DIR -EXECUTABLES=$(EXECUTABLES) $(PROGRAM_NAME).exe -!ENDIF - -RESOURCES=image\wireshark.res image\file_dlg_win32.res \ - image\libwireshark.res image\tshark.res image\tfshark.res image\capinfos.res \ - image\captype.res image\editcap.res image\mergecap.res \ - image\text2pcap.res image\wiretap.res image\dumpcap.res \ - image\rawshark.res image\reordercap.res image\libwsutil.res - - -all: $(LIBS_CHECK) config.h ui\qt\config.pri tools image $(C_ARES_DLL) $(ZLIB_DLL) wsutil codecs wiretap epan randpkt_core extcap $(EXECUTABLES) wireshark.bsc $(RESOURCES) help install-all - -!IFDEF MAKENSIS -packaging: all - cd packaging - cd nsis - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - cd .. -!ELSE -packaging: _FORCE_ - @echo \? NSIS not available (MAKENSIS not defined in config.nmake) - @echo. - @exit 1 -!ENDIF - -packaging_papps: all - cd packaging - cd portableapps - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - cd .. - -# use (info-)zip from cygwin to pack things -packaging_zip: all -!IFDEF MSVCR_DLL - xcopy "$(MSVCR_DLL)" $(INSTALL_DIR) -!ENDIF -!IFDEF VCREDIST_EXE - @echo Including vcredist_$(TARGET_MACHINE).exe -- your recipient may need to run it! - xcopy "$(VCREDIST_EXE)" $(INSTALL_DIR) -!ENDIF - rm -f wireshark.zip - zip -r -9 wireshark.zip $(INSTALL_DIR)/ - -!IFDEF WIRESHARK_GENERATE_BSC_FILE -# Note: Certain .sbr files cause bscmake warning "too many references... ignoring ..." -# XXX: It seems that using .bsc files with VS2010 doesn't work (isn't supported ?) -# Using .bsc files with VS2008 may work -# See: https://ask.wireshark.org/questions/8660/wireshark-building-and-debugging-on-visual-c-or-visual-studio -wireshark.bsc: \ - *.sbr \ - capchild\*.sbr \ - caputils\*.sbr \ - codecs\*.sbr \ - epan\*.sbr \ - epan\crypt\*.sbr \ - epan\dfilter\*.sbr \ - epan\dissectors\*.sbr \ - epan\ftypes\*.sbr \ - epan\wslua\*.sbr \ - plugins\asn1\*.sbr \ - plugins\docsis\*.sbr \ - plugins\ethercat\*.sbr \ - plugins\gryphon\*.sbr \ - plugins\irda\*.sbr \ - plugins\m2m\*.sbr \ - plugins\mate\*.sbr \ - plugins\opcua\*.sbr \ - plugins\profinet\*.sbr \ - plugins\stats_tree\*.sbr \ - plugins\unistim\*.sbr \ - plugins\wimax\*.sbr \ - plugins\wimaxasncp\*.sbr \ - plugins\wimaxmacphy\*.sbr \ - randpkt_core\*.sbr \ - ui\*.sbr \ - ui\cli\*.sbr \ - ui\gtk\*.sbr \ - ui\win32\*.sbr \ - wiretap\*.sbr \ - wsutil\*.sbr - $(BSCMAKE) @<< - /o $@ $? -<< -!ELSE -wireshark.bsc: -!ENDIF - -pdb_zip: all - cd $(INSTALL_DIR) - rm -f ../[Ww]ireshark-pdb-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).zip - zip -9 ../Wireshark-pdb-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).zip *.pdb *.lib - cd .. - -$(RESOURCES): image - -## Note: The proper "SUBSYSTEM" link option to be used for linking each of the Wireshark executables -## is specified in '$(guiflags)' or '$(conflags)' as used as part of the link options. -## (These variables (as well as '$(guilibsdll)' and '$(conlibsdll)') are defined in win32.mak). -wiretap\wiretap-$(WTAP_VERSION).lib: image $(ZLIB_DLL) wiretap - -$(PROGRAM_NAME_GTK).exe : $(LIBS_CHECK) config.h $(wireshark_gtk_OBJECTS) capchild caputils epan ui gtk win32 image\wireshark.res image\file_dlg_win32.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\libwscodecs.lib ui\libui.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib plugins - @echo Linking $@ - $(LINK) @<< - /OUT:$(PROGRAM_NAME_GTK).exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE $(wireshark_gtk_LIBS) $(GTK_LIBS) capchild\libcapchild.lib caputils\libcaputils.lib codecs\libwscodecs.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib ui\libui.lib $(wireshark_gtk_OBJECTS) image\wireshark.res image\file_dlg_win32.res -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:$(PROGRAM_NAME).exe;1 -!ENDIF - -$(PROGRAM_NAME).exe : install-generated-files $(LIBS_CHECK) config.h capchild caputils codecs\libwscodecs.lib epan ui qt wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins - -tshark.exe : $(LIBS_CHECK) config.h $(tshark_OBJECTS) capchild caputils epan ui cli image\tshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins - @echo Linking $@ - $(LINK) @<< - /OUT:tshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /LARGEADDRESSAWARE $(tshark_LIBS) $(tshark_OBJECTS) capchild\libcapchild.lib caputils\libcaputils.lib ui\cli\libcliui.lib ui\libui.lib image\tshark.res -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "tshark.exe.manifest" -outputresource:tshark.exe;1 -!ENDIF - -tfshark.exe : $(LIBS_CHECK) config.h $(tfshark_OBJECTS) epan ui cli image\tfshark.res wsutil\libwsutil.lib plugins - @echo Linking $@ - $(LINK) @<< - /OUT:tfshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /LARGEADDRESSAWARE $(tfshark_LIBS) $(tfshark_OBJECTS) ui\cli\libcliui.lib ui\libui.lib image\tfshark.res -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "tfshark.exe.manifest" -outputresource:tfshark.exe;1 -!ENDIF - -rawshark.exe : $(LIBS_CHECK) config.h $(rawshark_OBJECTS) caputils epan ui image\rawshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins - @echo Linking $@ - $(LINK) @<< - /OUT:rawshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /LARGEADDRESSAWARE $(rawshark_LIBS) $(rawshark_OBJECTS) caputils\libcaputils.lib ui\libui.lib image\rawshark.res -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "rawshark.exe.manifest" -outputresource:rawshark.exe;1 -!ENDIF - -# Linking with setargv.obj enables "wildcard expansion" of command-line arguments -capinfos.exe : $(LIBS_CHECK) config.h $(capinfos_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res - @echo Linking $@ - $(LINK) @<< - /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(capinfos_OBJECTS) $(capinfos_LIBS) setargv.obj image\capinfos.res -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "capinfos.exe.manifest" -outputresource:capinfos.exe;1 -!ENDIF - -# Linking with setargv.obj enables "wildcard expansion" of command-line arguments -captype.exe : $(LIBS_CHECK) config.h $(captype_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\captype.res - @echo Linking $@ - $(LINK) @<< - /OUT:captype.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(captype_OBJECTS) $(captype_LIBS) setargv.obj image\captype.res -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "captype.exe.manifest" -outputresource:captype.exe;1 -!ENDIF - -editcap.exe : $(LIBS_CHECK) config.h $(editcap_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res - @echo Linking $@ - $(LINK) @<< - /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(editcap_OBJECTS) $(editcap_LIBS) image\editcap.res -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "editcap.exe.manifest" -outputresource:editcap.exe;1 -!ENDIF - -# Linking with setargv.obj enables "wildcard expansion" of command-line arguments -mergecap.exe : $(LIBS_CHECK) config.h $(mergecap_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res - @echo Linking $@ - $(LINK) @<< - /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(mergecap_OBJECTS) $(mergecap_LIBS) setargv.obj image\mergecap.res -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "mergecap.exe.manifest" -outputresource:mergecap.exe;1 -!ENDIF - -# Linking with setargv.obj enables "wildcard expansion" of command-line arguments -reordercap.exe : $(LIBS_CHECK) config.h $(reordercap_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\reordercap.res - @echo Linking $@ - $(LINK) @<< - /OUT:reordercap.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(reordercap_OBJECTS) $(reordercap_LIBS) setargv.obj image\reordercap.res -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "reordercap.exe.manifest" -outputresource:reordercap.exe;1 -!ENDIF - -text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj writecap wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\text2pcap.res - @echo Linking $@ - $(LINK) @<< - /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) text2pcap.obj text2pcap-scanner.obj wsutil\ws_version_info.obj $(text2pcap_LIBS) image\text2pcap.res -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "text2pcap.exe.manifest" -outputresource:text2pcap.exe;1 -!ENDIF - -dftest.exe : $(dftest_OBJECTS) epan ui - @echo Linking $@ - $(LINK) @<< - /OUT:dftest.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(dftest_LIBS) ui\libui.lib $(dftest_OBJECTS) -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "dftest.exe.manifest" -outputresource:dftest.exe;1 -!ENDIF - -randpkt.exe : $(randpkt_OBJECTS) randpkt_core - @echo Linking $@ - $(LINK) @<< - /OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(randpkt_LIBS) $(randpkt_OBJECTS) -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "randpkt.exe.manifest" -outputresource:randpkt.exe;1 -!ENDIF - -dumpcap.exe : $(LIBS_CHECK) config.h $(dumpcap_OBJECTS) caputils writecap wsutil\libwsutil.lib image\dumpcap.res - @echo Linking $@ - $(LINK) @<< - /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(dumpcap_LIBS) $(dumpcap_OBJECTS) image\dumpcap.res -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "dumpcap.exe.manifest" -outputresource:dumpcap.exe;1 -!ENDIF - - -config.h : config.h.win32 config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@VERSION_MAJOR@/$(VERSION_MAJOR)/ \ - -e s/@VERSION_MINOR@/$(VERSION_MINOR)/ \ - -e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \ - -e "s/@VERSION_FLAVOR@/$(VERSION_FLAVOR)/" \ - -e "s/@HAVE_C_ARES@/$(C_ARES_CONFIG)/" \ - -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \ - -e "s/@HAVE_ZLIB@/$(ZLIB_CONFIG)/" \ - -e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \ - -e "s/@HAVE_PCAP_FINDALLDEVS@/$(PCAP_FINDALLDEVS_CONFIG)/" \ - -e "s/@HAVE_PCAP_DATALINK_NAME_TO_VAL@/$(PCAP_DATALINK_NAME_TO_VAL_CONFIG)/" \ - -e "s/@HAVE_PCAP_DATALINK_VAL_TO_NAME@/$(PCAP_DATALINK_VAL_TO_NAME_CONFIG)/" \ - -e "s/@HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION@/$(PCAP_DATALINK_VAL_TO_DESCRIPTION_CONFIG)/" \ - -e "s/@HAVE_PCAP_BREAKLOOP@/$(PCAP_BREAKLOOP_CONFIG)/" \ - -e "s/@HAVE_REMOTE@/$(PCAP_HAVE_REMOTE_CONFIG)/" \ - -e "s/@HAVE_PCAP_REMOTE@/$(PCAP_REMOTE_CONFIG)/" \ - -e "s/@HAVE_PCAP_OPEN@/$(PCAP_OPEN_CONFIG)/" \ - -e "s/@HAVE_PCAP_CREATE@/$(PCAP_CREATE_CONFIG)/" \ - -e "s/@HAVE_PCAP_OPEN_DEAD@/$(PCAP_OPEN_DEAD_CONFIG)/" \ - -e "s/@HAVE_PCAP_LIST_DATALINKS@/$(PCAP_LIST_DATALINKS_CONFIG)/" \ - -e "s/@HAVE_PCAP_FREE_DATALINKS@/$(PCAP_FREE_DATALINKS_CONFIG)/" \ - -e "s/@HAVE_PCAP_SET_DATALINK@/$(PCAP_SET_DATALINK_CONFIG)/" \ - -e "s/@HAVE_PCAP_SETSAMPLING@/$(PCAP_SETSAMPLING_CONFIG)/" \ - -e "s/@HAVE_BPF_IMAGE@/$(BPF_IMAGE_CONFIG)/" \ - -e "s/@HAVE_LIBGNUTLS@/$(GNUTLS_CONFIG)/" \ - -e "s/@HAVE_LIBGCRYPT@/$(LIBGCRYPT_CONFIG)/" \ - -e "s/@HAVE_LUA@/$(LUA_CONFIG)/" \ - -e "s/@HAVE_LUA@/$(LUA_VERSION)/" \ - -e "s/@HAVE_AIRPCAP@/$(AIRPCAP_CONFIG)/" \ - -e "s/@HAVE_AIRPDCAP@/$(AIRPDCAP_CONFIG)/" \ - -e "s/@HAVE_LIBPORTAUDIO@/$(PORTAUDIO_CONFIG)/" \ - -e "s/@PORTAUDIO_API_1@/$(PORTAUDIO_API_CONFIG)/" \ - -e "s/@HAVE_SMI@/$(SMI_CONFIG)/" \ - -e "s/@HAVE_GEOIP@/$(GEOIP_CONFIG)/" \ - -e "s/@HAVE_GEOIP_V6@/$(GEOIP_V6_CONFIG)/" \ - -e "s/@HAVE_LIBSSH/$(LIBSSH_CONFIG)/" \ - -e "s/@HAVE_SOFTWARE_UPDATE@/$(WINSPARKLE_CONFIG)/" \ - -e "s/@HAVE_NTDDNDIS_H@/$(NTDDNDIS_CONFIG)/" \ - -e "s/@PCAP_NG_DEFAULT@/$(PCAP_NG_DEFAULT)/" \ - -e "s/@WANT_PACKET_EDITOR@/$(WANT_PACKET_EDITOR)/" \ - < config.h.win32 > $@ - -ui\qt\config.pri: config.nmake Makefile.nmake - @echo Creating <<ui\qt\config.pri -# Automatically generated from Makefile.nmake. Edit there, not here. -# qmake apparently requires a three-part numeric VERSION. -PROGRAM_NAME = $(PROGRAM_NAME) -VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO) -VERSION_FULL = $(VERSION) -WTAP_VERSION = $(WTAP_VERSION) -INSTALL_DIR = $(INSTALL_DIR) -QT5_BASE_DIR = $(QT5_BASE_DIR:\=/) -!IFDEF MANIFEST_INFO_REQUIRED -CONFIG += wireshark_manifest_info_required -!ENDIF -!IFDEF KFW_DIR -CONFIG += wireshark_use_kfw -!ENDIF -WIRESHARK_LIB_DIR = $(WIRESHARK_LIB_DIR:\=/) -GLIB_DIR = $(GTK_DIR:\=/) -C_ARES_DIR = $(C_ARES_DIR:\=/) -ZLIB_DIR = $(ZLIB_DIR:\=/) -GNUTLS_DIR = $(GNUTLS_DIR:\=/) -SMI_DIR = $(SMI_DIR:\=/) -KFW_DIR = $(KFW_DIR:\=/) -LUA_DIR = $(LUA_DIR:\=/) -GEOIP_DIR = $(GEOIP_DIR:\=/) -LIBSSH_DIR = $(LIBSSH_DIR:\=/) -WINSPARKLE_DIR = $(WINSPARKLE_DIR:\=/) - -GCC_DLL = $(GCC_DLL) -GPGERROR_DLL = $(GPGERROR_DLL) -INTL_DLL = $(INTL_DLL) - -guilibsdll = $(guilibsdll) - -HHC_LIBS = $(HHC_LIBS) - -COMERR_DLL = $(COMERR_DLL) -KRB5_DLL = $(KRB5_DLL) -K5SPRT_DLL = $(K5SPRT_DLL) - -SH = $(SH) -PYTHON = $(PYTHON) - -MSVC_VARIANT = $(MSVC_VARIANT) -MSVCR_DLL = "$(MSVCR_DLL:\=/)" - -WIRESHARK_TARGET_PLATFORM = $(WIRESHARK_TARGET_PLATFORM) - -QMAKE_CFLAGS *= $(STANDARD_CFLAGS) -# NOMINMAX keeps windows.h from defining "min" and "max" via windef.h. -# This avoids conflicts with the C++ standard library. -QMAKE_CXXFLAGS *= $(STANDARD_CFLAGS) /DNOMINMAX -QMAKE_LFLAGS *= /LARGEADDRESSAWARE $(LDFLAGS) -<<KEEP - -# -# Build the version string -# -# XXX - Makefile.am uses FORCE for this. -!IF EXIST(".git/index") -GITINDEX = .git/index -!ELSE IF EXIST(".svn/wc.db") -GITINDEX = .svn/wc.db -!ELSE IF EXIST(".svn/entries") -GITINDEX = .svn/entries -!ELSE -GITINDEX = -!ENDIF -version.h: $(GITINDEX) - rm -f version.h - $(PERL) make-version.pl - - -text2pcap-scanner.c : text2pcap-scanner.l - $(LEX) -otext2pcap-scanner.c text2pcap-scanner.l - -text2pcap-scanner.obj : text2pcap-scanner.c - $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $? - -test-programs: - cd epan - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake test-programs - cd .. - -clean-local: - rm -f $(wireshark_gtk_OBJECTS) $(tshark_OBJECTS) $(tfshark_OBJECTS) $(dumpcap_OBJECTS) $(rawshark_OBJECTS) \ - $(EXECUTABLES) *.nativecodeanalysis.xml *.pdb *.sbr *.exe.manifest \ - capinfos.obj capinfos.exp capinfos.lib \ - captype.obj captype.exp captype.lib \ - editcap.obj editcap.exp editcap.lib \ - mergecap.obj text2pcap.obj \ - reordercap.obj nio-ie5.obj update.obj \ - text2pcap-scanner.obj text2pcap-scanner.c \ - config.h ps.c $(LIBS_CHECK) \ - dftest.obj dftest.exe randpkt.obj randpkt.exe \ - doxygen.cfg \ - $(RESOURCES) libwireshark.dll wiretap-$(WTAP_VERSION).dll \ - libwscodecs.lib libwsutil.dll \ - wireshark.bsc - rm -rf $(INSTALL_DIR) - rm -rf $(INSTALL_DIR_QT) - -clean: clean-local - cd wiretap - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../wsutil - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../capchild - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../caputils - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../randpkt_core - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../extcap - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../codecs - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../ui - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd gtk - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean -!IFDEF QT5_BASE_DIR - cd ../qt - -$(MAKE) clean -!ENDIF - cd ../win32 - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../cli - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../../epan - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../plugins - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../tools - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../image - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../doc - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../docbook - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../help - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../packaging/nsis - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../portableapps - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../.. - -# "distclean" removes all files not part of the distribution. -# It does not remove generated files that are part of the distribution. -distclean-local: clean-local -!IFDEF ZLIB_DIR - rm -f $(ZLIB_DLL) $(ZLIB_DIR)\zlib1.dll.manifest \ - $(ZLIB_DIR)\include\zlib.h $(ZLIB_DIR)\include\zconf.h \ - $(ZLIB_DIR)\lib\zdll.lib -!ENDIF - rm -f config.h $(BUILT_SOURCES) wireshark-pdb*.zip - -distclean: distclean-local - cd wiretap - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../wsutil - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../capchild - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../caputils - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../randpkt_core - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../extcap - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../codecs - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../ui - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd gtk - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean -!IFDEF QT5_BASE_DIR - cd ../qt - -$(MAKE) distclean -!ENDIF - cd ../win32 - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../cli - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../../epan - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../plugins - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../tools - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../image - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../doc - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../docbook - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../help - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../packaging/nsis - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../portableapps - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../.. - -# Make "maintainer-clean" only if you would like to remove ALL generated -# files. -# Be sure to have python and perl installed to regenerate them. -maintainer-clean-local: distclean-local - rm -f $(GENERATED_FILES) - -maintainer-clean: maintainer-clean-local - cd wiretap - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../wsutil - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../capchild - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../caputils - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../randpkt_core - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../extcap - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../codecs - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../ui - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd gtk - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean -!IFDEF QT5_BASE_DIR - cd ../qt - -$(MAKE) distclean -!ENDIF - cd ../win32 - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../cli - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../../epan - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../plugins - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../tools - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../image - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../doc - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../docbook - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../help - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../packaging/nsis - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../portableapps - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../.. - -tools:: - cd tools - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -image:: - cd image - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -!IFDEF ZLIB_DIR -# MSVC variants supported by Wireshark have to avoid indirectly using msvcrt.dll, -# therefore compile the zlib dll from source ZLIB_DIR package. -# To avoid path problems, copy the zlib sources to a temp dir, -# compile and copy the resulting files back to (source) ZLIB_DIR -$(ZLIB_DLL): - xcopy $(ZLIB_DIR) zlib.tmp /D /I /E /Y - cd zlib.tmp -!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" - $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="-I. -DASMV -DASMINF" OBJA="inffas32.obj match686.obj" -!else - $(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll AS=ml64 LOC="-I. -DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" -!endif - if not exist $(ZLIB_DIR) mkdir $(ZLIB_DIR) - if not exist $(ZLIB_DIR)\lib mkdir $(ZLIB_DIR)\lib - if not exist $(ZLIB_DIR)\include mkdir $(ZLIB_DIR)\include -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "zlib1.dll.manifest" -outputresource:zlib1.dll;2 -!ENDIF - copy zlib1.dll $(ZLIB_DIR) - copy zdll.lib $(ZLIB_DIR)\lib - copy zconf.h $(ZLIB_DIR) - copy zlib.h $(ZLIB_DIR) - cd .. - rm -r -f zlib.tmp -!ENDIF - -wsutil:: version.h - cd wsutil - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -wiretap:: - cd wiretap - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -capchild:: help config.h version.h doxygen - cd capchild - $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libcapchild.lib - cd .. - -caputils:: help config.h version.h doxygen - cd caputils - $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libcaputils.lib - cd .. - -writecap:: help config.h version.h doxygen - cd writecap - $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libwritecap.lib - cd .. - -randpkt_core:: help config.h version.h doxygen - cd randpkt_core - $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake librandpkt_core.lib - cd .. - -extcap:: writecap - cd extcap - $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake all - cd .. - -codecs:: - cd codecs - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -ui:: help config.h version.h doxygen - cd ui - $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libui.lib - cd .. - -gtk:: help config.h version.h doxygen - cd ui/gtk - $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui.lib - cd ../.. - -# The Visual C++ static analyzer currently fails with error C2171 -# when compiling summary_dialog.cpp. If/when this ever gets fixed -# we can remove the ENABLE_CODE_ANALYSIS check. -qt:: help config.h version.h doxygen -!IFDEF QT5_BASE_DIR - cd ui/qt - $(QT5_BASE_DIR)\bin\qmake CONFIG+=release Wireshark.pro -!IFDEF ENABLE_CODE_ANALYSIS - -nmake -!ELSE - nmake -!ENDIF - cd ../.. -!ENDIF - -win32:: - cd ui/win32 - $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui_win32.lib - cd ../.. - -cli:: help config.h version.h doxygen - cd ui/cli - $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libcliui.lib - cd ../.. - -epan:: $(RESOURCES) $(ZLIB_DLL) wiretap\wiretap-$(WTAP_VERSION).lib $(BUILT_SOURCES) doxygen - cd epan - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -plugins:: - cd plugins - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -doc:: - cd doc - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -docbook:: - cd docbook - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -help:: - cd help - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -doxygen.cfg: config.nmake doxygen.cfg.in - sed -e s/@VERSION@/$(VERSION)/ \ - < doxygen.cfg.in > $@ - -doxygen-run: -!IFDEF DOXYGEN - $(DOXYGEN) doxygen.cfg -!ENDIF - -doxygen: doxygen.cfg doxygen-run - -services: tools\make-services.py - $(PYTHON) tools/make-services.py - -################################################################################ -# Prepare build environment by downloading and installing required libraries -################################################################################ - -# The required tools to build Wireshark. -# -# The 'find' tool is available both in \WINNT\System32 and in cygwin's /usr/bin. -# We only need the cygwin version (for some shell scripts). -# In the PATH, System32 is before cygwin's dir, so explicitly check for /usr/bin/find. -REQUIRED_TOOLS=\ - $(CC) \ - $(LINK) \ - nmake \ -!IFDEF MANIFEST_INFO_REQUIRED - --windowsonly mt \ -!ENDIF - $(SH_PROG) \ - $(YACC) \ - $(LEX) \ - env \ - grep \ - --cygwinonly /usr/bin/find \ - peflags \ - $(PERL) \ - $(PYTHON) \ -!IFDEF QT5_BASE_DIR - --windowsonly $(QT5_BASE_DIR)\bin\qmake \ -!ENDIF - sed \ - unzip \ - wget - -verify_tools: -# As win-setup.sh assumes the dir exists create it if it doesn't - @if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)" - @$(SH) $(WIN_SETUP) --appverify $(REQUIRED_TOOLS) - -# Targets and etc used to verify or download libraries - -!IFNDEF WIN_SETUP_OPT -WIN_SETUP_OPT=--download -!ENDIF - -# Verify that the required library 'package' (zip) files have been downloaded. -# (It seems reasonable to assume that if the files have been downloaded -# then they have been installed). -check_libs: - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake WIN_SETUP_OPT=--libverify process_libs - -# Verify library packages: -# If $(CHECK_TAG) is non-null then checktag failed; Exit with an error message. (See beginning of this Makefile). -# Otherwise do detailed library package files verification only if Makefile.nmake or config.make have been updated -# (or dummy file doesn't exist because of 'make clean' or whatever). -# Note that the creation/modification time of a file after a git pull of that file -# is the time of the update (not the time of the file in the repository). -# touch is only called if libverify succeeds. -$(LIBS_CHECK): $(CHECK_TAG) config.nmake Makefile.nmake - @echo Verifying library package files ... - @$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake WIN_SETUP_OPT=--libverify process_libs - @touch $@ - -# Target for "checktag failed" (libraries not up to date). -# Defined only if "checktag" failed (see beginning of this Makefile). -!IF "$(CHECK_TAG)" != "" -$(CHECK_TAG): _FORCE_ - @echo \? Wireshark Libraries not up-to-date \? - @echo \? Do you need to run "nmake -f Makefile.nmake setup" \? - @echo. - @exit 1 - -!ENDIF - -# Download (if needed) and install all the required libraries into WIRESHARK_LIB_DIR. -# A clean_setup is done first to ensure that the target dirs don't -# contain old files remaining from a previous setup run. -setup: verify_tools clean_setup process_libs - -install_qt: - $(SH) $(WIN_SETUP) --download "C:\Qt" \ - . \ - Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" - -# The process_libs target when invoked causes either a --libverify or a --download for all the required libraries. -# (The choice is determined by the value of the macro WIN_SETUP_OPT). -process_libs: - @if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)" - -!IFDEF PCAP_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ - WinPcap_$(WINPCAP_VERSION).exe \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF - -!IFNDEF QT5_BASE_DIR -!MESSAGE Can't find Qt. This will become a problem at some point. -!ENDIF -!IFDEF GTK_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - "$(GTK_NAME)" \ - gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM)$(PKG_SUFIX).zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF KFW_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ -!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win32" - kfw-3-2-2-i386-ws-vc6.zip \ -!ELSE - kfw-3-2-2-x64-ws.zip \ -!ENDIF - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -# @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ -# . \ -# kfw-3-2-2.zip \ -# "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF PCAP_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ - WpdPack_$(WPD_VERSION).zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF AIRPCAP_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - AirPcap_Devpack_4_1_0_1622 \ - AirPcap_Devpack_4_1_0_1622.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF C_ARES_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ - c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF ZLIB_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . zlib-1.2.8-ws.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF LUA_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - lua5.2.3 \ - lua$(LUA_DIST)_lib.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF - -!IFDEF GNUTLS_PKG - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ - gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF PORTAUDIO_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ - portaudio_v19_2.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF SMI_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ - libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF GEOIP_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws \ - GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF LIBSSH_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ - libssh-0.7.2-$(WIRESHARK_TARGET_PLATFORM)ws.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF WINSPARKLE_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ - WinSparkle-$(WINSPARKLE_PKG).zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF HHC_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - user-guide \ - user-guide-gdf2fcdf.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF UPX - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ - upx303w.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF -!IFDEF NASM - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ - nasm-2.09.08-win32.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ - USBPcapSetup-1.1.0.0-g794bf26-3.exe \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!IF "$(WIN_SETUP_OPT)" == "--download" - @$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIB_DIR)" "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF - @echo. - @echo Wireshark is ready to build. - -# Cleanup files installed by the setup target. It will not remove the -# downloaded zip files. -# WHEN UPDATING LIBRARY VERSIONS, KEEP ALSO ONE FORMER VERSION SO -# UPDATING REMOVES THE FORMER USER DIRS -clean_setup: - cd "$(WIRESHARK_LIB_DIR)" - rm -r -f c-ares-1.5.3ws - rm -r -f c-ares-1.6.0ws - rm -r -f c-ares-1.7.0-win??ws - rm -r -f c-ares-1.7.1-win??ws - rm -r -f c-ares-1.9.1-1-win??ws - rm -r -f c-ares-1.11.0-win??ws - rm -r -f gettext-0.14.5 - rm -r -f gettext-runtime-0.17 - rm -r -f gettext-runtime-0.17-1 - rm -r -f gettext-0.17-1 # win64 - rm -r -f glib - rm -r -f gnutls-2.8.1-1 - rm -r -f gnutls-2.8.5-*-win??ws - rm -r -f gnutls-2.10.3-*-win??ws - rm -r -f gnutls-2.12.18-*-win??ws - rm -r -f gnutls-3.1.22-*-win??ws - rm -r -f gnutls-3.2.15-*-win??ws -!IF "$(GTK_NAME)" == "gtk2" - rm -r -f gtk2 -!ELSE - rm -r -f gtk3 -!ENDIF - rm -r -f gtk+ - rm -r -f gtk-wimp - rm -r -f kfw-2.5 - rm -r -f kfw-3-2-2-final - rm -r -f kfw-3-2-2-i386-ws-vc6 - rm -r -f kfw-3-2-2-x64-ws - rm -r -f libiconv-1.9.1.bin.woe32 - rm -r -f lua5.1 - rm -r -f lua5.1.4 - rm -r -f lua5.2.? - rm -r -f libsmi-0.4.5 - rm -r -f libsmi-0.4.8 - rm -r -f libsmi-svn-40773-win??ws - rm -r -f libssh-0.7.2-win??ws - rm -r -f nasm-2.00 - rm -r -f nasm-2.02 - rm -r -f nasm-2.09.08 - rm -r -f pcre-6.4 - rm -r -f pcre-7.0 - rm -r -f portaudio_v19 - rm -r -f portaudio_v19_2 - rm -r -f upx301w - rm -r -f upx303w - rm -r -f user-guide - rm -r -f zlib123 - rm -r -f zlib125 - rm -r -f zlib-1.2.5 - rm -r -f zlib-1.2.8 - rm -r -f zlib-1.2.8-ws - rm -r -f zlib123-dll - rm -r -f AirPcap_Devpack_1_0_0_594 - rm -r -f AirPcap_Devpack_4_0_0_1480 - rm -r -f AirPcap_Devpack_4_1_0_1622 - rm -r -f GeoIP-1.4.5ws - rm -r -f GeoIP-1.*-win??ws - rm -r -f libssh-0.7.2 - rm -r -f WinSparkle-0.3-44-g2c8d9d3-win??ws - rm -r -f WpdPack - cd "$(MAKEDIR)" - -################################################################################ -# Prepare the debug trees for running Wireshark/Tshark from there. -################################################################################ - - -# prepare debugging of Wireshark in INSTALL_DIR -debug-wireshark: $(PROGRAM_NAME_GTK).exe install-generated-files - -# prepare debugging of tshark in INSTALL_DIR -debug-tshark: tshark.exe install-generated-files - -# prepare debugging of tfshark in INSTALL_DIR -debug-tfshark: tfshark.exe install-generated-files - -# prepare debugging of rawshark in INSTALL_DIR -debug-rawshark: rawshark.exe install-generated-files - -# prepare debugging of dumpcap in INSTALL_DIR -debug-dumpcap: dumpcap.exe install-generated-files - - -# install generated files (exe, "our" libs, ...) -install-generated-files: doc - set copycmd=/y - if not exist $(INSTALL_DIR) mkdir $(INSTALL_DIR) -!IF DEFINED (MSVCR_DLL) && "$(MSVC_VARIANT)" == "MSVC2008" - xcopy "$(MSVCR_DLL)" $(INSTALL_DIR)\*.* /d -!ENDIF -!IFDEF ENABLE_LIBWIRESHARK - xcopy epan\libwireshark.dll $(INSTALL_DIR) /d - if exist epan\libwireshark.lib xcopy .\epan\libwireshark.lib $(INSTALL_DIR) /d - if exist epan\libwireshark.pdb xcopy .\epan\libwireshark.pdb $(INSTALL_DIR) /d -!ENDIF - xcopy ".\codecs\libwscodecs.dll" $(INSTALL_DIR) /d - if exist ".\codecs\libwscodecs.lib" xcopy ".\codecs\libwscodecs.lib" $(INSTALL_DIR) /d - if exist ".\codecs\libwscodecs.pdb" xcopy ".\codecs\libwscodecs.pdb" $(INSTALL_DIR) /d - xcopy ".\wiretap\wiretap-$(WTAP_VERSION).dll" $(INSTALL_DIR) /d - if exist ".\wiretap\wiretap-$(WTAP_VERSION).lib" xcopy ".\wiretap\wiretap-$(WTAP_VERSION).lib" $(INSTALL_DIR) /d - if exist ".\wiretap\wiretap-$(WTAP_VERSION).pdb" xcopy ".\wiretap\wiretap-$(WTAP_VERSION).pdb" $(INSTALL_DIR) /d - xcopy ".\wsutil\libwsutil.dll" $(INSTALL_DIR) /d - if exist ".\wsutil\libwsutil.lib" xcopy ".\wsutil\libwsutil.lib" $(INSTALL_DIR) /d - if exist ".\wsutil\libwsutil.pdb" xcopy ".\wsutil\libwsutil.pdb" $(INSTALL_DIR) /d - if exist $(PROGRAM_NAME_GTK).exe xcopy $(PROGRAM_NAME_GTK).exe $(INSTALL_DIR) /d - if exist $(PROGRAM_NAME_GTK).pdb xcopy $(PROGRAM_NAME_GTK).pdb $(INSTALL_DIR) /d - if exist $(PROGRAM_NAME_GTK).bsc xcopy $(PROGRAM_NAME_GTK).bsc $(INSTALL_DIR) /d - if exist ".\docbook\user-guide.chm" xcopy ".\docbook\user-guide.chm" $(INSTALL_DIR) /d - if not exist $(INSTALL_DIR)\extcap mkdir $(INSTALL_DIR)\extcap - if exist ".\extcap\androiddump.exe" xcopy ".\extcap\androiddump.exe" $(INSTALL_DIR)\extcap /d - if exist ".\extcap\androiddump.pdb" xcopy ".\extcap\androiddump.pdb" $(INSTALL_DIR)\extcap /d - if exist ".\extcap\randpktdump.exe" xcopy ".\extcap\randpktdump.exe" $(INSTALL_DIR)\extcap /d - if exist ".\extcap\randpktdump.pdb" xcopy ".\extcap\randpktdump.pdb" $(INSTALL_DIR)\extcap /d - if exist ".\extcap\sshdump.exe" xcopy ".\extcap\sshdump.exe" $(INSTALL_DIR)\extcap /d - if exist ".\extcap\sshdump.pdb" xcopy ".\extcap\sshdump.pdb" $(INSTALL_DIR)\extcap /d - if exist ".\extcap\ciscodump.exe" xcopy ".\extcap\ciscodump.exe" $(INSTALL_DIR)\extcap /d - if exist ".\extcap\ciscodump.pdb" xcopy ".\extcap\ciscodump.pdb" $(INSTALL_DIR)\extcap /d - if not exist $(INSTALL_DIR_QT)\extcap mkdir $(INSTALL_DIR_QT)\extcap - if exist ".\extcap\androiddump.exe" xcopy ".\extcap\androiddump.exe" $(INSTALL_DIR_QT)\extcap /d - if exist ".\extcap\androiddump.pdb" xcopy ".\extcap\androiddump.pdb" $(INSTALL_DIR_QT)\extcap /d - if exist ".\extcap\randpktdump.exe" xcopy ".\extcap\randpktdump.exe" $(INSTALL_DIR_QT)\extcap /d - if exist ".\extcap\randpktdump.pdb" xcopy ".\extcap\randpktdump.pdb" $(INSTALL_DIR_QT)\extcap /d - if exist ".\extcap\sshdump.exe" xcopy ".\extcap\sshdump.exe" $(INSTALL_DIR_QT)\extcap /d - if exist ".\extcap\sshdump.pdb" xcopy ".\extcap\sshdump.pdb" $(INSTALL_DIR_QT)\extcap /d - if exist ".\extcap\ciscodump.exe" xcopy ".\extcap\ciscodump.exe" $(INSTALL_DIR_QT)\extcap /d - if exist ".\extcap\ciscodump.pdb" xcopy ".\extcap\ciscodump.pdb" $(INSTALL_DIR_QT)\extcap /d - if exist capinfos.exe xcopy capinfos.exe $(INSTALL_DIR) /d - if exist capinfos.pdb xcopy capinfos.pdb $(INSTALL_DIR) /d - if exist captype.exe xcopy captype.exe $(INSTALL_DIR) /d - if exist captype.pdb xcopy captype.pdb $(INSTALL_DIR) /d - if exist dumpcap.exe xcopy dumpcap.exe $(INSTALL_DIR) /d - if exist dumpcap.pdb xcopy dumpcap.pdb $(INSTALL_DIR) /d - if exist editcap.exe xcopy editcap.exe $(INSTALL_DIR) /d - if exist editcap.pdb xcopy editcap.pdb $(INSTALL_DIR) /d - if exist mergecap.exe xcopy mergecap.exe $(INSTALL_DIR) /d - if exist mergecap.pdb xcopy mergecap.pdb $(INSTALL_DIR) /d - if exist randpkt.exe xcopy randpkt.exe $(INSTALL_DIR) /d - if exist randpkt.pdb xcopy randpkt.pdb $(INSTALL_DIR) /d - if exist reordercap.exe xcopy reordercap.exe $(INSTALL_DIR) /d - if exist reordercap.pdb xcopy reordercap.pdb $(INSTALL_DIR) /d - if exist rawshark.exe xcopy rawshark.exe $(INSTALL_DIR) /d - if exist rawshark.pdb xcopy rawshark.pdb $(INSTALL_DIR) /d - if exist text2pcap.exe xcopy text2pcap.exe $(INSTALL_DIR) /d - if exist text2pcap.pdb xcopy text2pcap.pdb $(INSTALL_DIR) /d - if exist tfshark.exe xcopy tfshark.exe $(INSTALL_DIR) /d - if exist tfshark.pdb xcopy tfshark.pdb $(INSTALL_DIR) /d - if exist tshark.exe xcopy tshark.exe $(INSTALL_DIR) /d - if exist tshark.pdb xcopy tshark.pdb $(INSTALL_DIR) /d - xcopy "doc\AUTHORS-SHORT" $(INSTALL_DIR) /d - xcopy ".\manuf" $(INSTALL_DIR) /d - xcopy ".\services" $(INSTALL_DIR) /d - xcopy ".\pdml2html.xsl" $(INSTALL_DIR) /d - $(TEXTIFY) -Destination $(INSTALL_DIR) \ - ./COPYING \ - ./NEWS \ - ./README \ - ./README.windows - xcopy ".\cfilters" $(INSTALL_DIR) /d - xcopy ".\colorfilters" $(INSTALL_DIR) /d - xcopy ".\dfilters" $(INSTALL_DIR) /d - xcopy ".\smi_modules" $(INSTALL_DIR) /d -!IFDEF LUA_DIR - xcopy ".\epan\wslua\init.lua" $(INSTALL_DIR) /d - xcopy ".\epan\wslua\console.lua" $(INSTALL_DIR) /d -!ENDIF - xcopy ipmap.html $(INSTALL_DIR) /d - xcopy doc\*.html $(INSTALL_DIR) /d - xcopy doc\ws.css $(INSTALL_DIR) /d - if not exist $(INSTALL_DIR)\help mkdir $(INSTALL_DIR)\help - xcopy ".\help\toc" $(INSTALL_DIR)\help /d - $(TEXTIFY) -Destination $(INSTALL_DIR)\help help\*.txt - if not exist $(INSTALL_DIR)\dtds mkdir $(INSTALL_DIR)\dtds - xcopy ".\dtds\*.*" $(INSTALL_DIR)\dtds /d - if not exist $(INSTALL_DIR)\asn1 mkdir $(INSTALL_DIR)\asn1 - echo create empty asn1 default.tt file to prevent problems 2> $(INSTALL_DIR)\asn1\default.tt - if not exist $(INSTALL_DIR)\radius mkdir $(INSTALL_DIR)\radius - xcopy ".\radius\*.*" $(INSTALL_DIR)\radius /d - if not exist $(INSTALL_DIR)\diameter mkdir $(INSTALL_DIR)\diameter - xcopy ".\diameter\*.dtd" $(INSTALL_DIR)\diameter /d - xcopy ".\diameter\*.xml" $(INSTALL_DIR)\diameter /d - if not exist $(INSTALL_DIR)\tpncp mkdir $(INSTALL_DIR)\tpncp - xcopy ".\tpncp\*.dat" $(INSTALL_DIR)\tpncp /d - if not exist $(INSTALL_DIR)\wimaxasncp mkdir $(INSTALL_DIR)\wimaxasncp - xcopy ".\wimaxasncp\*.*" $(INSTALL_DIR)\wimaxasncp /d - if not exist $(INSTALL_DIR)\plugins mkdir $(INSTALL_DIR)\plugins - cd plugins - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-plugins - cd .. - if not exist $(INSTALL_DIR)\profiles mkdir $(INSTALL_DIR)\profiles - if not exist $(INSTALL_DIR)\profiles\Bluetooth mkdir $(INSTALL_DIR)\profiles\Bluetooth - xcopy ".\profiles\Bluetooth\colorfilters" $(INSTALL_DIR)\profiles\Bluetooth /d - if not exist $(INSTALL_DIR)\profiles\Classic mkdir $(INSTALL_DIR)\profiles\Classic - xcopy ".\profiles\Classic\colorfilters" $(INSTALL_DIR)\profiles\Classic /d - -# "install-all" will copy all files needed to run Wireshark/Tshark -# to the INSTALL_DIR, so you can run/debug Wireshark/Tshark from there. -install-all: install-generated-files - set copycmd=/y - if not exist $(INSTALL_DIR) mkdir $(INSTALL_DIR) -!IF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6" - xcopy $(GTK_DIR)\bin\libgdk-3-0.dll $(INSTALL_DIR) /d - xcopy $(GTK_DIR)\bin\libgtk-3-0.dll $(INSTALL_DIR) /d -!ELSE - xcopy $(GTK_DIR)\bin\libgdk-win32-2.0-0.dll $(INSTALL_DIR) /d - xcopy $(GTK_DIR)\bin\libgtk-win32-2.0-0.dll $(INSTALL_DIR) /d -!ENDIF - xcopy $(GTK_DIR)\bin\libgdk_pixbuf-2.0-0.dll $(INSTALL_DIR) /d - xcopy $(GTK_DIR)\bin\libatk-1.0-0.dll $(INSTALL_DIR) /d - xcopy $(GTK_DIR)\bin\libpango-1.0-0.dll $(INSTALL_DIR) /d - xcopy $(GTK_DIR)\bin\libpangowin32-1.0-0.dll $(INSTALL_DIR) /d - if not exist $(INSTALL_DIR)\lib mkdir $(INSTALL_DIR)\lib - if not exist $(INSTALL_DIR)\etc mkdir $(INSTALL_DIR)\etc - if not exist $(INSTALL_DIR)\$(GTK_ETC_DIR) mkdir $(INSTALL_DIR)\$(GTK_ETC_DIR) - xcopy $(GTK_DIR)\$(GTK_ETC_DIR)\*.* $(INSTALL_DIR)\$(GTK_ETC_DIR) /d -# if not exist $(INSTALL_DIR)\etc\pango mkdir $(INSTALL_DIR)\etc\pango -# xcopy $(GTK_DIR)\etc\pango\pango.* $(INSTALL_DIR)\etc\pango /d -!IF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6" - if not exist $(INSTALL_DIR)\lib\gtk-3.0 mkdir $(INSTALL_DIR)\lib\gtk-3.0 - if not exist $(INSTALL_DIR)\lib\gtk-3.0\$(GTK_LIB_DIR) mkdir $(INSTALL_DIR)\lib\gtk-3.0\$(GTK_LIB_DIR) - xcopy ".\ui\win32\settings.ini" $(INSTALL_DIR)\$(GTK_ETC_DIR) /d -!ELSE - if not exist $(INSTALL_DIR)\lib\gtk-2.0 mkdir $(INSTALL_DIR)\lib\gtk-2.0 - if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR) mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR) - if not exist $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders mkdir $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders - if exist $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders /d -!ENDIF -!IFDEF GTK_ENGINES_DIR - if not exist $(INSTALL_DIR)\$(GTK_ENGINES_DIR) mkdir $(INSTALL_DIR)\$(GTK_ENGINES_DIR) - xcopy $(GTK_DIR)\$(GTK_ENGINES_DIR)\libpixmap.dll $(INSTALL_DIR)\$(GTK_ENGINES_DIR) /d - xcopy $(GTK_DIR)\$(GTK_ENGINES_DIR)\libwimp.dll $(INSTALL_DIR)\$(GTK_ENGINES_DIR) /d -!ENDIF -!IFDEF GTK_THEMES_DIR - xcopy "$(GTK_DIR)\$(GTK_THEMES_DIR)\gtkrc" $(INSTALL_DIR)\$(GTK_ETC_DIR) /d -!ENDIF -!IFDEF GTK_MODULES_DIR - if not exist $(INSTALL_DIR)\$(GTK_MODULES_DIR) mkdir $(INSTALL_DIR)\$(GTK_MODULES_DIR) - xcopy $(GTK_DIR)\$(GTK_MODULES_DIR)\libgail.dll $(INSTALL_DIR)\$(GTK_MODULES_DIR) /d -!ENDIF -!IFDEF NEED_CAIRO_GOBJECT_DLL - xcopy $(GTK_DIR)\bin\libcairo-gobject-2.dll $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_CAIRO_DLL - xcopy $(GTK_DIR)\bin\libcairo-2.dll $(INSTALL_DIR) /d - xcopy $(GTK_DIR)\bin\libpangocairo-1.0-0.dll $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_EXPAT_DLL - xcopy $(GTK_DIR)\bin\$(EXPAT_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_FFI_DLL - xcopy $(GTK_DIR)\bin\$(FFI_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_FONTCONFIG_DLL - xcopy $(GTK_DIR)\bin\$(FONTCONFIG_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_FREETYPE_DLL - xcopy $(GTK_DIR)\bin\libpangoft2-1.0-0.dll $(INSTALL_DIR) /d - xcopy $(GTK_DIR)\bin\$(FREETYPE_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_HARFBUZZ_DLL - xcopy $(GTK_DIR)\bin\$(HARFBUZZ_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_JASPER_DLL - xcopy $(GTK_DIR)\bin\$(JASPER_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_JPEG_DLL - xcopy $(GTK_DIR)\bin\$(JPEG_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_LZMA_DLL - xcopy $(GTK_DIR)\bin\$(LZMA_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_PIXMAN_DLL - xcopy $(GTK_DIR)\bin\$(PIXMAN_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_PNG_DLL - xcopy $(GTK_DIR)\bin\$(PNG_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_SEH_DLL - xcopy $(GTK_DIR)\bin\$(SEH_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_SJLJ_DLL - xcopy $(GTK_DIR)\bin\$(SJLJ_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_TIFF_DLL - xcopy $(GTK_DIR)\bin\$(TIFF_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF NEED_XML_DLL - xcopy $(GTK_DIR)\bin\$(XML_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF GTK_SCHEMAS_DIR - if not exist $(INSTALL_DIR)\$(GTK_SCHEMAS_DIR) mkdir $(INSTALL_DIR)\$(GTK_SCHEMAS_DIR) - if not exist $(GTK_DIR)\$(GTK_SCHEMAS_DIR)\gschemas.compiled $(GTK_DIR)\bin\glib-compile-schemas $(GTK_DIR)\$(GTK_SCHEMAS_DIR) - xcopy $(GTK_DIR)\$(GTK_SCHEMAS_DIR)\gschemas.compiled $(INSTALL_DIR)\$(GTK_SCHEMAS_DIR) /d -!ENDIF - xcopy $(GTK_DIR)\bin\libgio-2.0-0.dll $(INSTALL_DIR) /d - xcopy $(GTK_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR) /d - xcopy $(GTK_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL_DIR) /d - xcopy $(GTK_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d -!IF "$(GTK_PKG)" != "2.24.14-1.1" - xcopy $(GTK_DIR)\bin\$(INTL_DLL) $(INSTALL_DIR) /d -!ENDIF - xcopy $(GTK_DIR)\bin\gspawn-$(WIRESHARK_TARGET_PLATFORM)-helper.exe $(INSTALL_DIR) /d - xcopy $(GTK_DIR)\bin\gspawn-$(WIRESHARK_TARGET_PLATFORM)-helper-console.exe $(INSTALL_DIR) /d -!IFDEF ZLIB_DIR - xcopy $(ZLIB_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF C_ARES_DIR - xcopy $(C_ARES_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF KFW_DIR - xcopy $(KFW_PATH)\$(COMERR_DLL) $(INSTALL_DIR) /d - xcopy $(KFW_PATH)\$(KRB5_DLL) $(INSTALL_DIR) /d - xcopy $(KFW_PATH)\$(K5SPRT_DLL) $(INSTALL_DIR) /d -!ENDIF -!IFDEF GNUTLS_DIR - xcopy $(GNUTLS_DIR)\bin\libffi-6.dll $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\$(GCC_DLL) $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\libgcrypt-20.dll $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\libgmp-10.dll $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\libgnutls-28.dll $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\$(GPGERROR_DLL) $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\libhogweed-2-4.dll $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\libnettle-4-6.dll $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\libp11-kit-0.dll $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\libtasn1-6.dll $(INSTALL_DIR) /d -! IF "$(INTL_DLL)" != "libintl-8.dll" || "$(GTK_PKG)" == "2.24.14-1.1" -# The gtk+ bundle doesn't provide libintl-8.dll (which is the case -# with the 32-bit package) or libintl-8.dll doesn't include -# intl_vasprintf; use the GNUTLS version. - xcopy $(GNUTLS_DIR)\bin\libintl-8.dll $(INSTALL_DIR) /d -! ENDIF -!ENDIF -!IFDEF LUA_DIR - xcopy "$(LUA_DIR)\lua52.dll" $(INSTALL_DIR) /d -!ENDIF -!IFDEF SMI_DIR - if not exist $(INSTALL_DIR)\snmp mkdir $(INSTALL_DIR)\snmp - if not exist $(INSTALL_DIR)\snmp\mibs mkdir $(INSTALL_DIR)\snmp\mibs - xcopy "$(SMI_DIR)\bin\libsmi-2.dll" $(INSTALL_DIR) /d - xcopy "$(SMI_DIR)\share\mibs\iana\*" $(INSTALL_DIR)\snmp\mibs /d - xcopy "$(SMI_DIR)\share\mibs\ietf\*" $(INSTALL_DIR)\snmp\mibs /d - xcopy "$(SMI_DIR)\share\mibs\irtf\*" $(INSTALL_DIR)\snmp\mibs /d - xcopy "$(SMI_DIR)\share\mibs\site\*" $(INSTALL_DIR)\snmp\mibs /d - xcopy "$(SMI_DIR)\share\mibs\tubs\*" $(INSTALL_DIR)\snmp\mibs /d - xcopy "$(SMI_DIR)\share\pibs\*" $(INSTALL_DIR)\snmp\mibs /d - xcopy "$(SMI_DIR)\share\yang\*.yang" $(INSTALL_DIR)\snmp\mibs /d -!ENDIF -!IFDEF GEOIP_DIR - xcopy "$(GEOIP_DIR)\bin\libGeoip-1.dll" $(INSTALL_DIR) /d -!ENDIF -!IFDEF LIBSSH_DIR - xcopy "$(LIBSSH_DIR)\bin\libssh.dll" $(INSTALL_DIR) /d -!ENDIF -!IFDEF WINSPARKLE_DIR - xcopy "$(WINSPARKLE_DIR)\WinSparkle.dll" $(INSTALL_DIR) /d -!ENDIF - cd $(INSTALL_DIR) - peflags --dynamicbase=true --nxcompat=true *.dll -!IF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6" -!ELSE - peflags --dynamicbase=true --nxcompat=true lib/gtk-2.0/*/engines/*.dll - peflags --dynamicbase=true --nxcompat=true lib/gtk-2.0/modules/*.dll -!ENDIF - cd .. - -checkapi_local: - $(PERL) tools/checkAPIs.pl -build \ - $(WIRESHARK_COMMON_SRC) \ - $(EXTCAP_COMMON_SRC) \ - $(TSHARK_TAP_SRC) \ -# $(EXTRA_wireshark_SOURCES) - -checkapi: checkapi_local - cd wiretap - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../capchild - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../caputils - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../randpkt_core - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../codecs - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../ui - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd gtk - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../cli - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../win32 - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../../epan - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../epan/crypt - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../dfilter - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../ftypes - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../wmem - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../wslua - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../dissectors - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd .. - cd ../plugins - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - cd ../wsutil - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi - -#### -_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory diff --git a/Makefile.nmake.inc b/Makefile.nmake.inc deleted file mode 100644 index b7b5c4e470..0000000000 --- a/Makefile.nmake.inc +++ /dev/null @@ -1,25 +0,0 @@ -# Makefile.nmake.inc -# Include file for Makefile.am files to get additional rules -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 2007 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -.SUFFIXES: .l - -.l.c: - $(SH) $(RUNLEX) "$(LEX)" "$(SED)" -o$@ $< diff --git a/capchild/Makefile.am b/capchild/Makefile.am index cf21234cbe..74d49969ff 100644 --- a/capchild/Makefile.am +++ b/capchild/Makefile.am @@ -68,5 +68,4 @@ EXTRA_DIST = \ $(GENERATOR_FILES) \ CMakeLists.txt \ doxygen.cfg.in \ - Makefile.common \ - Makefile.nmake + Makefile.common
\ No newline at end of file diff --git a/capchild/Makefile.nmake b/capchild/Makefile.nmake deleted file mode 100644 index 8220bafd01..0000000000 --- a/capchild/Makefile.nmake +++ /dev/null @@ -1,76 +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) \ - /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 $< - -include Makefile.common - - -# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST -CAPCHILD_OBJECTS = \ - $(CAPCHILD_SRC:.c=.obj) - -RUNLEX=../tools/runlex.sh - -libcapchild.lib : ..\config.h $(CAPCHILD_OBJECTS) - link /lib /out:libcapchild.lib $(CAPCHILD_OBJECTS) - -clean: - rm -f $(CAPCHILD_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libcapchild.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 \ - $(CAPCHILD_SRC) - -checkapi-todo: - $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ - $(CAPCHILD_SRC) 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) diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake index f982de8c04..22148beb99 100644 --- a/cmake/modules/WiresharkPlugin.cmake +++ b/cmake/modules/WiresharkPlugin.cmake @@ -1,11 +1,10 @@ # Plugin convenience macros. -# Set information similar to moduleinfo.nmake +# Set information macro(SET_MODULE_INFO _plugin _ver_major _ver_minor _ver_micro _ver_extra) # Create the Windows .rc file for the plugin. # The values come from several files in the source, I can't see how to reuse them - # This info is from moduleinfo.nmake set(PACKAGE ${_plugin}) set(MODULE_VERSION_MAJOR ${_ver_major}) set(MODULE_VERSION_MINOR ${_ver_minor}) @@ -17,7 +16,6 @@ macro(SET_MODULE_INFO _plugin _ver_major _ver_minor _ver_micro _ver_extra) # This info is from Makefile.common set(PLUGIN_NAME ${PACKAGE}) - # This info is from config.nmake set(MSVC_VARIANT "${CMAKE_GENERATOR}") # The rc.in requires a plain VERSION variable diff --git a/codecs/Makefile.am b/codecs/Makefile.am index 35d92d32a7..591b75dd48 100644 --- a/codecs/Makefile.am +++ b/codecs/Makefile.am @@ -62,7 +62,6 @@ noinst_HEADERS = \ EXTRA_DIST = \ CMakeLists.txt \ Makefile.common \ - Makefile.nmake \ speex/README.txt CLEANFILES = \ diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake deleted file mode 100644 index cb59f32b50..0000000000 --- a/codecs/Makefile.nmake +++ /dev/null @@ -1,87 +0,0 @@ -## Makefile for building libwscodecs.dll 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 ######### - -CFLAGS=/I.. $(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - $(GLIB_CFLAGS) -DWS_BUILD_DLL - -DIRTY_CFLAGS=/I.. $(STANDARD_CFLAGS) \ - $(GLIB_CFLAGS) -DWS_BUILD_DLL - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -include Makefile.common - -# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST -# XXX - if the codec files weren't in subdirectories, we could just do -# LIBWSCODECS_OBJECTS = $(LIBWSCODECS_SRC:.c=.obj), and wouldn't need rules -# for each of the codecs below -# -LIBWSCODECS_OBJECTS= \ - codecs.obj \ - G711udecode.obj \ - G711adecode.obj \ - G722decode.obj \ - G726decode.obj \ - resample.obj \ - sbc.obj - -libwscodecs_LIBS = \ - $(GLIB_LIBS) \ - ..\wsutil\libwsutil.lib - -libwscodecs.lib: libwscodecs.dll -libwscodecs.exp: libwscodecs.dll - -libwscodecs.dll : $(LIBWSCODECS_OBJECTS) ..\image\libwscodecs.res - @echo Linking libwscodecs.dll - $(link) $(dlllflags) $(conlibsdll) \ - $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ - /OUT:libwscodecs.dll \ - /IMPLIB:libwscodecs.lib \ - ..\image\libwscodecs.res \ - $(LIBWSCODECS_OBJECTS) $(libwscodecs_LIBS) - -codecs.obj: codecs.c codecs.h - $(CC) $(CFLAGS) -Fd.\ -c codecs.c /Fo%|fF.obj - -G711adecode.obj: G711a\G711adecode.c G711a\G711adecode.h G711a\G711atable.h - $(CC) $(CFLAGS) -Fd.\ -c G711a\G711adecode.c /Fo%|fF.obj - -G711udecode.obj: G711u\G711udecode.c G711u\G711udecode.h G711u\G711utable.h - $(CC) $(CFLAGS) -Fd.\ -c G711u\G711udecode.c /Fo%|fF.obj - -G722decode.obj: G722\G722decode.c G722\G722decode.h - $(CC) $(CFLAGS) -Fd.\ -c G722\G722decode.c /Fo%|fF.obj - -G726decode.obj: G726\G726decode.c G726\G726decode.h - $(CC) $(CFLAGS) -Fd.\ -c G726\G726decode.c /Fo%|fF.obj - -resample.obj: speex\resample.c speex\arch.h speex\speex_resampler.h speex\stack_alloc.h - $(CC) $(DIRTY_CFLAGS) -Fd.\ -c speex\resample.c /Fo%|fF.obj - -sbc.obj: sbc\sbc.c sbc\sbc_private.h - $(CC) $(CFLAGS) -Fd.\ -c sbc\sbc.c /Fo%|fF.obj - -clean: - rm -f $(LIBWSCODECS_OBJECTS) \ - libwscodecs.lib \ - libwscodecs.exp \ - libwscodecs.dll \ - libwscodecs.dll.manifest \ - *.nativecodeanalysis.xml *.pdb *.sbr - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(LIBWSCODECS_SRC) sbc/sbc.c diff --git a/config.h.win32 b/config.h.win32 deleted file mode 100644 index f511ce9fca..0000000000 --- a/config.h.win32 +++ /dev/null @@ -1,250 +0,0 @@ -/* config.h.win32. Generated manually. :-) */ -/* config.h. Generated automatically by configure. */ -/* config.h.in. Generated automatically from configure.ac by autoheader. */ - -/* Generated Bison and Flex files test whether __STDC__ is defined - in order to check whether to use ANSI C features such as "const". - - GCC defines it as 1 even if extensions that render the implementation - non-conformant are enabled; Sun's C compiler (and, I think, other - AT&T-derived C compilers) define it as 0 if extensions that render - the implementation non-conformant are enabled; Microsoft Visual C++ - 6.0 doesn't define it at all if extensions that render the implementation - non-conformant are enabled. - - We define it as 0 here, so that those generated files will use - those features (and thus not get type warnings when compiled with - MSVC++). */ -#ifndef __STDC__ -#define __STDC__ 0 -#endif - -/* - * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h - */ -#define YY_NO_UNISTD_H - -/* Use Unicode in Windows runtime functions. */ -#define UNICODE 1 -#define _UNICODE 1 - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ - -/* Define if lex declares yytext as a char * by default, not a char[]. */ -#define YYTEXT_POINTER 1 - -#define HAVE_PLUGINS 1 -#define HAVE_EXTCAP 1 - -/* #undef HAVE_MKSTEMPS */ -/* #undef HAVE_MKDTEMP */ - -@HAVE_LIBPCAP@ -@HAVE_PCAP_BREAKLOOP@ -@HAVE_PCAP_DATALINK_NAME_TO_VAL@ - -/* Always true in WinPcap, even without pcap_capture(). */ -/* Define to 1 if the capture buffer size can be set. */ -#define CAN_SET_CAPTURE_BUFFER_SIZE 1 - -@HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION@ -@HAVE_PCAP_DATALINK_VAL_TO_NAME@ -@HAVE_PCAP_FINDALLDEVS@ - -@HAVE_PCAP_LIST_DATALINKS@ -@HAVE_PCAP_FREE_DATALINKS@ -@HAVE_PCAP_SET_DATALINK@ - -@HAVE_REMOTE@ -@HAVE_PCAP_REMOTE@ -@HAVE_PCAP_OPEN@ -@HAVE_PCAP_CREATE@ -@HAVE_PCAP_OPEN_DEAD@ -@HAVE_BPF_IMAGE@ -@HAVE_PCAP_SETSAMPLING@ - -/* availability of pcap_freecode() is handled at runtime */ -#define HAVE_PCAP_FREECODE 1 - -/* `pcap_get_selectable_fd' is UN*X-only. */ -/* #undef HAVE_PCAP_GET_SELECTABLE_FD */ - -@HAVE_AIRPCAP@ - -@PCAP_NG_DEFAULT@ -@WANT_PACKET_EDITOR@ - -/* Define if you have the floorl function. */ -#define HAVE_FLOORL 1 - -/* Define if you have the getprotobynumber function. */ -/* #undef HAVE_GETPROTOBYNUMBER */ - -/* Define if you have the <arpa/inet.h> header file. */ -/* #undef HAVE_ARPA_INET_H */ - -/* Define if you have the <fcntl.h> header file. */ -#define HAVE_FCNTL_H 1 - -/* Define if you have the <iconv.h> header file. */ -/* #undef HAVE_ICONV */ - -/* Define if you have the <netdb.h> header file. */ -/* #undef HAVE_NETDB_H */ - -/* Define if you have the <netinet/in.h> header file. */ -/* #define HAVE_NETINET_IN_H 1 */ - -/* Define if your printf() function supports thousands grouping. */ -/* #undef HAVE_GLIB_PRINTF_GROUPING */ - -/* Define if you have the <snmp/snmp.h> header file. */ -/* #undef HAVE_SNMP_SNMP_H */ - -/* Define if you have the <snmp/version.h> header file. */ -/* #undef HAVE_SNMP_VERSION_H */ - -/* Define if you have the <sys/ioctl.h> header file. */ -/* #undef HAVE_SYS_IOCTL_H */ - -/* Define if you have the <sys/socket.h> header file. */ -/* #undef HAVE_SYS_SOCKET_H */ - -/* Define if you have the <sys/sockio.h> header file. */ -/* #undef HAVE_SYS_SOCKIO_H */ - -/* Define if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define if you have the <sys/time.h> header file. */ -/* #define HAVE_SYS_TIME_H 1 */ - -/* Define if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define if you have the <sys/wait.h> header file. */ -/* #undef HAVE_SYS_WAIT_H */ - -/* Define if you have the <unistd.h> header file. */ -/* #define HAVE_UNISTD_H 1 */ - -/* Define if you have the <windows.h> header file. */ -#define HAVE_WINDOWS_H 1 - -/* Define if you have the <winsock2.h> header file. */ -#define HAVE_WINSOCK2_H 1 - -/* Define if <inttypes.h> defines PRI[doxu]64 macros */ -/* #define INTTYPES_H_DEFINES_FORMATS */ - -/* Define if you have the z library (-lz). */ -@HAVE_ZLIB@ -#ifdef HAVE_ZLIB -#define HAVE_INFLATEPRIME 1 -#endif - -/* Define to use c-ares library */ -@HAVE_C_ARES@ - -/* Define to use the gnutls library */ -@HAVE_LIBGNUTLS@ - -/* Define to use the libgcrypt library */ -@HAVE_LIBGCRYPT@ - -/* Define to use mit kerberos for decryption of kerberos/sasl/dcerpc */ -@HAVE_KFW@ -#ifdef HAVE_MIT_KERBEROS -#define HAVE_KERBEROS -#endif - -/* Define to use Lua */ -@HAVE_LUA@ - -/* Define to use Portaudio library */ -@HAVE_LIBPORTAUDIO@ -/* Define version of of the Portaudio library API */ -@PORTAUDIO_API_1@ - -/* Define to have SMI */ -@HAVE_SMI@ - -/* Define to use GeoIP library */ -@HAVE_GEOIP@ - -/* Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later) */ -@HAVE_GEOIP_V6@ - -/* Define to enable WinSparkle software updates */ -@HAVE_SOFTWARE_UPDATE@ - -/* Define to have ntddndis.h */ -@HAVE_NTDDNDIS_H@ - -/* Define if you have the strptime function. */ -/* #undef HAVE_STRPTIME 1 */ - -#ifndef WIN32 -#define WIN32 1 -#endif - -/* Wireshark's marker that a function parameter is unused. Used to avoid - * warnings on compilers that support such hints. - */ -#define _U_ - -/* Hint to the compiler that a function never returns */ -#define WS_NORETURN __declspec(noreturn) - -/* Visual C 9 (2008), Visual C 10 (2010) and Visual C 11 (2012) and Visual C 12 (2013) need these prototypes */ -#if _MSC_VER >= 1500 -#define NTDDI_VERSION NTDDI_WINXPSP3 -#define _WIN32_WINNT _WIN32_WINNT_WINXP -#endif - -#define popen _popen -#define pclose _pclose - -/* Define to use GTK */ -#define HAVE_GTK - -/* Name of package */ -#define PACKAGE "wireshark" - -/* Version number of package */ -#define VERSION "@VERSION@" - -/* Broken down version */ -#define VERSION_MAJOR @VERSION_MAJOR@ -#define VERSION_MINOR @VERSION_MINOR@ -#define VERSION_MICRO @VERSION_MICRO@ - -#define VERSION_FLAVOR "@VERSION_FLAVOR@" - -/* Check for the required _MSC_VER */ -#if MSC_VER_REQUIRED != _MSC_VER -#define WS_TO_STRING2(x) #x -#define WS_TO_STRING(x) WS_TO_STRING2(x) -#pragma message( "_MSC_VER is:" WS_TO_STRING(_MSC_VER) " but required is:" WS_TO_STRING(MSC_VER_REQUIRED) ) -#error Your MSVC_VARIANT setting in config.nmake doesn't match the MS compiler version! -#endif - -/* Disable Code Analysis warnings that result in too many false positives. */ -/* http://msdn.microsoft.com/en-US/library/zyhb0b82.aspx */ -#if _MSC_VER >= 1400 -#pragma warning ( disable : 6011 ) -#endif - -#if !defined(QT_VERSION) || !defined(_SSIZE_T_DEFINED) -typedef int ssize_t; -#endif - -/* to use define _ws_mempbrk_sse42 if available (checked with cpuinfo) */ -#define HAVE_SSE4_2 1 - -#include <ws_diag_control.h> diff --git a/config.nmake b/config.nmake deleted file mode 100644 index 1f372950ee..0000000000 --- a/config.nmake +++ /dev/null @@ -1,1753 +0,0 @@ -# Some more information about the settings in this file can be found in -# the file README.windows and the Developer's Guide (available online). - -##### Deprecation ##### -# Support for NMake and QMake will be removed in June 2016. -# Uncomment the following line or pass YES_I_KNOW_ABOUT_THE_DEPRECATION=1 -# on the command line to override. - -#YES_I_KNOW_ABOUT_THE_DEPRECATION=1 -!IFNDEF YES_I_KNOW_ABOUT_THE_DEPRECATION -!MESSAGE Nmake is being deprecated. Please consider using CMake instead. -!MESSAGE See https://www.wireshark.org/docs/wsdg_html_chunked/ChSetupWin32.html -!MESSAGE for details. -!ERROR Set YES_I_KNOW_ABOUT_THE_DEPRECATION to disable this message. -!ENDIF - -##### Program name ##### -# Changing the name is experimental and may break the installer/uninstaller and possibly other stuff. -# Application data will still be under the same dir as Wireshark so preference files, profiles, and etc -# will be shared with a "normal" Wireshark installation. -# Note that support libraries need to be in PROGRAM_NAME-libs... - -!IFNDEF PROGRAM_NAME -PROGRAM_NAME=Wireshark -!ENDIF - -##### Target platform ##### - -# Pick up the value from the environment, VS2012 onwards sets PLATFORM via -# vcvarsall.bat (it appears for X64 only). -# For VS2010 and earlier you'll have to set the value yourself -!IF "$(PLATFORM)" == "x64" || "$(PLATFORM)" == "X64" -WIRESHARK_TARGET_PLATFORM=win64 -!ENDIF - -# Only "win32" and "win64" are valid (for now). -# This can be defined in the system environment. -!IFNDEF WIRESHARK_TARGET_PLATFORM -WIRESHARK_TARGET_PLATFORM=win32 -!ENDIF - -##### Versions ##### - -# The VCS's description of our build. Updated by make-version.pl -VCS_REVISION=0 - -# The current Wireshark version. Recommended: Leave unchanged. -# Updated by make-version.pl -VERSION_MAJOR=2 -VERSION_MINOR=1 -VERSION_MICRO=1 -VERSION_BUILD=$(VCS_REVISION) - -# Local build information. Recommended: Unique string for your -# environment, e.g. "-JackStackBarbecue". Updated by make-version.pl -# Defaults to the environment variable WIRESHARK_VERSION_EXTRA - -VERSION_EXTRA=$(WIRESHARK_VERSION_EXTRA) - -# Banner shown at top right of Qt welcome screen. -!IFDEF WIRESHARK_VERSION_FLAVOR -VERSION_FLAVOR=$(WIRESHARK_VERSION_FLAVOR) -!ELSE -VERSION_FLAVOR=Development Build -!ENDIF - -# The version of the wiretap library. Recommended: Leave unchanged. -WTAP_VERSION_MAJOR=$(VERSION_MAJOR) -WTAP_VERSION_MINOR=$(VERSION_MINOR) -WTAP_VERSION_MICRO=0 - -##### Directories ##### - -# -# Base directory, where your libraries reside, which are needed to -# compile the sources. This setting is used only inside this file. -# This can be defined in the system environment. -# -!IFNDEF WIRESHARK_LIB_DIR -!IFDEF WIRESHARK_BASE_DIR -WIRESHARK_LIB_DIR=$(WIRESHARK_BASE_DIR)\$(PROGRAM_NAME)-$(WIRESHARK_TARGET_PLATFORM)-libs -!ELSE -WIRESHARK_LIB_DIR=C:\$(PROGRAM_NAME)-$(WIRESHARK_TARGET_PLATFORM)-libs -!ENDIF -!ENDIF - -# -# Base directory, where your programs reside. -# This setting is used only inside this file. -# -PROGRAM_FILES=$(PROGRAMFILES) -PROGRAM_FILES_W6432=$(PROGRAMW6432) - -# -# Location of the "tools" directory. This affects the path to textify.ps1 -!IFNDEF TOOLS_DIR -TOOLS_DIR=tools -!ENDIF - -# -# Machine type for the compiler and linker -# TARGET_MACHINE (Used for link /MACHINE) should be one of "X86" or "X64" -# (sorry ARM, Alpha, MIPS, and Itanium fans). -# CPU (Used by win32.mak) should be one of "i386" or "AMD64". -# PROCESSOR_ARCHITECTURE (Used for redistributable packages and -# manifests) should be one of "x86" or "amd64". -!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" -TARGET_MACHINE=x86 -CPU=i386 -PROCESSOR_ARCHITECTURE=x86 -!else if "$(WIRESHARK_TARGET_PLATFORM)" == "win64" -TARGET_MACHINE=x64 -CPU=AMD64 -PROCESSOR_ARCHITECTURE=amd64 -!else -!error Your mysterious moon-man architecture "$(WIRESHARK_TARGET_PLATFORM)" frightens and confuses us. -!endif - - -##### Microsoft Visual C / Studio Variant ##### - -# Pick up the value from the environment, VS2012 onwards sets this via vcvarsall.bat -# For VS2010 and earlier you'll have to set the value yourself -# Assume that the lack of detection of Express editions doesn't matter -!IF "$(VISUALSTUDIOVERSION)" == "10.0" -MSVC_VARIANT=MSVC2010 -!ELSE IF "$(VISUALSTUDIOVERSION)" == "11.0" -MSVC_VARIANT=MSVC2012 -!ELSE IF "$(VISUALSTUDIOVERSION)" == "12.0" -MSVC_VARIANT=MSVC2013 -!ELSE IF "$(VISUALSTUDIOVERSION)" == "14.0" -MSVC_VARIANT=MSVC2015 -!ENDIF - -# For the different Studios, see: http://en.wikipedia.org/wiki/Microsoft_Visual_Studio -# Only one of the following MSVC_VARIANT settings should be used - -# "Microsoft Visual Studio 2008" -# Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll -#MSVC_VARIANT=MSVC2008 - -# "Microsoft Visual C++ 2008 Express Edition" -# Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll -#MSVC_VARIANT=MSVC2008EE - -# "Microsoft Visual Studio 2010" -# Visual C++ 10.0, _MSC_VER 1600, msvcr100.dll -#MSVC_VARIANT=MSVC2010 - -# "Microsoft Visual C++ 2010 Express Edition" -# Visual C++ 10.0, _MSC_VER 1600, msvcr100.dll -#MSVC_VARIANT=MSVC2010EE - -# "Microsoft Visual C++ 2012 Express Edition" -# Visual C++ 11.0, _MSC_VER 1700, msvcr110.dll -## Notes: -## 1. win32.mak is apparently not part of the MS 2012EE install; -## To build Windows Wireshark, win32.mak must be obtained [*] -## and copied to a dir specified in the Windows Environment -## variable 'include' (or to a dir added to the list in 'include'). -## Note that the 'include' environment variable is initialized -## when vcvarsall.bat is called to set up the build environment. -## [*]One possibility: download the Windows 7 Platform SDK and copy -## win32.mak from ...\Microsoft SDKs\Windows\v7.[something]\include -## See: https://ask.wireshark.org/questions/14343/setting-development-project-under-visual-studio-2012 -## 2. Dec 28,2012: "VS2012 Update 1" is required to use VS 2012 to build an .exe which -## will run on Windows XP (as well as on later versions of Windows). -## ToDo: It appears that some special setup is required to to do this. -## https://blogs.msdn.com/b/vcblog/archive/2012/10/08/10357555.aspx -## -#MSVC_VARIANT=MSVC2012EE - -# "Microsoft Visual Studio 2012" -# Visual C++ 11.0, _MSC_VER 1700, msvcr110.dll -#MSVC_VARIANT=MSVC2012 - -# "Microsoft Visual Studio 2013" -# Visual C++ 12.0, _MSC_VER 1800, msvcr120.dll -#MSVC_VARIANT=MSVC2013 - -# "Microsoft Visual Studio 2013 Express Edition" -# Visual C++ 12.0, _MSC_VER 1800, msvcr120.dll -## Notes: -## 1. win32.mak is apparently not part of the MS 2013EE install; -## To build Windows Wireshark, win32.mak must be obtained [*] -## and copied to a dir specified in the Windows Environment -## variable 'include' (or to a dir added to the list in 'include'). -## Note that the 'include' environment variable is initialized -## when vcvarsall.bat is called to set up the build environment. -## [*]One possibility: download the Windows 7 Platform SDK and copy -## win32.mak from ...\Microsoft SDKs\Windows\v7.[something]\include -## See: https://ask.wireshark.org/questions/14343/setting-development-project-under-visual-studio-2012 -#MSVC_VARIANT=MSVC2013EE - -# The default if we haven't set a system environment variable or -# uncommented an entry above. We default to the version recommended -# in the Developer's Guide, namely MSVC++ 2010 Express Edition. -!IFNDEF MSVC_VARIANT -MSVC_VARIANT=MSVC2010EE -!ENDIF - -# -# Optional: To compile some time critical code from assembler instead of C -# -# If you have the NASM compiler, set this to the NASM executable. -# http://nasm.sourceforge.net/ -# -# If you don't have NASM, comment this line out, so that NASM -# isn't defined. -# -NASM=$(WIRESHARK_LIB_DIR)\nasm-2.09.08\nasm.exe - -# -# The Python interpreter is used as part of the buildsystem -# -# This will override the automatic detection below. -#PYTHON_VER=27 -#PYTHON_DIR=C:\Python$(PYTHON_VER) - -# -# If you don't have the native Python package installed, you can use -# the Cygwin version (not recommended) -# -#PYTHON=env python - -# Santity check: native vs Cygwin Python options -!IF DEFINED(PYTHON) && DEFINED(PYTHON_DIR) -!ERROR PYTHON and PYTHON_DIR cannot be specified at the same time -!ENDIF - -# Find native Python automatically if PYTHON(_DIR) wasn't defined -!IF !DEFINED(PYTHON) && !DEFINED(PYTHON_DIR) -!IF EXIST(c:\tools\python2\python.exe) -# Chocolatey default -PYTHON_DIR=C:\tools\python2 -!ELSE IF EXIST(c:\Python27\python.exe) -PYTHON_VER=27 -!ELSE IF EXIST(c:\Python26\python.exe) -PYTHON_VER=26 -!ELSE IF EXIST(c:\Python25\python.exe) -PYTHON_VER=25 -!ELSE IF EXIST(c:\Python24\python.exe) -PYTHON_VER=24 -!ENDIF - -!IF DEFINED(PYTHON_VER) -PYTHON_DIR=C:\Python$(PYTHON_VER) -!ENDIF -!ENDIF - -!IF DEFINED(PYTHON_DIR) -PYTHON="$(PYTHON_DIR)\python.exe" -PATH=$(PYTHON_DIR);$(PATH) -!ENDIF - -# If all else fails, try to find it on the PATH -!IF !DEFINED(PYTHON) -PYTHON=python -!ENDIF - -#### Save files as pcap-ng by default. Comment out to use pcap instead. #### -PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1 - -##### To Use packet editor uncomment this line #### -### Experimental - work in progress -WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1 - -!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" -DOWNLOAD_TAG=2016-05-10 -##### Win32 Libraries ##### -# -# Mandatory: GLib settings -# -# Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x -# -GLIB_VERSION=2.0 - -# -# Mandatory: GLib, GTK & related library settings -# -# Please note: Since Wireshark release 1.0.0, we no longer support GTK1.x -# -# If you want building with GTK+, set GTK_DIR to the pathname of the -# directory in which the "include" and "lib" directories reside. -# -# Set the name to gtk3 if you want to use gtk3 -GTK_NAME=gtk2 -GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME) - - -# These macros are used by the nsis installer script and by the install target. -#EXPAT_DLL=libexpat-1.dll -FFI_DLL=libffi-6.dll -FONTCONFIG_DLL=libfontconfig-1.dll -FREETYPE_DLL=libfreetype-6.dll -INTL_DLL=libintl-8.dll -HARFBUZZ_DLL=libharfbuzz-0.dll -JASPER_DLL=libjasper-1.dll -JPEG_DLL=libjpeg-8.dll -LZMA_DLL=liblzma-5.dll -PIXMAN_DLL=libpixman-1-0.dll -PNG_DLL=libpng15-15.dll -SJLJ_DLL=libgcc_s_sjlj-1.dll -TIFF_DLL=libtiff-5.dll -XML_DLL=libxml2-2.dll - -# This macro is used by the setup target. -!IF "$(GTK_NAME)" == "gtk2" -GDK_DLL=libgdk-win32-2.0-0.dll -GTK_DLL=libgtk-win32-2.0-0.dll -#GTK_PKG=2.24.10-2.7 -GTK_PKG=2.24.23-1.1 -PKG_SUFIX=ws -!ELSE -GDK_DLL=libgdk-3-0.dll -GTK_DLL=libgtk-3-0.dll -PKG_SUFIX=ws -GTK_PKG=3.4.4-2.1 -#GTK_PKG=3.6.1-1.1 -!ENDIF - -# -# Mandatory: Version numbers of GTK and pango. -# -# (MAJOR + MINOR Version number but without MICRO version number) -# These macros are used by the nsis installer script and by the setup target. -# -!IF "$(GTK_NAME)" == "gtk2" -GTK_INST_VERSION=2.24 -!ELSE -GTK_INST_VERSION=3.4 -#GTK_INST_VERSION=3.6 -!ENDIF - -# -# Recommended: Qt -# -# This must point to a top-level Qt directory. QMake should be in -# $(QT5_BASE_DIR)\bin -# -# Qt's various paths are hardcoded but with care you can relocate your -# installation directory: -# http://stackoverflow.com/questions/913642/qmake-and-qt-install-prefix-how-can-i-select-a-new-location-for-qt-library -# -# NOTE> the qmake command given below returns a path with forward slashes, -# which will need to be changed to backslashes for things to work properly -#QT5_BASE_DIR=output of "qmake -query QT_INSTALL_PREFIX" -!IF !DEFINED(QT5_BASE_DIR) -# Wireshark custom -!IF EXIST(C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws) -QT5_BASE_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws -# Digia official -!ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010) -QT5_BASE_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010 -# Qt 5.2.1 web installer default paths -!ELSE IF EXIST(C:\Qt\5.2.1\msvc2010) -QT5_BASE_DIR=C:\Qt\5.2.1\msvc2010 -!ELSE IF EXIST(C:\Qt\5.2.1\msvc2012) -QT5_BASE_DIR=C:\Qt\5.2.1\msvc2012 -!ELSE IF EXIST(C:\Qt\5.2.1\msvc2012_64) -QT5_BASE_DIR=C:\Qt\5.2.1\msvc2012_64 -!ELSE IF EXIST(C:\Qt\Qt5.3.0\5.3\msvc2013) -QT5_BASE_DIR=C:\Qt\Qt5.3.0\5.3\msvc2013 -!ELSE IF EXIST(C:\Qt\5.3\msvc2013) -QT5_BASE_DIR=C:\Qt\5.3\msvc2013 -# Digia official, installed in $(WIRESHARK_LIB_DIR) -!ELSE IF EXIST($(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010) -QT5_BASE_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010 -!ENDIF -!ENDIF - -# -# Recommended: WinPcap developer's pack to capture network traffic. -# -# If you have the WinPcap developer's pack (at least version 3.0), -# set this to the directory in which the WinPcap developer's pack resides. -# -# If you don't have the WPdpack, comment this line out, so that -# PCAP_DIR isn't defined. -# -PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack -# This macro is used by the NSIS installer script, PortableApps, and by the -# setup target. -WINPCAP_VERSION=4_1_3 -WPD_VERSION=4_1_2 - -# -# Optional: WinPcap remote capture support and new API -# (pcap_open(), pcap_findalldevs_ex(), etc.) -# -PCAP_REMOTE=1 - -# -# Optional: The ZLib enables unzipping of gzip compressed capture files -# "on the fly". -# -# If you have Zlib, set this to directory in which the Zlib headers -# and .lib file are stored. -# -# If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't -# defined. -ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8-ws - -# -# Optional: the c-ares library enables asynchronous (nonblocking) DNS -# name resolvings. -# -# If you have c-ares, set this to the directory in which the c-ares -# .lib file is stored. -# -# If you're using Visual C++ 6.0, you'll have to use a platform SDK that -# defines socklen_t, such as Windows Server 2003 PSDK. -# -# If you don't have c-ares, comment this line out, so that C_ARES_DIR -# isn't defined. -# -C_ARES_PKG=1.11.0 - -# -# Optional: the GnuTLS library enables ssl decryption. -# -# If you have the GnuTLS library, set this to the package version. -# -# If you don't have GnuTLS, comment this line out, so that GNUTLS_PKG -# isn't defined. -# -# Platform SDK conflicts with openssl.h header -GNUTLS_PKG=3.2.15-2.7 -GPGERROR_DLL=libgpg-error-0.dll -GCC_DLL=libgcc_s_sjlj-1.dll - -# Optional: libssh library is required for sshdump and ciscodump support -# -# If you don't have libssh, comment this line out so that LIBSSH_DIR -# isn't defined. -# -LIBSSH_DIR=$(WIRESHARK_LIB_DIR)\libssh-0.7.2-win32ws - -# -# Optional: the KFW library enables kerberos/sasl/dcerpc decryption. -# -# If you have the kerberos for windows (mit) library, set this to the -# directory where the kfw package is stored. -# -# If you don't have KFW, comment this line out, so that KFW_DIR -# isn't defined. -# -KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-i386-ws-vc6 -COMERR_DLL=comerr32.dll -KRB5_DLL=krb5_32.dll -K5SPRT_DLL=k5sprt32.dll - -# Optional: the LUA library enables scripting support. -# -# If you have the LUA library, set this to the directory in which -# the LUA package is stored. -# -# If you don't have LUA, comment this line out, so that LUA_DIR -# isn't defined. -# -!IF "$(MSVC_VARIANT)" == "MSVC2015" || "$(MSVC_VARIANT)" == "MSVC2015CE" -LUA_DIST=-5.2.3_Win32_dll14 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2013" || "$(MSVC_VARIANT)" == "MSVC2013EE" -LUA_DIST=-5.2.3_Win32_dll12 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" -LUA_DIST=-5.2.3_Win32_dll11 -!ELSE -LUA_DIST=-5.2.3_Win32_dll10 -!ENDIF -LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.3 - -# -# Optional: the PORTAUDIO library enables audio output for RTP streams. -# -# If you have the PORTAUDIO library (used for rtp_player), set this to -# the directory in which the PORTAUDIO library is stored. -# -# If you don't have PORTAUDIO, comment this line out, so that -# PORTAUDIO_DIR isn't defined. -# -#PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v18_1 -PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v19_2 - -# -# Version number of PortAudio -# -#PORTAUDIO_VERSION=18 -PORTAUDIO_VERSION=19 - -# -# Optional: AirPcap developer's pack to capture wireless network traffic -# incl. 802.11 management frames. -# -# If you have the AirPcap developer's pack, set this to the directory -# in which the AirPcap developer's pack resides. -# -# If you don't have the AirPcap developer's pack, comment this line out, -# so that AIRPCAP_DIR isn't defined. -# -AIRPCAP_DIR=$(WIRESHARK_LIB_DIR)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack - -# -# Optional: LIBSMI, System Management Interface -# -# Used for oid-name resolution for SNMP and other protocols -# -SMI_PKG=svn-40773 - -# -# Optional: GeoIP, IP address database lookups -# -# Used to map IP addresses to MaxMind GeoIP database entries -GEOIP_PKG=1.6.6 - -# -# Optional: WinSparkle, software updates -# -# Used for automatic software updates -# -WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws - -!else -DOWNLOAD_TAG=2016-06-03 -##### Win64 Libraries ##### -# -# Mandatory: GLib settings -# -# Please note: Since Wireshark release 1.0.0, we no longer support GLib1.x -# -GLIB_VERSION=2.0 - -# -# Mandatory: GLib, GTK & related library settings -# -# Please note: Since Wireshark release 1.0.0, we no longer support GTK1.x -# -# If you want building with GTK+, set GTK_DIR to the pathname of the -# directory in which the "include" and "lib" directories reside. -# -# -# Set the name to gtk3 if you want to use gtk3 - (experimental ?) -GTK_NAME=gtk2 -GTK_DIR=$(WIRESHARK_LIB_DIR)\$(GTK_NAME) - -# These macros are used by the nsis installer script and by the install target. -#EXPAT_DLL=libexpat-1.dll -FFI_DLL=libffi-6.dll -FONTCONFIG_DLL=libfontconfig-1.dll -FREETYPE_DLL=libfreetype-6.dll -INTL_DLL=libintl-8.dll -HARFBUZZ_DLL=libharfbuzz-0.dll -JASPER_DLL=libjasper-1.dll -JPEG_DLL=libjpeg-8.dll -LZMA_DLL=liblzma-5.dll -PIXMAN_DLL=libpixman-1-0.dll -PNG_DLL=libpng16-16.dll -#SEH_DLL=libgcc_s_seh-1.dll -TIFF_DLL=libtiff-5.dll -XML_DLL=libxml2-2.dll - -# These macros are used by the setup target. -!IF "$(GTK_NAME)" == "gtk2" -GDK_DLL=libgdk-win32-2.0-0.dll -GTK_DLL=libgtk-win32-2.0-0.dll -GTK_PKG=2.24.23-3.39-1 -#GTK_PKG=2.24.23-1.1 -PKG_SUFIX=ws -!ELSE -GDK_DLL=libgdk-3-0.dll -GTK_DLL=libgtk-3-0.dll -PKG_SUFIX=ws -GTK_PKG=3.4.4-2.1 -#GTK_PKG=3.6.1-1.1 -!ENDIF - -# -# Mandatory: Version numbers of GTK and pango. -# -# (MAJOR + MINOR Version number but without MICRO version number) -# These macros are used by the nsis installer script and by the setup target. -# -!IF "$(GTK_NAME)" == "gtk2" -#GTK_INST_VERSION=2.16 -GTK_INST_VERSION=2.24 -!ELSE -#GTK_INST_VERSION=3.4 -GTK_INST_VERSION=3.6 -!ENDIF - -# -# Recommended: Qt -# -# This must point to a top-level Qt directory. QMake should be in -# $(QT5_BASE_DIR)\bin -# -# Qt's various paths are hardcoded but with care you can relocate your -# installation directory: -# http://stackoverflow.com/questions/913642/qmake-and-qt-install-prefix-how-can-i-select-a-new-location-for-qt-library -# -#QT5_BASE_DIR=output of "qmake -query QT_INSTALL_PREFIX" -!IF !DEFINED(QT5_BASE_DIR) -# Wireshark custom -!IF EXIST(C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws) -QT5_BASE_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws -# Digia official -!ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010) -QT5_BASE_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010 -!ELSE IF EXIST(C:\Qt\5.3\msvc2013_64) -QT5_BASE_DIR=C:\Qt\5.3\msvc2013_64 -# Digia official, installed in $(WIRESHARK_LIB_DIR) -!ELSE IF EXIST($(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010) -QT5_BASE_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010 -!ENDIF -!ENDIF - -# -# Recommended: WinPcap developer's pack to capture network traffic. -# -# If you have the WinPcap developer's pack (at least version 3.0), -# set this to the directory in which the WinPcap developer's pack resides. -# -# If you don't have the WPdpack, comment this line out, so that -# PCAP_DIR isn't defined. -# -PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack -# This macro is used by the NSIS installer script, PortableApps, and by the -# setup target. -WINPCAP_VERSION=4_1_3 -WPD_VERSION=4_1_2 - -# -# Optional: WinPcap remote capture support and new API -# (pcap_open(), pcap_findalldevs_ex(), etc.) -# -PCAP_REMOTE=1 - -# -# Optional: The ZLib enables unzipping of gzip compressed capture files -# "on the fly". -# -# If you have Zlib, set this to directory in which the Zlib headers -# and .lib file are stored. -# -# If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't -# defined. -# -ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8-ws - -# -# Optional: the c-ares library enables asynchronous (nonblocking) DNS -# name resolvings. -# -# If you have c-ares, set this to the directory in which the c-ares -# .lib file is stored. -# -# If you're using Visual C++ 6.0, you'll have to use a platform SDK that -# defines socklen_t, such as Windows Server 2003 PSDK. -# -# If you don't have c-ares, comment this line out, so that C_ARES_DIR -# isn't defined. -# -C_ARES_PKG=1.11.0 - -# -# Optional: the GnuTLS library enables ssl decryption. -# -# If you have the GnuTLS library, set this to the package version. -# -# If you don't have GnuTLS, comment this line out, so that GNUTLS_PKG -# isn't defined. -# -# Platform SDK conflicts with openssl.h header -GNUTLS_PKG=3.2.15-2.9 -GPGERROR_DLL=libgpg-error6-0.dll -GCC_DLL=libgcc_s_seh-1.dll - -# -# Optional: libssh library is required for sshdump support -# -# If you don't have libssh, comment this line out so that LIBSSH_DIR -# isn't defined. -# -LIBSSH_DIR=$(WIRESHARK_LIB_DIR)\libssh-0.7.2-win64ws - -# -# Optional: the KFW library enables kerberos/sasl/dcerpc decryption. -# -# If you have the kerberos for windows (mit) library, set this to the -# directory where the kfw package is stored. -# -# If you don't have KFW, comment this line out, so that KFW_DIR -# isn't defined. -# -KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-x64-ws -COMERR_DLL=comerr64.dll -KRB5_DLL=krb5_64.dll -K5SPRT_DLL=k5sprt64.dll - -# -# Optional: the LUA library enables scripting support. -# -# If you have the LUA library, set this to the directory in which -# the LUA package is stored. -# -# If you don't have LUA, comment this line out, so that LUA_DIR -# isn't defined. -# -!IF "$(MSVC_VARIANT)" == "MSVC2015" || "$(MSVC_VARIANT)" == "MSVC2015CE" -LUA_DIST=-5.2.3_Win64_dll14 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2013" || "$(MSVC_VARIANT)" == "MSVC2013EE" -LUA_DIST=-5.2.3_Win64_dll12 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" -LUA_DIST=-5.2.3_Win64_dll11 -!ELSE -LUA_DIST=-5.2.3_Win64_dll10 -!ENDIF -LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.3 - -# -# Optional: the PORTAUDIO library enables audio output for RTP streams. -# -# If you have the PORTAUDIO library (used for rtp_player), set this to -# the directory in which the PORTAUDIO library is stored. -# -# If you don't have PORTAUDIO, comment this line out, so that -# PORTAUDIO_DIR isn't defined. -# -#PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v18_1 -PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v19_2 - -# -# Version number of PortAudio -# -#PORTAUDIO_VERSION=18 -PORTAUDIO_VERSION=19 - -# -# Optional: AirPcap developer's pack to capture wireless network traffic -# incl. 802.11 management frames. -# -# If you have the AirPcap developer's pack, set this to the directory -# in which the AirPcap developer's pack resides. -# -# If you don't have the AirPcap developer's pack, comment this line out, -# so that AIRPCAP_DIR isn't defined. -# -AIRPCAP_DIR=$(WIRESHARK_LIB_DIR)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack - -# -# Optional: LIBSMI, System Management Interface -# -# Used for oid-name resolution for SNMP and other protocols -# -SMI_PKG=svn-40773 - -# -# Optional: GeoIP, IP address database lookups -# -# Used to map IP addresses to MaxMind GeoIP database entries -# -GEOIP_PKG=1.6.6 - -# -# Optional: WinSparkle, software updates -# -# Used for automatic software updates -# -WINSPARKLE_PKG=0.3-44-g2c8d9d3-win64ws - -!endif -##### win32 / win64 ##### - -!IF "$(GTK_NAME)" == "gtk2" -GTK_ETC_DIR=etc\gtk-2.0 -GTK_ENGINES_DIR=lib\gtk-2.0\$(GTK_LIB_DIR)\engines -GTK_MODULES_DIR=lib\gtk-2.0\modules -GTK_THEMES_DIR=share\themes\MS-Windows\gtk-2.0 -!ELSE -GTK_ETC_DIR=etc\gtk-3.0 -GTK_SCHEMAS_DIR=\share\glib-2.0\schemas -!ENDIF - - -##### Tools ##### - -# Set the following mandatory commands to find the tools. -# The easiest way is to use the corresponding packages from Cygwin. - -# Set up the path to the Cygwin binaries -# First check whether a 32-bit Cygwin installation exists -# If not, check for a 64-bit Cygwin installation -!IF EXIST($(CYGWIN_PATH)) -# Do nothing -!ELSE IF EXIST(C:\cygwin\bin) -CYGWIN_PATH=C:\cygwin\bin -!ELSE IF EXIST(C:\cygwin64\bin) -CYGWIN_PATH=C:\cygwin64\bin -!ELSE IF EXIST(C:\tools\cygwin\bin) -# Chocolatey default -CYGWIN_PATH=C:\tools\cygwin\bin -!ELSE -!ERROR Could not locate Cygwin, please set CYGWIN_PATH explicitly in config.nmake -!ENDIF - -# command for a shell (cygwin's bash package recommended) -SH_PROG=bash - -# bash versions after 3.1.6 need the 'igncr' shell option to be able to -# process scripts in Windows 'native format' (dos crlf format). -# The following !IF results in the option being used only if it is available -# since using it on bash version 3.1.6 (or earlier) is not required and -# will cause an error message. -!if "$(SH_PROG)"=="bash" && [$(CYGWIN_PATH)\bash -c "set -o igncr" 2>nul: ] == 0 -SH_FLAGS=-o igncr -!endif - -SH=$(SH_PROG) $(SH_FLAGS) - -# PowerShell -# Compatibility testing (...or should we always force version 2?) -#POWERSHELL=powershell -Version 2.0 -executionpolicy bypass -File -# Normal -POWERSHELL=powershell -executionpolicy bypass -File - -# command for perl (cygwin's perl package recommended) -PERL=perl - -# command for pod2man and pod2html -# (part of the perl package, usually leave these unchanged) -POD2MAN=$(SH) pod2man -POD2HTML=$(SH) pod2html - -# command for sed (cygwin's sed recommended) -SED=sed - -# Command for Flex. Cygwin's flex or Chocolatey's win_flex -# recommended. -# Absolute or relative paths must be Windows-style - -#LEX=\custom\path\to\flex - -# Find flex automatically -!IF !DEFINED(LEX) -!IF DEFINED(CHOCOLATEYINSTALL) && EXIST("$(CHOCOLATEYINSTALL)\bin\win_flex.exe") -LEX=$(CHOCOLATEYINSTALL)\bin\win_flex -!ELSE IF EXIST("$(CYGWIN_PATH)\flex.exe") -# We add Cygwin to PATH below. -LEX=flex -!ENDIF -!ENDIF - -# Command for Bison. Cygwin's bison or Chocolatey's win_bison -# recommended. -# Absolute or relative paths must be Windows-style - -#YACC=\custom\path\to\bison - -# Find bison automatically -!IF !DEFINED(YACC) -!IF DEFINED(CHOCOLATEYINSTALL) && EXIST("$(CHOCOLATEYINSTALL)\bin\win_bison.exe") -YACC=$(CHOCOLATEYINSTALL)\bin\win_bison -!ELSE IF EXIST("$(CYGWIN_PATH)\bison.exe") -# We add Cygwin to PATH below. -YACC=bison -!ENDIF -!ENDIF - -# Make our text files Windows-native -TEXTIFY=$(POWERSHELL) $(TOOLS_DIR)/textify.ps1 - -# -# Optional: Build the NSIS installer. -# -# If NSIS is installed in a standard location (under Program Files -# or Program Files (x86)) you shouldn't have to change anything. -# -# If NSIS is installed in a custom location uncomment the following -# line and adjust the path accordingly. -# - -#MAKENSIS="\custom\path\to\NSIS\makensis.exe" - -# Find NSIS automatically -!IF !DEFINED(MAKENSIS) -!IF EXIST("$(PROGRAM_FILES)\NSIS\makensis.exe") -MAKENSIS="$(PROGRAM_FILES)\NSIS\makensis.exe" -!ELSE IF EXIST("$(PROGRAM_FILES_W6432)\NSIS\makensis.exe") -MAKENSIS="$(PROGRAM_FILES_W6432)\NSIS\makensis.exe" -!ELSE IF EXIST("\Program Files (x86)\NSIS\makensis.exe") -MAKENSIS="\Program Files (x86)\NSIS\makensis.exe" -!ENDIF -!ENDIF - -# -# Optional: Build the PortableApps package (WiresharkPortable). -# -# If you have the PortableApps.com Platform installed set this to the main -# PortableApps directory. In order to build packages you need to install -# "PortableApps.com Launcher" and "NSIS Portable (Unicode)" *within* the -# PortableApps environment. -# -# If you don't have the PortableApps.com Platform installed comment this line -# out. -# -PORTABLEAPPS_DIR="C:\PortableApps" - -# -# Optional: To build the developers API documentation with doxygen and dot. -# Currently experimental, outdated and incomplete. -# -# You will have to download and install: -# Doxygen from: http://www.doxygen.org -# Graphviz from: http://www.research.att.com/sw/tools/graphviz/ -# -# If you have doxygen, set this to the doxygen executable. -# -# If you don't want the developers documentation (or don't have the tools), -# comment this line out, so that DOXYGEN isn't defined. -# -#DOXYGEN="$(PROGRAM_FILES)/doxygen/bin/doxygen.exe" - -# -# Recommended: Use the compressed html help format .chm as the Wireshark integrated help. -# -# The required htmlhelp.h and htmlhelp.lib should be included in versions of MSVC supported by Wireshark -# -# If you don't want the online help (or don't have the tools), -# comment this line out, so that HHC_DIR isn't defined. -# -HHC_DIR=$(PROGRAM_FILES)\HTML Help Workshop - -# -# Optional: To reduce the size of dlls and exes, which is especially useful for -# USB device distributions (PortableApps) -# -# If you have the UPX package, set this to the upx.exe executable. -# -# UPX can be downloaded from: -# http://upx.sourceforge.net/ -# -# If you don't have UPX, or don't want to pack exes and dlls, -# comment this line out, so that UPX isn't defined. -# - -UPX=$(WIRESHARK_LIB_DIR)\upx303w\upx.exe - -##### Flags, PATHs and Miscellaneous ##### - -# "convert" the MSVC variant into the required MSC compiler version -!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" -MSC_VER_REQUIRED=1400 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" -MSC_VER_REQUIRED=1500 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010" || "$(MSVC_VARIANT)" == "MSVC2010EE" -MSC_VER_REQUIRED=1600 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" -MSC_VER_REQUIRED=1700 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2013" || "$(MSVC_VARIANT)" == "MSVC2013EE" -MSC_VER_REQUIRED=1800 -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2015" || "$(MSVC_VARIANT)" == "MSVC2015CE" -MSC_VER_REQUIRED=1900 -!ELSE -!ERROR MSVC_VARIANT unknown -!ENDIF - -## Manifest processing is not needed for VC10 (Visual Studio 2010 C) -## See: http://msdn.microsoft.com/en-us/library/dd293574.aspx -!IF ($(MSC_VER_REQUIRED) >= 1400) && ($(MSC_VER_REQUIRED) < 1600) -MANIFEST_INFO_REQUIRED=1 -!ENDIF - -## VS2012 (VC11) and later: configure subsystem version -## See: https://blogs.msdn.com/b/vcblog/archive/2012/10/08/10357555.aspx -## (APPVER used in win32.mak to set subsystem version) -!IF ($(MSC_VER_REQUIRED) >= 1700) -!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" -APPVER=5.01 -!else -APPVER=5.02 -!endif -!ENDIF - -# Compiler flags: -# /W3 Warning level 3 (0 less - 4 most, 1 default). -# /Zi Create .pdb file for debugging. -# /MD Use "multithread- and DLL-specific version" of run-time libraries. -# msvc documentation states that /MD causes _MT and _DLL to be defined -# See: http://msdn.microsoft.com/en-us/library/2kzt1wy3%28v=VS.90%29.aspx -# /D_CRT_SECURE_NO_DEPRECATE Don't warn for "insecure" calls; -# see MSDN "Security Enhancements in the CRT". -# /D_CRT_NONSTDC_NO_DEPRECATE Don't warn for "Deprecated CRT Functions" as MSDN calls this. -# /D_BIND_TO_CURRENT_CRT_VERSION=1 Make sure our CRT and manifest versions match. -# (http://msdn.microsoft.com/en-us/library/cc664727.aspx) -# /DWIN32_LEAN_AND_MEAN Don't include unnecessary Windows include files (see windows.h). -# /MANIFEST:no Don't create a SxS manifest. Makes sure our plugins don't load -# a second copy of the CRT. -# -DPSAPI_VERSION=1 Programs that must run on earlier versions of Windows as well as Windows 7 and later -# versions should always call this function as GetProcessMemoryInfo. To ensure correct -# resolution of symbols, add Psapi.lib to the TARGETLIBS macro and compile the program -# with -DPSAPI_VERSION=1.To use run-time dynamic linking, load Psapi.dll. -# http://msdn.microsoft.com/en-us/library/windows/desktop/ms683219(v=vs.85).aspx -# -DBUILD_WINDOWS Starting from VS2013, GetVersionEx is deprecated and we are recommended to use -# VerifyVersionInfo instead -# http://msdn.microsoft.com/en-us/library/windows/desktop/ms724429(v=vs.85).aspx -# http://msdn.microsoft.com/en-us/library/windows/desktop/ms725491(v=vs.85).aspx -# To continue to use GetVersionEx, we can define BUILD_WINDOWS -# -D_ALLOW_KEYWORD_MACROS For VS2012 onwards the, C++ STL does not permit macro redefinitions of keywords -# (see http://msdn.microsoft.com/en-us/library/bb531344(v=vs.110).aspx) -# This definition prevents the complaint about the redefinition of inline by WinPCap -# in pcap-stdinc.h when compiling CPP files, e.g. the QT UI -# /O2 http://msdn.microsoft.com/en-us/library/8f8h5cxt.aspx -# Specifying the /O2 compiler option is the same as using the following options: -# /Ob (Inline Function Expansion), where the option parameter is 2 (/Ob2) -# /Og (Global Optimizations) -# /Oi (Generate Intrinsic Functions) -# /Ot (Favor Fast Code) -# /Oy (Frame-Pointer Omission) -# /Gs (Control Stack Checking Calls)) -# /GF (Eliminate Duplicate Strings) -# /Gy (Enable Function-Level Linking) -# /Zo Output debug info allowing debuggers to display local values and trace into inline -# functions. For VS2013 Update 3. Assume all VS2013 builds are at least Update 3. -# See http://msdn.microsoft.com/en-us/library/dn785163.aspx -# VS2015: On by default when /Zi or /Z7 used. - -!IF DEFINED(DEBUG) -DEBUG_CFLAGS=/Od -!ELSE -DEBUG_CFLAGS=/O2 -!ENDIF - -##Note: LOCAL_CFLAGS are flags used for *all* compilations -## STANDARD_CFLAGS (see below) are flags used just for *Wireshark* compilations -!IF "$(MSVC_VARIANT)" == "MSVC2005" || \ - "$(MSVC_VARIANT)" == "MSVC2005EE" || \ - "$(MSVC_VARIANT)" == "DOTNET20" || \ - "$(MSVC_VARIANT)" == "MSVC2008" || \ - "$(MSVC_VARIANT)" == "MSVC2008EE" || \ - "$(MSVC_VARIANT)" == "MSVC2010" || \ - "$(MSVC_VARIANT)" == "MSVC2010EE" || \ - "$(MSVC_VARIANT)" == "MSVC2012" || \ - "$(MSVC_VARIANT)" == "MSVC2012EE" || \ - "$(MSVC_VARIANT)" == "MSVC2013" || \ - "$(MSVC_VARIANT)" == "MSVC2013EE" || \ - "$(MSVC_VARIANT)" == "MSVC2015" || \ - "$(MSVC_VARIANT)" == "MSVC2015CE" -LOCAL_CFLAGS=/Zi /W3 /MD $(DEBUG_CFLAGS) /DWIN32_LEAN_AND_MEAN /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) \ - /D_CRT_SECURE_NO_DEPRECATE -DPSAPI_VERSION=1 - -!IF "$(MSVC_VARIANT)" == "MSVC2012" || \ - "$(MSVC_VARIANT)" == "MSVC2012EE" || \ - "$(MSVC_VARIANT)" == "MSVC2013" || \ - "$(MSVC_VARIANT)" == "MSVC2013EE" || \ - "$(MSVC_VARIANT)" == "MSVC2015" || \ - "$(MSVC_VARIANT)" == "MSVC2015CE" -LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_ALLOW_KEYWORD_MACROS -!ENDIF - -!IF "$(MSVC_VARIANT)" == "MSVC2013" || \ - "$(MSVC_VARIANT)" == "MSVC2013EE" || \ - "$(MSVC_VARIANT)" == "MSVC2015" || \ - "$(MSVC_VARIANT)" == "MSVC2015CE" -LOCAL_CFLAGS=$(LOCAL_CFLAGS) /DBUILD_WINDOWS /Zo -!ENDIF - -!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64" -LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1 -!ENDIF - -# Additional compiler warnings to be treated as "Level 3" -# when compiling Wireshark sources. (Selected from "level 4" warnings). -## 4295: array is too small to include a terminating null character -## 4189: local variable is initialized but not referenced -WARNINGS_CFLAGS=/w34295 /w34189 - -!ELSE -!ERROR MSVC_VARIANT unknown -!ENDIF - -# http://msdn.microsoft.com/en-us/library/bb385193.aspx -# /MP Compiles multiple source files by using multiple processes -# /MP[processMax] If you omit the processMax argument, the compiler retrieves the number of effective processors -# on your computer from the operating system, and creates a process for each processor. -# -# The following compiler options and language features that are incompatible with the /MP option: -# -# * #import preprocessor directive -# * /E, /EP -# * /Gm -# * /showIncludes -# * /Yc -# -!IF "$(MSVC_VARIANT)" == "MSVC2008" || \ - "$(MSVC_VARIANT)" == "MSVC2008EE" || \ - "$(MSVC_VARIANT)" == "MSVC2010" || \ - "$(MSVC_VARIANT)" == "MSVC2010EE" || \ - "$(MSVC_VARIANT)" == "MSVC2012" || \ - "$(MSVC_VARIANT)" == "MSVC2012EE" || \ - "$(MSVC_VARIANT)" == "MSVC2013" || \ - "$(MSVC_VARIANT)" == "MSVC2013EE" || \ - "$(MSVC_VARIANT)" == "MSVC2015" || \ - "$(MSVC_VARIANT)" == "MSVC2015CE" -LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP -!ENDIF - -# Optional: Static analysis. Only supported in the full-frontal MSVC editions. -# http://msdn.microsoft.com/en-us/library/ms182025.aspx - -!IFDEF ENABLE_CODE_ANALYSIS -LOCAL_CFLAGS= $(LOCAL_CFLAGS) /analyze:WX- -!ENDIF - -## Do *not* redefine LOCAL_CFLAGS below this point !! - -#STANDARD_CFLAGS are flags used for *Wireshark* compiles (not stuff like lemon, etc) -STANDARD_CFLAGS=/DWINPCAP_VERSION=$(WINPCAP_VERSION) $(LOCAL_CFLAGS) $(WARNINGS_CFLAGS) - -#Comment out the following if warnings are not to be treated as errors -WARNINGS_ARE_ERRORS=-WX - -# Linker flags: -# /DEBUG generate debug info -# /PROFILE generate map file(s) for profiling -# /DEFAULTLIB:xxx use xxx as the standard C library -# /NODEFAULTLIB:xxx don't use xxx as the standard C library -# /RELEASE set the checksum in the header, stops debugger complaints -# -LOCAL_LDFLAGS=/DEBUG /MACHINE:$(TARGET_MACHINE) /RELEASE -DLL_LDFLAGS = -!IFDEF MANIFEST_INFO_REQUIRED -DLL_LDFLAGS = /MANIFEST:no -!ENDIF - -# Enable Safe Exception Handler. -# http://msdn.microsoft.com/en-us/magazine/cc337897.aspx -!IF $(MSC_VER_REQUIRED) >= 1300 -!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64" -LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /SafeSEH -!ENDIF -!ENDIF - -# Enable ASLR. Requires VS2008 or later. -# http://blogs.msdn.com/b/vcblog/archive/2009/05/21/dynamicbase-and-nxcompat.aspx -# DEP (/NXCompat) is handled in init_process_policies() via SetProcessDEPPolicy. - -# ASLR http://msdn.microsoft.com/en-us/library/bb384887.aspx -!IF $(MSC_VER_REQUIRED) >= 1500 -LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /DYNAMICBASE /FIXED:no -!ENDIF - -PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) - -# -# According to http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=403 -# XCOPY under Windows NT doesn't support the "/Y" flag. This works -# around that bug. -# XXX - This apparently doesn't work for some versions of nmake: -# http://support.microsoft.com/default.aspx?scid=kb;en-us;86814 -# It looks like we'll have to call "set copycmd=/y" before we run xcopy. -COPYCMD=/y - -# -# If you don't want to build libwireshark.dll, you should comment out the -# following line. (Note: for plugin support this option must stay activated) -ENABLE_LIBWIRESHARK=USE - -# -# install (debug) directory for Wireshark (relative to your source dir) -INSTALL_DIR=wireshark-gtk2 -INSTALL_DIR_QT=wireshark-qt-release - -##### C-Runtime Redistributable ##### -# -# The C-Runtime since Version 7 must be shipped together with -# the program installer, to avoid missing msvcr*.dll files on -# the target machine. -# -# The location of these files differ on the various compiler -# packages, the following will use the default paths depending -# on the package version. -# - -# You can either place the redistributable in its own platform- -# and compiler-specific directory or in the top-level library -# directory. -# Microsoft maintains a list of the latest redistributables in -# KB 20197667: http://support.microsoft.com/kb/2019667 -!IF EXIST("$(WIRESHARK_LIB_DIR)\vcredist_$(MSVC_VARIANT)") -VCREDIST_DIR=$(WIRESHARK_LIB_DIR)\vcredist_$(MSVC_VARIANT) -!ELSE -VCREDIST_DIR=$(WIRESHARK_LIB_DIR) -!ENDIF - -!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win64" -# -# For 64-bit platforms, we don't create portable packages and therefore -# don't have to worry that "Using the Visual C++ Redistributable -# Package" requires that an installer be run to install that package, -# so we use that method to make the C runtime available. -# -VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe - -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" -# -# For MSVC 2005 non-Express Edition, we "Install a particular Visual C++ -# assembly as a private assembly for the application", by copying -# the contents of the Microsoft.VC80.CRT folder to the target directory. -# This is done to reduce the size of the installer; it also makes -# a portable version work, as the C runtime doesn't have to be -# installed on the target machine. -# -MSVCR_DLL=$(VCINSTALLDIR)\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC80.CRT\*.* - -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE" -# -# For MSVC 2005 Express Edition, for the .NET Framework 2.0 SDK, and -# for MSVC 2008 Express Edition, we "Use the Visual C++ Redistributable -# Package", because they don't provide the Microsoft.VC80.CRT folder. -# -# They also don't provide the redistributable package, so you need to -# download the appropriate version of the redistributable package, -# vcredist_x86.exe, vcredist_x64.exe, or vcredist_ia64.exe, from -# Microsoft first, and copy it to the lib folder!!! -# -VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe - -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008" -# -# For MSVC 2008 non-Express Edition, we "Install a particular Visual C++ -# assembly as a private assembly for the application", by copying -# the contents of the Microsoft.VC90.CRT folder to the target directory. -# This is done to reduce the size of the installer; it also makes -# a portable version work, as the C runtime doesn't have to be -# installed on the target machine. -# -MSVCR_DLL=$(VCINSTALLDIR)\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC90.CRT\*.* - -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010EE" -# -# For MSVC 2010 Express Edition, we "Use the Visual C++ Redistributable -# Package", because it doesn't provide the Microsoft.VC80.CRT folder. -# -# It also doesn't provide the redistributable package, so you need to -# download the appropriate version of the redistributable package, -# vcredist_x86.exe or vcredist_x64.exe, from Microsoft first, and copy -# it to the lib folder!!! -VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe - -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2010" -# -# For MSVC 2010 non-Express Edition, we "Install a particular Visual C++ -# assembly as a private assembly for the application", by copying -# the contents of the Microsoft.VC100.CRT folder to the target directory. -# This is done to reduce the size of the installer; it also makes -# a portable version work, as the C runtime doesn't have to be -# installed on the target machine. -# -# Note: for what it's worth, Microsoft recommends "Using the Visual C++ -# Redistributable Package", rather than "Installing a particular Visual -# C++ assembly as a private assembly for the application", starting -# with Visual Studio 2010. -# -MSVCR_DLL=$(VCINSTALLDIR)\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.* -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" -# -# EE version added as per bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227 -# -# For MSVC 2012, we "Install a particular Visual C++ -# assembly as a private assembly for the application", by copying -# the contents of the Microsoft.VC110.CRT folder to the target directory. -# This is done to reduce the size of the installer; it also makes -# a portable version work, as the C runtime doesn't have to be -# installed on the target machine. -# -# Note: for what it's worth, Microsoft recommends "Using the Visual C++ -# Redistributable Package", rather than "Installing a particular Visual -# C++ assembly as a private assembly for the application", starting -# with Visual Studio 2010. -# -MSVCR_DLL=$(VCINSTALLDIR)\redist\$(TARGET_MACHINE)\Microsoft.VC110.CRT\*.* -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2013" || "$(MSVC_VARIANT)" == "MSVC2013EE" -# -# EE version added as per bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227 -# -# For MSVC 2013, we "Install a particular Visual C++ -# assembly as a private assembly for the application", by copying -# the contents of the Microsoft.VC120.CRT folder to the target directory. -# This is done to reduce the size of the installer; it also makes -# a portable version work, as the C runtime doesn't have to be -# installed on the target machine. -# -# Note: for what it's worth, Microsoft recommends "Using the Visual C++ -# Redistributable Package", rather than "Installing a particular Visual -# C++ assembly as a private assembly for the application", starting -# with Visual Studio 2010. -# -MSVCR_DLL=$(VCINSTALLDIR)\redist\$(TARGET_MACHINE)\Microsoft.VC120.CRT\*.* -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2015" || "$(MSVC_VARIANT)" == "MSVC2015CE" -# -# For MSVC 2015, we "Install a particular Visual C++ -# assembly as a private assembly for the application", by copying -# the contents of the Microsoft.VC140.CRT folder to the target directory. -# This is done to reduce the size of the installer; it also makes -# a portable version work, as the C runtime doesn't have to be -# installed on the target machine. -# -# Note: for what it's worth, Microsoft recommends "Using the Visual C++ -# Redistributable Package", rather than "Installing a particular Visual -# C++ assembly as a private assembly for the application", starting -# with Visual Studio 2010. -# -MSVCR_DLL=$(VCINSTALLDIR)\redist\$(TARGET_MACHINE)\Microsoft.VC140.CRT\*.* -!ELSE -!ERROR MSVC_VARIANT unknown -!ENDIF - -# This is still optional yet we define it above for all users. -# So, don't check if it exists... -#!IF DEFINED(VCREDIST_EXE) && ! EXIST("$(VCREDIST_EXE)") -#!ERROR Can't find $(VCREDIST_EXE). Have you downloaded it from Microsoft? \ -#See the developer's guide section "C-Runtime "Redistributable" files" for details how to get it -#!ENDIF - -##### Advanced: Docbook/XML documentation generation ##### -# If you want to generate the Docbook/XML based docs (User's and Developer's -# Guide, ...), you'll need some additional tools / libraries compared to the -# rest of the build process. -# -# FOR DETAILED INSTRUCTIONS TO GENERATE THE DOCS, SEE: docbook\README.txt. -# -# If you don't call the Makefile.nmake in the docbook dir to generate the -# docs, the following settings in this section will have no effect. - -# formatting objects processor executable -# Comment this out if you don't have fop installed or you don't want the docs -# in PDF format. -# -# You may want to install the FOP hyphenation patterns from -# http://offo.sourceforge.net/hyphenation/ -!IFNDEF FOP - -!IF EXIST(docbook\fop-1.1\fop.bat) -FOP=fop-1.1\fop.bat -!ELSE IF EXIST($(WIRESHARK_LIB_DIR)\fop-1.1\fop.bat) -FOP=$(WIRESHARK_LIB_DIR)\fop-1.1\fop.bat -!ELSE IF EXIST(docbook\fop-1.0\fop.bat) -FOP=fop-1.0\fop.bat -!ELSE IF EXIST($(WIRESHARK_LIB_DIR)\fop-1.0\fop.bat) -FOP=$(WIRESHARK_LIB_DIR)\fop-1.0\fop.bat -!ENDIF - -!ENDIF FOP - -# Additional options to fop. -FOP_OPTS=-Xmx256m - -# the XSL processor (part of cygwin's libxslt package) -XSLTPROC="xsltproc" - -# Asciidoc converter (part of cygwin's asciidoc package). In order to build -# the release notes you must have the Cygwin asciidoc and lynx packages -# installed. -A2X=a2x -LYNX=lynx - -############################################################################## -# -# You should not have to change anything below this comment. -# If you do, it's a deficiency in the Makefile.nmake files; -# either tell wireshark-dev@wireshark.org about it, including -# details of why you had to change it, or fix config.nmake -# and any Makefile.nmake files that need to be changed, and -# send us the patches, along with details of why the change -# was necessary. -# -############################################################################## - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.wireshark.org/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)$(VERSION_EXTRA) -RC_VERSION=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO),$(VERSION_BUILD) -PRODUCT_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).$(VERSION_BUILD) - -WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR).$(WTAP_VERSION_MICRO) -RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO) -FTAP_VERSION=$(FTAP_VERSION_MAJOR).$(FTAP_VERSION_MINOR).$(FTAP_VERSION_MICRO) -RC_FTAP_VERSION=$(FTAP_VERSION_MAJOR),$(FTAP_VERSION_MINOR),$(FTAP_VERSION_MICRO) - -# GLib -GLIB_CFLAGS=/I$(GTK_DIR)\include\glib-$(GLIB_VERSION) \ - /I$(GTK_DIR)\lib\glib-$(GLIB_VERSION)\include \ - -DG_DISABLE_DEPRECATED \ - -DG_DISABLE_SINGLE_INCLUDES -GLIB_LIBS=$(GTK_DIR)\lib\glib-$(GLIB_VERSION).lib \ - $(GTK_DIR)\lib\gmodule-$(GLIB_VERSION).lib \ - $(GTK_DIR)\lib\gobject-$(GLIB_VERSION).lib - -PROGRAM_NAME_GTK=$(PROGRAM_NAME)-gtk - -# 2.18 was no good(Theming problem) -!IF "$(GTK_INST_VERSION)" == "2.24" || "$(GTK_INST_VERSION)" == "2.22" || "$(GTK_INST_VERSION)" == "2.16" || "$(GTK_INST_VERSION)" == "2.14" - -# GTK+ -GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-2.0 \ - /I$(GTK_DIR)\include\gdk-pixbuf-2.0 \ - /I$(GTK_DIR)\lib\gtk-2.0\include \ - /I$(GTK_DIR)\include\atk-1.0 \ - /I$(GTK_DIR)\include\cairo \ - /I$(GTK_DIR)\include\pango-1.0 \ - -DGDK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_SINGLE_INCLUDES \ - -DGSEAL_ENABLE -GTK_LIBS=$(GTK_DIR)\lib\gtk-win32-2.0.lib \ - $(GTK_DIR)\lib\gdk-win32-2.0.lib \ - $(GTK_DIR)\lib\gdk_pixbuf-2.0.lib \ - $(GTK_DIR)\lib\cairo.lib \ - $(GTK_DIR)\lib\pango-1.0.lib \ - $(GTK_DIR)\lib\pangocairo-1.0.lib \ - $(GLIB_LIBS) - -GTK_LIB_DIR=2.10.0 - -!IFDEF HARFBUZZ_DLL -NEED_HARFBUZZ_DLL=USE -!ENDIF -!IFDEF JPEG_DLL -NEED_JPEG_DLL=USE -!ENDIF -!IFDEF PNG_DLL -NEED_PNG_DLL=USE -!ENDIF -!IFDEF SEH_DLL -NEED_SEH_DLL=USE -!ENDIF -!IFDEF SJLJ_DLL -NEED_SJLJ_DLL=USE -!ENDIF -!IFDEF TIFF_DLL -NEED_TIFF_DLL=USE -!ENDIF -NEED_CAIRO_DLL=USE -# Pango >=1.24.5 Needs these: -#NEED_EXPAT_DLL=USE -NEED_FFI_DLL=USE -NEED_FONTCONFIG_DLL=USE -NEED_FREETYPE_DLL=USE -NEED_JASPER_DLL=USE -NEED_JPEG_DLL=USE -NEED_LZMA_DLL=USE -NEED_PIXMAN_DLL=USE -NEED_XML_DLL=USE - -!ELSEIF "$(GTK_INST_VERSION)" == "3.4" || "$(GTK_INST_VERSION)" == "3.6" - -# GTK+ -## Note: If Wireshark is ever to be built with Gtk >= 3.10 -## then -DGTK_DISABLE_DEPRECATED must be removed -## and -DGDK_DISABLE_DEPRECATION_WARNINGS must -## be added below. -## Wireshark changes to handle Gtk 3.10 deprecated features -## will not be done since Wireshark is moving to Qt. -GTK_CFLAGS=$(GLIB_CFLAGS) /I$(GTK_DIR)\include\gtk-3.0 \ - /I$(GTK_DIR)\include\gdk-pixbuf-2.0 \ - /I$(GTK_DIR)\lib\gtk-3.0\include \ - /I$(GTK_DIR)\include\atk-1.0 \ - /I$(GTK_DIR)\include\cairo \ - /I$(GTK_DIR)\include\pango-1.0 \ - -DGDK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_SINGLE_INCLUDES \ - -DGSEAL_ENABLE -GTK_LIBS=$(GTK_DIR)\lib\gtk-3.lib \ - $(GTK_DIR)\lib\gdk-3.lib \ - $(GTK_DIR)\lib\gdk_pixbuf-2.0.lib \ - $(GTK_DIR)\lib\cairo.lib \ - $(GTK_DIR)\lib\pango-1.0.lib \ - $(GTK_DIR)\lib\pangocairo-1.0.lib \ - $(GLIB_LIBS) - -GTK_LIB_DIR=3.4 - -!IFDEF _DLL -!ENDIF - -NEED_CAIRO_GOBJECT_DLL=USE -NEED_CAIRO_DLL=USE - -!IFDEF EXPAT_DLL -NEED_EXPAT_DLL=USE -!ENDIF -!IFDEF FFI_DLL -NEED_FFI_DLL=USE -!ENDIF -!IFDEF FONTCONFIG_DLL -NEED_FONTCONFIG_DLL=USE -!ENDIF -!IFDEF FREETYPE_DLL -NEED_FREETYPE_DLL=USE -!ENDIF -!IFDEF HARFBUZZ_DLL -NEED_HARFBUZZ_DLL=USE -!ENDIF -!IFDEF JASPER_DLL -NEED_JASPER_DLL=USE -!ENDIF -!IFDEF JPEG_DLL -NEED_JPEG_DLL=USE -!ENDIF -!IFDEF LZMA_DLL -NEED_LZMA_DLL=USE -!ENDIF -!IFDEF PIXMAN_DLL -NEED_PIXMAN_DLL=USE -!ENDIF -!IFDEF PNG_DLL -NEED_PNG_DLL=USE -!ENDIF -!IFDEF SEH_DLL -NEED_SEH_DLL=USE -!ENDIF -!IFDEF SJLJ_DLL -NEED_SJLJ_DLL=USE -!ENDIF -!IFDEF TIFF_DLL -NEED_TIFF_DLL=USE -!ENDIF -!IFDEF XML_DLL -NEED_XML_DLL=USE -!ENDIF -!ELSE -!ERROR ? Unknown or invalid GTK_INST_VERSION "$(GTK_INST_VERSION)" -!ENDIF - - -!IFDEF AIRPCAP_DIR -AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1 -#AIRPCAP_CFLAGS=/I$(AIRPCAP_DIR)\include -!ELSE -AIRPCAP_CONFIG= -WIRELESS_TOOLBAR_CONFIG= -!ENDIF - -!IFDEF PCAP_DIR -# Nmake uses carets to escape special characters -WINPCAP_CONFIG=^#define HAVE_LIBPCAP 1 -# -# This requires that, if you're *building* Wireshark, you have -# the most recent WinPcap's development package. If, at *run* -# time, an older version of WinPcap, missing some routines, -# is found, we work around that. -# -PCAP_FINDALLDEVS_CONFIG=^#define HAVE_PCAP_FINDALLDEVS 1 -PCAP_DATALINK_NAME_TO_VAL_CONFIG=^#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1 -PCAP_DATALINK_VAL_TO_NAME_CONFIG=^#define HAVE_PCAP_DATALINK_VAL_TO_NAME 1 -PCAP_DATALINK_VAL_TO_DESCRIPTION_CONFIG=^#define HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION 1 -# PCAP_BREAKLOOP won't have any benefit on Win32, but breaks compatibility with 3.0 -PCAP_BREAKLOOP_CONFIG= -PCAP_LIST_DATALINKS_CONFIG=^#define HAVE_PCAP_LIST_DATALINKS 1 -PCAP_FREE_DATALINKS_CONFIG=^#define HAVE_PCAP_FREE_DATALINKS 1 -PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1 -PCAP_OPEN_DEAD_CONFIG=^#define HAVE_PCAP_OPEN_DEAD 1 -BPF_IMAGE_CONFIG=^#define HAVE_BPF_IMAGE 1 -PCAP_CREATE_CONFIG=^#define HAVE_PCAP_CREATE 1 -!ELSE -# no WpdPack installed -WINPCAP_CONFIG= -PCAP_FINDALLDEVS_CONFIG= -PCAP_DATALINK_NAME_TO_VAL_CONFIG= -PCAP_DATALINK_VAL_TO_NAME_CONFIG= -PCAP_DATALINK_VAL_TO_DESCRIPTION_CONFIG= -PCAP_BREAKLOOP_CONFIG= -PCAP_LIST_DATALINKS_CONFIG= -PCAP_FREE_DATALINKS_CONFIG= -PCAP_SET_DATALINK_CONFIG= -PCAP_OPEN_DEAD_CONFIG= -BPF_IMAGE_CONFIG= -!ENDIF - -!IF DEFINED(PCAP_DIR) && DEFINED(PCAP_REMOTE) -PCAP_HAVE_REMOTE_CONFIG=^#define HAVE_REMOTE 1 -PCAP_REMOTE_CONFIG=^#define HAVE_PCAP_REMOTE 1 -PCAP_OPEN_CONFIG=^#define HAVE_PCAP_OPEN 1 -PCAP_SETSAMPLING_CONFIG=^#define HAVE_PCAP_SETSAMPLING 1 -!ELSE -PCAP_HAVE_REMOTE_CONFIG= -PCAP_REMOTE_CONFIG= -PCAP_OPEN_CONFIG= -PCAP_SETSAMPLING_CONFIG= -!ENDIF - -!IFDEF ZLIB_DIR -ZLIB_PATH=$(ZLIB_DIR) -ZLIB_CFLAGS=/I$(ZLIB_DIR) -ZLIB_LIBS=$(ZLIB_DIR)\lib\zdll.lib -ZLIB_DLL=$(ZLIB_DIR)\zlib1.dll -# Nmake uses carets to escape special characters -ZLIB_CONFIG=^#define HAVE_ZLIB 1 -!else -ZLIB_CFLAGS= -ZLIB_LIBS= -ZLIB_DLL= -ZLIB_CONFIG= -!ENDIF - -!IFDEF C_ARES_PKG -C_ARES_DIR=$(WIRESHARK_LIB_DIR)\c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws -C_ARES_CFLAGS=/I$(C_ARES_DIR)/include -C_ARES_LIBS=$(C_ARES_DIR)\lib\libcares-2.lib -C_ARES_DLL=$(C_ARES_DIR)\bin\libcares-2.dll -# Nmake uses carets to escape special characters -C_ARES_CONFIG=^#define HAVE_C_ARES 1 -!else -C_ARES_CFLAGS= -C_ARES_LIBS= -C_ARES_CONFIG= -!ENDIF # C_ARES - -!IFDEF KFW_DIR -KFW_PATH=$(KFW_DIR)\bin -KFW_CFLAGS=/I$(KFW_DIR)\include -!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win32" -KFW_LIBS=$(KFW_DIR)\lib\krb5_32.lib -!ELSE -KFW_LIBS=$(KFW_DIR)\lib\krb5_64.lib -!ENDIF -# Nmake uses carets to escape special characters -KFW_CONFIG=^#define HAVE_MIT_KERBEROS 1 -!else -KFW_CFLAGS= -KFW_LIBS= -KFW_CONFIG= -!ENDIF - -!IFDEF GNUTLS_PKG -GNUTLS_DIR=$(WIRESHARK_LIB_DIR)\gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws -GNUTLS_PATH=$(GNUTLS_DIR) -# /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash -GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL -GCRYPT_LIBS = $(GNUTLS_DIR)\bin\libgcrypt-20.lib -GNUTLS_LIBS=\ - $(GNUTLS_DIR)\bin\libtasn1-6.lib \ -!IF "$(WIRESHARK_TARGET_PLATFORM)" == "win32" - $(GNUTLS_DIR)\bin\libgpg-error-0.lib \ -!ELSE - $(GNUTLS_DIR)\bin\libgpg-error6-0.lib \ -!ENDIF - $(GCRYPT_LIBS) \ - $(GNUTLS_DIR)\bin\libgnutls-28.lib -# Nmake uses carets to escape special characters -GNUTLS_CONFIG=^#define HAVE_LIBGNUTLS 1 -LIBGCRYPT_CONFIG=^#define HAVE_LIBGCRYPT 1 -!else -GNUTLS_CFLAGS= -GNUTLS_LIBS= -GNUTLS_CONFIG= -LIBGCRYPT_CONFIG= -!ENDIF - -!IFDEF LIBSSH_DIR -LIBSSH_CFLAGS=/I$(LIBSSH_DIR)\include -LIBSSH_LIBS=$(LIBSSH_DIR)\lib\ssh.lib -# Nmake uses carets to escape special characters -LIBSSH_CONFIG=^#define HAVE_LIBSSH 1 -LIBSSH_VERSION=^#define HAVE_LIBSSH 1 -!else -LIBSSH_CFLAGS= -LIBSSH_LIBS= -LIBSSH_CONFIG= -!ENDIF - -!IFDEF LUA_DIR -LUA_CFLAGS=/I$(LUA_DIR)\include -LUA_LIBS=$(LUA_DIR)\lua52.lib -# Nmake uses carets to escape special characters -LUA_CONFIG=^#define HAVE_LUA 1 -LUA_VERSION=^#define HAVE_LUA 1 -!else -LUA_CFLAGS= -LUA_LIBS= -LUA_CONFIG= -!ENDIF - -!IFDEF PORTAUDIO_DIR -# Nmake uses carets to escape special characters -PORTAUDIO_CONFIG=^#define HAVE_LIBPORTAUDIO 1 -!IF "$(PORTAUDIO_VERSION)" == "18" -# V18 uses API version 1 and v19 API version 2 -PORTAUDIO_CFLAGS=/I$(PORTAUDIO_DIR)\pa_common -PORTAUDIO_API_CONFIG=^#define PORTAUDIO_API_1 1 -!ELSE -PORTAUDIO_CFLAGS=/I$(PORTAUDIO_DIR)\include /I$(PORTAUDIO_DIR)\src\common /I$(PORTAUDIO_DIR)\src\os\win /DPA_NO_DS /DPA_NO_ASIO -!ENDIF -!ELSE -PORTAUDIO_CFLAGS= -PORTAUDIO_CONFIG= -!ENDIF - -!IFDEF HHC_DIR -PATH=$(PATH);$(HHC_DIR) -HHC_EXE=hhc.exe -HHC_CFLAGS=-DHHC_DIR -HHC_LIBS=htmlhelp.lib -!ELSE -HHC_CFLAGS= -HHC_LIBS= -!ENDIF - -!IFDEF SMI_PKG -SMI_DIR=$(WIRESHARK_LIB_DIR)\libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws -SMI_CONFIG=^#define HAVE_LIBSMI 1 -SMI_CFLAGS=/I$(SMI_DIR)\include -SMI_LIBS=$(SMI_DIR)\lib\libsmi-2.lib -!ENDIF - -!IFDEF GEOIP_PKG -GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws -GEOIP_CONFIG=^#define HAVE_GEOIP 1 -GEOIP_V6_CONFIG=^#define HAVE_GEOIP_V6 1 -GEOIP_CFLAGS=/I$(GEOIP_DIR)/include -GEOIP_LIBS=$(GEOIP_DIR)\lib\libGeoIP-1.lib -!ENDIF - -!IFDEF WINSPARKLE_PKG -WINSPARKLE_DIR=$(WIRESHARK_LIB_DIR)\WinSparkle-$(WINSPARKLE_PKG) -WINSPARKLE_CONFIG=^#define HAVE_SOFTWARE_UPDATE 1 -WINSPARKLE_CFLAGS=/I$(WINSPARKLE_DIR) -WINSPARKLE_LIBS=$(WINSPARKLE_DIR)\WinSparkle.lib -!ENDIF - -!IFDEF ENABLE_LIBWIRESHARK -# Link plugins with the import library of libwireshark.dll -LINK_PLUGINS_WITH_LIBWIRESHARK=USE -!ELSE -LIBWIRESHARK_CONFIG= -!ENDIF - -# Construct the path -PATH=$(PATH);$(CYGWIN_PATH);$(GTK_DIR)\bin;$(GETTEXT_DIR)\bin;$(ZLIB_PATH) - -NTDDNDIS_CONFIG=^#define HAVE_NTDDNDIS_H 1 diff --git a/doc/Makefile.am b/doc/Makefile.am index 6a2004b2d9..2c9cd5c34b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -290,7 +290,6 @@ MAINTAINERCLEANFILES = \ Makefile.in EXTRA_DIST = \ - Makefile.nmake \ README.capture \ README.design \ README.developer \ diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake deleted file mode 100644 index f56d2c78a7..0000000000 --- a/doc/Makefile.nmake +++ /dev/null @@ -1,337 +0,0 @@ -# Makefile.nmake -# Nmake file for Wireshark documentation -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# We include dependencies on ../config.h in order to -# capture when $(VERSION) changes. - -include ../config.nmake - -doc: wireshark.html tshark.html wireshark-filter.html capinfos.html \ - ciscodump.html editcap.html idl2wrs.html mergecap.html reordercap.html \ - text2pcap.html dumpcap.html androiddump.html sshdump.html rawshark.html \ - dftest.html randpkt.html randpktdump.html \ - idl2deb.html asn2deb.html extcap.html - -man: wireshark.1 tshark.1 wireshark-filter.4 capinfos.1 \ - editcap.1 idl2wrs.1 mergecap.1 reordercap.1 \ - text2pcap.1 dumpcap.1 androiddump.1 sshdump.1 rawshark.1 dftest.1 randpkt.1 \ - idl2deb.1 asn2deb.1 extcap.4 randpktdump.1 ciscodump.1 - -wireshark.pod: wireshark.pod.template AUTHORS-SHORT-FORMAT - copy /B wireshark.pod.template + AUTHORS-SHORT-FORMAT wireshark.pod - -# -# Build the short version of the authors file for the about dialog -# -AUTHORS-SHORT: ../AUTHORS make-authors-short.pl - $(PERL) perlnoutf.pl make-authors-short.pl < ../AUTHORS > AUTHORS-SHORT - -# -# Build the short version of the authors file with formatting codes for -# the man page -# -AUTHORS-SHORT-FORMAT: AUTHORS-SHORT make-authors-format.pl - $(PERL) perlnoutf.pl make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT - -ws.css: ../docbook/ws.css - copy ..\docbook\ws.css . - -wireshark.1: wireshark.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - wireshark.pod > wireshark.1 - -wireshark.html: wireshark.pod ../config.h ws.css - $(POD2HTML) \ - --title="The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - wireshark.pod > wireshark.html - -tshark.1: tshark.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - tshark.pod > tshark.1 - -tshark.html: tshark.pod ../config.h ws.css - $(POD2HTML) \ - --title="tshark - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - tshark.pod > tshark.html - -wireshark-filter.4: wireshark-filter.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - wireshark-filter.pod > wireshark.4 - -wireshark-filter.html: wireshark-filter.pod ../config.h ws.css - $(POD2HTML) \ - --title="wireshark-filter - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - wireshark-filter.pod > wireshark-filter.html - -capinfos.1: capinfos.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - capinfos.pod > capinfos.1 - -capinfos.html: capinfos.pod ../config.h ws.css - $(POD2HTML) \ - --title="capinfos - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - capinfos.pod > capinfos.html - -editcap.1: editcap.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - editcap.pod > editcap.1 - -editcap.html: editcap.pod ../config.h ws.css - $(POD2HTML) \ - --title="editcap - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - editcap.pod > editcap.html - -asn2deb.1: asn2deb.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - asn2deb.pod > asn2deb.1 - -asn2deb.html: asn2deb.pod ../config.h ws.css - $(POD2HTML) \ - --title="asn2deb - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - asn2deb.pod > asn2deb.html - -idl2deb.1: idl2deb.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - idl2deb.pod > idl2deb.1 - -idl2deb.html: idl2deb.pod ../config.h ws.css - $(POD2HTML) \ - --title="idl2deb - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - idl2deb.pod > idl2deb.html - -idl2wrs.1: idl2wrs.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - idl2wrs.pod > idl2wrs.1 - -idl2wrs.html: idl2wrs.pod ../config.h ws.css - $(POD2HTML) \ - --title="idl2wrs - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - idl2wrs.pod > idl2wrs.html - -mergecap.1: mergecap.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - mergecap.pod > mergecap.1 - -mergecap.html: mergecap.pod ../config.h ws.css - $(POD2HTML) \ - --title="mergecap - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - mergecap.pod > mergecap.html - -reordercap.1: reordercap.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - reordercap.pod > reordercap.1 - -reordercap.html: reordercap.pod ../config.h ws.css - $(POD2HTML) \ - --title="reordercap - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - reordercap.pod > reordercap.html - -text2pcap.1: text2pcap.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - text2pcap.pod > text2pcap.1 - -text2pcap.html: text2pcap.pod ../config.h ws.css - $(POD2HTML) \ - --title="text2pcap - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - text2pcap.pod > text2pcap.html - -dumpcap.1: dumpcap.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - dumpcap.pod > dumpcap.1 - -dumpcap.html: dumpcap.pod ../config.h ws.css - $(POD2HTML) \ - --title="dumpcap - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - dumpcap.pod > dumpcap.html - -extcap.4: extcap.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - extcap.pod > extcap.1 - -extcap.html: extcap.pod ../config.h ws.css - $(POD2HTML) \ - --title="extcap - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - extcap.pod > extcap.html - -androiddump.1: androiddump.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - androiddump.pod > androiddump.1 - -androiddump.html: androiddump.pod ../config.h ws.css - $(POD2HTML) \ - --title="androiddump - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - androiddump.pod > androiddump.html - -sshdump.1: sshdump.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - sshdump.pod > sshdump.1 - -sshdump.html: sshdump.pod ../config.h ws.css - $(POD2HTML) \ - --title="sshdump - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - sshdump.pod > sshdump.html - -ciscodump.1: ciscodump.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - ciscodump.pod > ciscodump.1 - -ciscodump.html: ciscodump.pod ../config.h ws.css - $(POD2HTML) \ - --title="ciscodump - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - ciscodump.pod > ciscodump.html - -randpktdump.1: randpktdump.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - randpktdump.pod > randpktdump.1 - -randpktdump.html: randpktdump.pod ../config.h ws.css - $(POD2HTML) \ - --title="randpktdump - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - randpktdump.pod > randpktdump.html - -rawshark.1: rawshark.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - rawshark.pod > rawshark.1 - -rawshark.html: rawshark.pod ../config.h ws.css - $(POD2HTML) \ - --title="rawshark - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - rawshark.pod > rawshark.html - -dftest.1: dftest.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - dftest.pod > dftest.1 - -dftest.html: dftest.pod ../config.h ws.css - $(POD2HTML) \ - --title="dftest - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - dftest.pod > dftest.html - -randpkt.1: randpkt.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - randpkt.pod > randpkt.1 - -randpkt.html: randpkt.pod ../config.h ws.css - $(POD2HTML) \ - --title="randpkt - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - randpkt.pod > randpkt.html - -clean: - rm -f wireshark.html wireshark.1 wireshark.pod - rm -f tshark.html tshark.1 - rm -f wireshark-filter.html wireshark-filter.4 - rm -f capinfos.html capinfos.1 - rm -f editcap.html editcap.1 - rm -f idl2wrs.html idl2wrs.1 - rm -f mergecap.html mergecap.1 - rm -f reordercap.html reordercap.1 - rm -f text2pcap.html text2pcap.1 - rm -f dumpcap.html dumpcap.1 - rm -f rawshark.html rawshark.1 - rm -f randpkt.html randpkt.1 - rm -f dftest.html dftest.1 - rm -f pod2htm* - rm -f ws.css - rm -f AUTHORS-SHORT AUTHORS-SHORT-FORMAT - -distclean: clean - -maintainer-clean: distclean diff --git a/doc/README.plugins b/doc/README.plugins index 78744cc580..5302cef56c 100644 --- a/doc/README.plugins +++ b/doc/README.plugins @@ -291,8 +291,7 @@ is encouraged to update their plugins as outlined below: o Add a new Makefile.common file with the lists of source files and headers. - o Change the Makefile.am and Makefile.nmake files to match those of - the DOCSIS plugin. + o Change the Makefile.am file to match the one of the DOCSIS plugin. 6 How to plugin related interface options diff --git a/doc/README.qt b/doc/README.qt index b47ca6d96a..4ff412c3b5 100644 --- a/doc/README.qt +++ b/doc/README.qt @@ -49,11 +49,6 @@ There are several ways of building the Qt UI: Qt (--with-qt) is enabled by default. -4) Qt Creator + Wireshark.pro: - - Wireshark.pro (formerly QtShark.pro) was used to bootstrap the UI porting - effort. It is still used by Nmake but will likely be removed at some point. - 1.1 Prerequisites Before compiling you need the Qt SDK and Qt Creator. @@ -79,7 +74,7 @@ select "Build Settings" and do the following: - In "Edit build configuration" make sure the "Release" build is selected. (The "Debug" build won't work unless Wireshark is recompiled to link with a "debug" - the "debug" C runtime library (using /MDd). See ui\qt\Wireshark.pro for details). + the "debug" C runtime library (using /MDd)). - Make sure "Qt version" matches your version of Visual Studio. - Make sure "Tool chain" matches your Visual C++ version. @@ -96,19 +91,10 @@ XXX: (WMeier): I've not had too much satisfaction using the "native Windows debu 1.1.2.2 Command Line -- Setup environment: - c:\qt\4.8.0\bin\qtvars.bat [vsvars] ;;; optional 'vsvars' to also setup VC env vars - - [Create and] Switch to a working dir to be used for .obj files, etc for Wireshark-qt compilation -- Use qmake to create Windows Makefile (based upon info in ui\qt\Wireshark.pro and config.pri) - qmake -o Makefile.nmake ..\..\ui\qt\QtShark.pro - ;; (Only needs to be run once; - ;; nmake -f Makefile.nmake will redo qmake if any - ;; dependendencies (e.g., Wireshark.pro) change. +- Use CMake to create Windows Makefile and compile (see README.cmake) -- Compile & Build - nmake -f Makefile.nmake ;; wireshark.exe + all DLL's will be in <working-dir>\wireshark-qt-debug - Run: <working-dir>\wireshark-qt-debug @@ -116,7 +102,7 @@ XXX: (WMeier): I've not had too much satisfaction using the "native Windows debu Start Visual Studio; File ! Open ! Project/Solution ! .../<working-dir>/wireshark-qt-debug/wireshark.exe (Using Solution Explorer ! Properties ! Environment to - add PATH=C:\Qt\4.8.0\bin;%PATH% will pobably be required). + add PATH=C:\Qt\4.8.0\bin;%PATH% will probably be required). ... Debug in the usual manner diff --git a/doc/README.wslua b/doc/README.wslua index 74074904e3..e1a02b3f01 100644 --- a/doc/README.wslua +++ b/doc/README.wslua @@ -44,11 +44,10 @@ Lua tables. (you can do so, but it's not advisable) Both of the perl scripts above are given the C-source files to search through by the make process, generated from the lists in epan/wslua/CMakeLists.txt. Naturally if you add new source files, you need to add them to the list in -epan/wslua/CMakeLists.txt, as well as epan/wslua/Makefile.am and -epan/wslua/Makefile.nmake. You also have to add the module name into -docbook/user-guide.xml and docbook/wsluarm.xml, and the source files into -docbook/CMakeLists.txt and docbook/Makefile.common, to get it to be generated -in the user guide. +epan/wslua/CMakeLists.txt and epan/wslua/Makefile.am. You also have to add +the module name into docbook/user-guide.xml and docbook/wsluarm.xml, and the +source files into docbook/CMakeLists.txt and docbook/Makefile.common, to get +it to be generated in the user guide. Another Perl script is used as well, called 'make-init-lua.pl', which generates the init.lua script. A large part of it deals with exposing #define diff --git a/docbook/Makefile.am b/docbook/Makefile.am index ecee49acf7..8a72d69e06 100644 --- a/docbook/Makefile.am +++ b/docbook/Makefile.am @@ -213,7 +213,6 @@ EXTRA_DIST = \ dfilter2xml.pl \ make-wsluarm.pl \ README.txt \ - Makefile.nmake \ CMakeLists.txt MAINTAINERCLEANFILES = \ diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake deleted file mode 100644 index 23fa4c748d..0000000000 --- a/docbook/Makefile.nmake +++ /dev/null @@ -1,280 +0,0 @@ -# -# Make the "Wireshark User Guide" and "Wireshark Developer Guide" -# in several formats. -# See the Readme.txt file for instructions. -# -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake [target ...] -# - -############### YOU SHOULDN'T HAVE TO EDIT ANYTHING BELOW THIS LINE! ################ - -TOOLS_DIR=..\tools -include ..\config.nmake -top_srcdir=.. -srcdir=. -include Makefile.common - -WSUG_SOURCE = $(WSUG_SOURCE) Makefile.nmake -WSDG_SOURCE = $(WSDG_SOURCE) Makefile.nmake -RELEASE_NOTES_SOURCE = $(RELEASE_NOTES_SOURCE) Makefile.nmake - -# Asciidoc converter -A2X_HTML_OPTS="--stylesheet=ws.css" -A2X_TEXT_OPTS= - -!ifdef LYNX -A2X_TEXT_OPTS=$(A2X_TEXT_OPTS) --lynx -!endif - -# Automatically generate .pdf files from .fo files -.fo.pdf: - $(FOP) $< $@ - -.SUFFIXES: .fo .pdf - -# -- (Public) targets ------------------------------------------------------- - -# Make all (default) -all: wsug_x wsdg_x release_notes_x - -# Make only the WSUG -wsug: wsug_x - -# Make only the WSDG -wsdg: wsdg_x - -# Make only the release notes -release_notes: release_notes_x - -# Clean all -clean: - rm -rf $(CLEANFILES) $(CLEANDIRS) - -distclean: clean - -maintainer-clean: distclean - -# -- User Guide ------------------------------------------------------------------------ - -wsug_x: wsug_html_chunked wsug_html user-guide-a4.pdf user-guide-us.pdf user-guide.chm - -user-guide.xml: user-guide.asciidoc $(WSUG_FILES) user-guide-docinfo.xml - @ echo --- WSUG - XML --- - $(SH) << - PATH=/usr/bin - PYTHONHOME=/ - $(A2X) --verbose \ - --attribute=docinfo \ - --asciidoc-opts="--conf-file=asciidoc.conf --conf-file=asciidoctor-asciidoc.conf" \ - --no-xmllint \ - --format=docbook \ - user-guide.asciidoc -<< - -# create html single page file -wsug_html: wsug_html\index.html - -wsug_html\index.html: $(WSUG_SOURCE) - @ echo --- WSUG - HTML SINGLE PAGE --- - if not exist wsug_html\wsug_graphics\toolbar md wsug_html\wsug_graphics\toolbar - cp wsug_graphics/*.* wsug_html/wsug_graphics - cp common_graphics/*.* wsug_html/wsug_graphics - cp wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar - cp ws.css wsug_html - $(XSLTPROC) --stringparam base.dir wsug_html/ $(COMMON_XSLTPROC_ARGS) \ - $(WSUG_XSLTPROC_ARGS) $(SINGLE_XSLTPROC_ARGS) user-guide.xml > $@ - -# create html chunked page files -wsug_html_chunked: wsug_html_chunked\index.html - -wsug_html_chunked\index.html: $(WSUG_SOURCE) - @ echo --- WSUG - HTML CHUNKED --- - if not exist wsug_html_chunked\wsug_graphics\toolbar md wsug_html_chunked\wsug_graphics\toolbar - cp wsug_graphics/*.* wsug_html_chunked/wsug_graphics - cp common_graphics/*.* wsug_html_chunked/wsug_graphics - cp wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar - cp ws.css wsug_html_chunked - $(XSLTPROC) --stringparam base.dir wsug_html_chunked/ $(COMMON_XSLTPROC_ARGS) \ - $(WSUG_XSLTPROC_ARGS) $(CHUNKED_XSLTPROC_ARGS) user-guide.xml - -# create pdf file (through XSL-FO), portrait pages on US letter paper (the default) -# you will get lot's of errors, but that's ok -user-guide-us.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl -!ifdef FOP - @ echo --- WSUG - PDF US PAPER --- - $(XSLTPROC) --stringparam paper.type letter \ - $(COMMON_XSLTPROC_ARGS) $(WSUG_PDF_XSLTPROC_ARGS) \ - --nonet custom_layer_pdf.xsl user-guide.xml > $@ -!endif - -# create pdf file (through XSL-FO), portrait pages on A4 paper -# you will get lot's of errors, but that's ok -user-guide-a4.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl -!ifdef FOP - @ echo --- WSUG - PDF A4 PAPER --- - $(XSLTPROC) --stringparam paper.type A4 \ - $(COMMON_XSLTPROC_ARGS) $(WSUG_PDF_XSLTPROC_ARGS) \ - --nonet custom_layer_pdf.xsl user-guide.xml > $@ -!endif - -# create MS html help file (through html chunked pages) -user-guide.chm: $(WSUG_SOURCE) -!ifdef HHC_EXE - @ echo --- WSUG - MICROSOFT HTML HELP --- - if not exist wsug_chm\wsug_graphics\toolbar md wsug_chm\wsug_graphics\toolbar - -cp wsug_graphics/*.* wsug_chm/wsug_graphics - -cp common_graphics/*.* wsug_chm/wsug_graphics - -cp wsug_graphics/toolbar/* wsug_chm/wsug_graphics/toolbar - $(XSLTPROC) --stringparam base.dir wsug_chm/ $(COMMON_XSLTPROC_ARGS) \ - $(WSUG_XSLTPROC_ARGS) $(HTMLHELP_XSLTPROC_ARGS) user-guide.xml - -$(HHC_EXE) htmlhelp.hhp - -mv htmlhelp.chm $@ - -rm -r htmlhelp.hhp - -rm -r toc.hhc -!endif - -wsluarm: make-wsluarm.pl $(WSLUA_MODULES) - if not exist wsluarm_src md wsluarm_src - $(PERL) make-wsluarm.pl $(WSLUA_MODULES) - touch wsluarm - -# -- Developer's Guide ------------------------------------------------------------------------ - -wsdg_x: wsdg_html_chunked wsdg_html developer-guide-a4.pdf developer-guide-us.pdf developer-guide.chm - -developer-guide.xml: developer-guide.asciidoc $(WSDG_FILES) wsluarm developer-guide-docinfo.xml - @ echo --- WSDG - XML --- - $(SH) << - PATH=/usr/bin - PYTHONHOME=/ - $(A2X) --verbose \ - --attribute=docinfo \ - --asciidoc-opts="--conf-file=asciidoc.conf --conf-file=asciidoctor-asciidoc.conf" \ - --no-xmllint \ - --format=docbook \ - developer-guide.asciidoc -<< - -# create html single page file -wsdg_html: wsdg_html\index.html - -wsdg_html\index.html: $(WSDG_SOURCE) - @ echo --- WSDG - HTML SINGLE PAGE --- - if not exist wsdg_html\wsdg_graphics md wsdg_html\wsdg_graphics - if not exist wsdg_html\wsdg_graphics\toolbar md wsdg_html\wsdg_graphics\toolbar - cp wsdg_graphics/*.* wsdg_html/wsdg_graphics - cp common_graphics/*.* wsdg_html/wsdg_graphics - cp wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar - cp ws.css wsdg_html - $(XSLTPROC) --stringparam base.dir wsdg_html/ $(COMMON_XSLTPROC_ARGS) \ - $(WSDG_XSLTPROC_ARGS) $(SINGLE_XSLTPROC_ARGS) developer-guide.xml > $@ - -# create html chunked page files -wsdg_html_chunked: wsdg_html_chunked\index.html - -wsdg_html_chunked\index.html: $(WSDG_SOURCE) - @ echo --- WSDG - HTML CHUNKED --- - if not exist wsdg_html_chunked\wsdg_graphics md wsdg_html_chunked\wsdg_graphics - if not exist wsdg_html_chunked\wsdg_graphics\toolbar md wsdg_html_chunked\wsdg_graphics\toolbar - cp wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics - cp common_graphics/*.* wsdg_html_chunked/wsdg_graphics - cp wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar - cp ws.css wsdg_html_chunked - $(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ $(COMMON_XSLTPROC_ARGS) \ - $(WSDG_XSLTPROC_ARGS) $(CHUNKED_XSLTPROC_ARGS) developer-guide.xml - -# create pdf file (through XSL-FO), portrait pages on US letter paper (the default) -# you will get lot's of errors, but that's ok -developer-guide-us.fo: $(WSDG_SOURCE) custom_layer_pdf.xsl -!ifdef FOP - @ echo --- WSDG - PDF US PAPER --- - $(XSLTPROC) --stringparam paper.type letter \ - $(COMMON_XSLTPROC_ARGS) $(WSDG_PDF_XSLTPROC_ARGS) \ - --nonet custom_layer_pdf.xsl developer-guide.xml > $@ -!endif - -# create pdf file (through XSL-FO), portrait pages on A4 paper -# you will get lot's of errors, but that's ok -developer-guide-a4.fo: $(WSDG_SOURCE) custom_layer_pdf.xsl -!ifdef FOP - @ echo --- WSDG - PDF A4 PAPER --- - $(XSLTPROC) --stringparam paper.type A4 \ - $(COMMON_XSLTPROC_ARGS) $(WSDG_PDF_XSLTPROC_ARGS) \ - --nonet custom_layer_pdf.xsl developer-guide.xml > $@ -!endif - -# create MS html help file (through html chunked pages) -developer-guide.chm: $(WSDG_SOURCE) -!ifdef HHC_EXE - @ echo --- WSDG - MICROSOFT HTML HELP --- - if not exist wsdg_chm\wsdg_graphics md wsdg_chm\wsdg_graphics - if not exist wsdg_chm\wsdg_graphics\toolbar md wsdg_chm\wsdg_graphics\toolbar - -cp wsdg_graphics/*.* wsdg_chm/wsdg_graphics - -cp common_graphics/*.* wsdg_chm/wsdg_graphics - -cp wsdg_graphics/toolbar/* wsdg_chm/wsdg_graphics/toolbar - $(XSLTPROC) --stringparam base.dir wsdg_chm/ $(COMMON_XSLTPROC_ARGS) \ - $(WSDG_XSLTPROC_ARGS) $(HTMLHELP_XSLTPROC_ARGS) developer-guide.xml - -$(HHC_EXE) htmlhelp.hhp - -mv htmlhelp.chm $@ - -rm -r htmlhelp.hhp - -rm -r toc.hhc -!endif - -# -- Release Notes ------------------------------------------------------------------------ - -release_notes_x: release-notes.html release-notes.txt - -release_notes_pdf: release-notes-a4.pdf release-notes-us.pdf - -# create html single page file -release-notes.html: $(RELEASE_NOTES_SOURCE) - @ echo --- RELEASE NOTES - HTML --- - $(SH) << - PATH=/usr/bin - PYTHONHOME=/ - $(A2X) -v --format=xhtml $(A2X_HTML_OPTS) release-notes.asciidoc -<< - -# create txt single page file (through HTML) -release-notes.txt: $(RELEASE_NOTES_SOURCE) - @ echo --- RELEASE NOTES - TXT --- - $(SH) << - PATH=/usr/bin - PYTHONHOME=/ - TZ=UTC - $(A2X) -v --format=text $(A2X_TEXT_OPTS) \ - --xsltproc-opts "--stringparam generate.toc \"article nop\"" \ - release-notes.asciidoc -<< - mv release-notes.text $@ - -news: release-notes.txt - copy release-notes.txt ..\NEWS - -# create pdf file, portrait pages on US letter paper -release-notes-us.pdf: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl - @ echo --- RELEASE NOTES - PDF US LETTER PAPER --- - $(SH) << - PATH=/usr/bin - PYTHONHOME=/ - $(A2X) --format=pdf $(A2X_HTML_OPTS) \ - --xsltproc-opts "--stringparam paper.type letter --nonet" \ - --xsl-file=custom_layer_pdf.xsl \ - release-notes.asciidoc -<< - mv release-notes.pdf $@ - -# create pdf file, portrait pages on A4 paper -release-notes-a4.pdf: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl - @ echo --- RELEASE NOTES - PDF A4 PAPER --- - $(SH) << - PATH=/usr/bin - PYTHONHOME=/ - $(A2X) --format=pdf $(A2X_HTML_OPTS) \ - --xsltproc-opts "--stringparam paper.type A4 --nonet" \ - --xsl-file=custom_layer_pdf.xsl \ - release-notes.asciidoc -<< - mv release-notes.pdf $@ - -_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory diff --git a/docbook/README.txt b/docbook/README.txt index 88fec4b47d..923efb5e35 100644 --- a/docbook/README.txt +++ b/docbook/README.txt @@ -6,7 +6,7 @@ This directory contains the source files needed to build the: - Lua Reference -To build everything, just do 'make' (for Win32: 'nmake -f Makefile.nmake') +To build everything, just do 'make' (for Win32: see README.cmake) but see the requirements below. The guides are written in Docbook/XML (formerly Docbook/SGML). The release @@ -18,18 +18,6 @@ stylesheets, which provides a flexible way for these conversions. By default the Makefile generates HTML in single page and multiple (chunked) formats and two PDF's. -Win32 only: The optional output format CHM has to be enabled by setting -HHC_EXE in ..\config.nmake. Microsoft has dropped support for HTML Help - - -Settings: ---------- - -Win32 only: ..\config.nmake ---------------------------- -Settings moved to: ..\config.nmake. - - Requirements: ------------- @@ -59,8 +47,7 @@ http://xml.apache.org/fop/ FOP is a Java program, so you need to have a Java environment installed. The makefiles look for fop-2.1 in the docbook directory. You can change -this location by setting the FOP environment variable or by changing -config.nmake. +this location by setting the FOP environment variable. FOP might return an OutOfMemoryException. You can limit its memory usage by adding " -Xmx256m" to the FOP_OPTS environment variable. The Windows @@ -126,7 +113,6 @@ http://www.microsoft.com/en-us/download/details.aspx?id=21138 Packages for Win32 ------------------ -See ..\config.nmake for Win32 settings. Installing the asciidoc package will pull in almost all the other required Cygwin packages. You may need to run "build-docbook-catalog" from a Cygwin bash prompt in order to register your catalog properly. @@ -139,7 +125,7 @@ docbookx.dtd: Text/docbook-xml42 M a later version may be r docbookx.dtd: Text/docbook-xml45 M current asciidoc installations require this lynx: Web/lynx M dblatex Text/dblatex O A number of dependencies will also be installed -fop: - O URL: http://xml.apache.org/fop/ - install it into docbok\fop-1.x or wireshark_lib_dir\fop-1.x to use defaults from config.nmake +fop: - O URL: http://xml.apache.org/fop/ - install it into docbok\fop-1.x or wireshark_lib_dir\fop-1.x hhc: - O URL: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp zip: Archive/zip O getopt: Base/util-linux O Required to run "build-docbook-catalog" @@ -207,7 +193,7 @@ fop: fop O See above -Makefile / Makefile.nmake: +Makefile: -------------------------- There are several ways and tools to do these conversion, following is a short description of the way the makefile targets are doing things and which output @@ -249,7 +235,6 @@ Using the prefix wsdg_ instead of wsug_ will build the same targets but for the Wireshark Developer's Guide. The makefile is written to be run with make on UNIX/Linux platforms. -Win32 platforms have to use nmake -f Makefile.nmake Notes to authors diff --git a/echld/Makefile.am b/echld/Makefile.am index b0a21dcb0f..7107813843 100644 --- a/echld/Makefile.am +++ b/echld/Makefile.am @@ -52,8 +52,7 @@ libechld_la_LIBADD = \ EXTRA_DIST = \ CMakeLists.txt \ - Makefile.common \ - Makefile.nmake + Makefile.common CLEANFILES = \ libechld.a \ diff --git a/echld/Makefile.nmake b/echld/Makefile.nmake deleted file mode 100644 index 5de6da7392..0000000000 --- a/echld/Makefile.nmake +++ /dev/null @@ -1,19 +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 ######### - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I. /I.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include -DWS_BUILD_DLL - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -# no fork() on windows this needs some thoughts... diff --git a/epan/Makefile.am b/epan/Makefile.am index d91e24917a..4b2f6531b1 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -85,7 +85,6 @@ EXTRA_DIST = \ dtd_preparse.l \ enterprise-numbers \ Makefile.common \ - Makefile.nmake \ radius_dict.l \ uat_load.l \ doxygen.cfg.in \ diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake deleted file mode 100644 index 07a886bcac..0000000000 --- a/epan/Makefile.nmake +++ /dev/null @@ -1,466 +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 - -include Makefile.common - -LINK= link - -# -# These are the flags for all source files. -# -COMMON_CFLAGS=\ - $(STANDARD_CFLAGS) \ - /I. /I.. $(GLIB_CFLAGS) \ - $(ZLIB_CFLAGS) $(C_ARES_CFLAGS) \ - $(LUA_CFLAGS) $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \ - $(SMI_CFLAGS) $(GEOIP_CFLAGS) - -# -# These are the flags for generated source files; we don't include -# $(WARNINGS_ARE_ERRORS), so that we flex's non-LLP64-compliant output -# doesn't cause compilation to fail. -# -GENERATED_CFLAGS=\ - $(COMMON_CFLAGS) -DWS_BUILD_DLL - -# -# These are the flags for test programs; we don't include -DWS_BUILD_DLL, -# as we're building test programs that link with the library, not routines -# incorporated into the library, so they should *import* stuff from the -# library, not *export* stuff from the library. -# -TEST_CFLAGS=\ - $(WARNINGS_ARE_ERRORS) $(COMMON_CFLAGS) - -# -# These are flags for everything else; we include $(WARNINGS_ARE_ERRORS), -# as the code should be warning-free, and we include -DWS_BUILD_DLL, -# as these are library routines, not test programs. -# -CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) -DWS_BUILD_DLL - -!IFDEF LUA_DIR -WSLUA_LIB=wslua\wslua.lib -WSLUA_DIR=wslua -!ELSE -WSLUA_LIB= -WSLUA_DIR= -!ENDIf - -# For use when making libwireshark.dll -libwireshark_LIBS = \ - $(GLIB_LIBS) \ - $(C_ARES_LIBS) \ - $(KFW_LIBS) \ - $(ZLIB_LIBS) \ - $(GNUTLS_LIBS) \ - $(LUA_LIBS) \ - $(SMI_LIBS) \ - $(GEOIP_LIBS) \ - ..\wsutil\libwsutil.lib \ - ..\wiretap\wiretap-$(WTAP_VERSION).lib \ - compress\lzxpress.lib \ - crypt\airpdcap.lib \ - ftypes\ftypes.lib \ - dfilter\dfilter.lib \ - wmem\wmem.lib \ - $(WSLUA_LIB) \ - nghttp2\nghttp2.lib \ - dissectors\dissectors.lib - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LIBWIRESHARK_OBJECTS = $(LIBWIRESHARK_ALL_SRC:.c=.obj) - -EXTRA_OBJECTS = \ -!IF defined(NASM) && "$(WIRESHARK_TARGET_PLATFORM)" == "win32" - asm_utils_win32_x86.obj -!ELSE - asm_utils.obj -!ENDIF - -!IFDEF DOXYGEN -DOXYGEN_DEP=doxygen -!ENDIF - -!IFDEF ENABLE_LIBWIRESHARK -all: compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors libwireshark.dll -!ELSE -all: compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors libwireshark.lib -!ENDIF - -# For use when making libwireshark.dll -libwireshark.lib: libwireshark.dll -libwireshark.exp: libwireshark.dll - -libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem\wmem.lib dissectors\dissectors.lib $(WSLUA_LIB) nghttp2\nghttp2.lib ..\image\libwireshark.res - @echo Linking libwireshark.dll - $(link) $(dlllflags) $(conlibsdll) shell32.lib psapi.lib \ - $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ - /OUT:libwireshark.dll \ - /IMPLIB:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ - $(libwireshark_LIBS) ..\image\libwireshark.res \ - ..\wsutil\ws_version_info.obj dissectors\register.obj \ - $(EXTRA_OBJECTS) - -libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem\wmem.lib $(WSLUA_LIB) nghttp2\nghttp2.lib dissectors\dissectors.lib - link /lib /out:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ - $(EXTRA_OBJECTS) - -..\config.h : ..\config.h.win32 ..\config.nmake - cd .. - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake config.h - cd epan - -clean-local: - rm -f $(LIBWIRESHARK_OBJECTS) $(EXTRA_OBJECTS) \ - libwireshark.lib libwireshark.dll *.manifest libwireshark.exp \ - *.nativecodeanalysis.xml *.pdb *.sbr doxygen.cfg html/*.* \ - exntest.obj exntest.exe exntest.exp reassemble_test.obj reassemble_test.exe tvbtest.obj tvbtest.exe tvbtest.exp oids_test.obj oids_test.exe oids_test.exp - if exist html rm -rf html - -clean: clean-local - cd compress - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../crypt - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../ftypes - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../dfilter - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../dissectors - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../wmem - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../wslua - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd ../nghttp2 - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd .. - -# -# We remove the Flex-generated files with "distclean" because they need -# 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 those scanners from the -# corresponding ".l" files with Flex. -# This might not be necessary for "dtd_grammar.{c,h}", but we handle them -# the same for now. -# -distclean-local: clean-local - rm -f config.h register.c mkstemp.c \ - $(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \ - $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \ - $(LIBWIRESHARK_GENERATED_C_FILES) \ - $(LIBWIRESHARK_GENERATED_HEADER_FILES) \ - dtd_grammar.out - -distclean: distclean-local - cd compress - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../crypt - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../ftypes - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../dfilter - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../dissectors - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../wmem - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../wslua - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd ../nghttp2 - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd .. - -maintainer-clean-local: distclean-local - -maintainer-clean: maintainer-clean-local - cd compress - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../crypt - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../ftypes - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../dfilter - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../dissectors - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../wmem - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../wslua - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd ../nghttp2 - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd .. - -crypt:: ..\config.h - cd crypt - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -compress:: ..\config.h - cd compress - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -ftypes:: ..\config.h - cd ftypes - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -dfilter:: ..\config.h - cd dfilter - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -dissectors:: ..\config.h - cd dissectors - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -wmem:: ..\config.h - cd wmem - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -wslua:: ..\config.h - cd wslua - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -nghttp2:: ..\config.h - cd nghttp2 - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -doxygen.cfg: ..\config.nmake doxygen.cfg.in - sed -e s/@VERSION@/$(VERSION)/ \ - < doxygen.cfg.in > $@ - -doxygen-run: -!IFDEF DOXYGEN - $(DOXYGEN) doxygen.cfg -!ENDIF - -doxygen: doxygen.cfg doxygen-run - -# Rules for making unit tests -exntest: exntest.exe -reassemble_test: reassemble_test.exe -tvbtest: tvbtest.exe -oids_test: oids_test.exe - -# Object files for exntest -EXNTEST_OBJ=exntest.obj except.obj - -exntest.exe: $(EXNTEST_OBJ) - @echo Linking $@ - $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ - $(GLIB_LIBS) $(EXNTEST_OBJ) -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 -!ENDIF - -# Object files for tvbtest -TVBTEST_OBJ=tvbtest.obj -TVBTEST_LIBS= ..\wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ - $(GLIB_LIBS) \ - ..\wsutil\libwsutil.lib \ - $(GNUTLS_LIBS) \ -!IFDEF ENABLE_LIBWIRESHARK - libwireshark.lib \ -!ELSE - dissectors\dissectors.lib \ - wireshark.lib \ - compress\lzxpress.lib \ - crypt\airpdcap.lib \ - dfilter\dfilter.lib \ - ftypes\ftypes.lib \ - $(C_ARES_LIBS) \ - $(ZLIB_LIBS) -!ENDIF - -tvbtest.exe: $(TVBTEST_OBJ) - @echo Linking $@ - $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ - $(TVBTEST_LIBS) $(GLIB_LIBS) $(ZLIB_LIBS) $(TVBTEST_OBJ) -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 -!ENDIF - -# Object files for oids_test -OIDS_TEST_OBJ=oids_test.obj -OIDS_TEST_LIBS= ..\wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ - $(GLIB_LIBS) \ - ..\wsutil\libwsutil.lib \ - $(GNUTLS_LIBS) \ -!IFDEF ENABLE_LIBWIRESHARK - libwireshark.lib \ -!ELSE - dissectors\dissectors.lib \ - wireshark.lib \ - compress\lzxpress.lib \ - crypt\airpdcap.lib \ - dfilter\dfilter.lib \ - ftypes\ftypes.lib \ - wmem\wmem.lib \ - $(C_ARES_LIBS) \ - $(ZLIB_LIBS) -!ENDIF - -oids_test.exe: $(OIDS_TEST_OBJ) - @echo Linking $@ - $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ - $(OIDS_TEST_LIBS) $(GLIB_LIBS) $(ZLIB_LIBS) $(OIDS_TEST_OBJ) -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 -!ENDIF - -# Object files for reassemble_test -REASSEMBLE_TEST_OBJ=reassemble_test.obj -REASSEMBLE_TEST_LIBS= ..\wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib \ - $(GLIB_LIBS) \ - ..\wsutil\libwsutil.lib \ - $(GNUTLS_LIBS) \ -!IFDEF ENABLE_LIBWIRESHARK - libwireshark.lib \ -!ELSE - dissectors\dissectors.lib \ - wireshark.lib \ - compress\lzxpress.lib \ - crypt\airpdcap.lib \ - dfilter\dfilter.lib \ - ftypes\ftypes.lib \ - $(C_ARES_LIBS) \ - $(ZLIB_LIBS) -!ENDIF - -reassemble_test.exe: $(REASSEMBLE_TEST_OBJ) - @echo Linking $@ - $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ - $(REASSEMBLE_TEST_LIBS) $(GLIB_LIBS) $(ZLIB_LIBS) $(REASSEMBLE_TEST_OBJ) -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 -!ENDIF - -exntest_install: exntest.exe - set copycmd=/y - xcopy exntest.exe ..\$(INSTALL_DIR) /d - -tvbtest_install: tvbtest.exe - set copycmd=/y - xcopy tvbtest.exe ..\$(INSTALL_DIR) /d - -oids_test_install: oids_test.exe - set copycmd=/y - xcopy oids_test.exe ..\$(INSTALL_DIR) /d - -reassemble_test_install: reassemble_test.exe - set copycmd=/y - xcopy reassemble_test.exe ..\$(INSTALL_DIR) /d - -test-programs: exntest_install tvbtest_install oids_test_install reassemble_test_install - cd wmem - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake test-programs - cd .. - -# -# Compile some time critical code from assembler if NASM available -# -!IFDEF NASM -asm_utils_win32_x86.obj: asm_utils_win32_x86.asm - $(NASM) -f $(WIRESHARK_TARGET_PLATFORM) -o $@ $? -!ENDIF - -update-sminmpec: - $(PERL) ../tools/make-sminmpec.pl - -RUNLEX=../tools/runlex.sh - -# -# We compile these specially because they're Flex-generated and thus -# "warnings are errors" will fail because there's a bunch of -# warnings we can't eliminate. -# -diam_dict_lex.h: diam_dict.c -diam_dict.obj : diam_dict.c - $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $? - -# -# This depends on dtd_grammar.h to force dtd_grammar.h to be -# built before we try to compile it, as dtd_parse.c includes -# dtd_grammar.h, and dtd_grammar.h is not distributed with -# the source (it's generated with Lemon). That means we can't -# use $?, as that would make it try to compile dtd_grammar.h. -# -dtd_parse_lex.h: dtd_parse.c -dtd_parse.obj : dtd_grammar.h -dtd_parse.obj : dtd_parse.c - $(CC) $(GENERATED_CFLAGS) -Fd.\ -c dtd_parse.c - -dtd_preparse_lex.h: dtd_preparse.c -dtd_preparse.obj : dtd_preparse.c - $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $? - -radius_dict_lex.h: radius_dict.c -radius_dict.obj : radius_dict.c - $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $? - -uat_load_lex.h: uat_load.c -uat_load.obj : uat_load.c - $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $? - -LEMON=..\tools\lemon - -dtd_grammar.h: dtd_grammar.c -dtd_grammar.c: $(LEMON)\lemon.exe $(LEMON)\lempar.c dtd_grammar.lemon - $(LEMON)\lemon T=$(LEMON)\lempar.c dtd_grammar.lemon - -# -# We compile these specially because they're test programs, not library -# routines, and thus they import stuff from the library rather than -# exporting stuff from the library. -# -exntest.obj: exntest.c - $(CC) $(TEST_CFLAGS) -Fd.\ -c $? - -reassemble_test.obj: reassemble_test.c - $(CC) $(TEST_CFLAGS) -Fd.\ -c $? - -tvbtest.obj: tvbtest.c - $(CC) $(TEST_CFLAGS) -Fd.\ -c $? - -oids_test.obj: oids_test.c - $(CC) $(TEST_CFLAGS) -Fd.\ -c $? - -ps.c: ..\tools\rdps.py print.ps - $(PYTHON) ..\tools\rdps.py print.ps ps.c - -checkapi: - $(PERL) ../tools/checkAPIs.pl -g termoutput -build $(LIBWIRESHARK_SRC) - -# -# 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: -# diff --git a/epan/compress/Makefile.am b/epan/compress/Makefile.am index f0d8b84e9e..6105061ca7 100644 --- a/epan/compress/Makefile.am +++ b/epan/compress/Makefile.am @@ -41,8 +41,7 @@ liblzxpress_la_SOURCES = \ $(LIBLZXPRESS_INCLUDES) EXTRA_DIST = \ - Makefile.common \ - Makefile.nmake + Makefile.common checkapi: $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ diff --git a/epan/compress/Makefile.nmake b/epan/compress/Makefile.nmake deleted file mode 100644 index b4af1f03f1..0000000000 --- a/epan/compress/Makefile.nmake +++ /dev/null @@ -1,29 +0,0 @@ -## Makefile for building lzxpress.lib with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake - -include ..\..\config.nmake -include Makefile.common - -############### no need to modify below this line ######### - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) -DWS_BUILD_DLL - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LZXPRESS_OBJECTS = $(LIBLZXPRESS_SRC:.c=.obj) - -lzxpress.lib: $(LZXPRESS_OBJECTS) - link /lib /out:lzxpress.lib $(LZXPRESS_OBJECTS) - -clean: - rm -f $(LZXPRESS_OBJECTS) lzxpress.lib *.nativecodeanalysis.xml *.pdb *.sbr - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ - $(LZXPRESS_OBJECTS) diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am index de2016ac76..60a8a2b291 100644 --- a/epan/crypt/Makefile.am +++ b/epan/crypt/Makefile.am @@ -43,7 +43,6 @@ libairpdcap_la_SOURCES = \ EXTRA_DIST = \ Custom.common \ Makefile.common \ - Makefile.nmake \ CMakeLists.txt \ CMakeListsCustom.txt.example diff --git a/epan/crypt/Makefile.nmake b/epan/crypt/Makefile.nmake deleted file mode 100644 index 8bd46e677a..0000000000 --- a/epan/crypt/Makefile.nmake +++ /dev/null @@ -1,30 +0,0 @@ -## Makefile for building airpdcap.lib with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# - -include ..\..\config.nmake -include Makefile.common - -############### no need to modify below this line ######### - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) -DWS_BUILD_DLL - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -AIRPDCAP_OBJECTS = $(LIBAIRPDCAP_SRC:.c=.obj) - -airpdcap.lib: $(AIRPDCAP_OBJECTS) - link /lib /out:airpdcap.lib $(AIRPDCAP_OBJECTS) - -clean: - rm -f $(AIRPDCAP_OBJECTS) airpdcap.lib *.nativecodeanalysis.xml *.pdb *.sbr - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ - $(LIBAIRPDCAP_SRC) diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index 050a9eedae..81703011f4 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -70,7 +70,6 @@ EXTRA_DIST = \ .editorconfig \ $(GENERATOR_FILES) \ Makefile.common \ - Makefile.nmake \ CMakeLists.txt scanner_lex.h : scanner.c diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake deleted file mode 100644 index 0dae21c1cc..0000000000 --- a/epan/dfilter/Makefile.nmake +++ /dev/null @@ -1,80 +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 - -LEMON=..\..\tools\lemon - -# We GENERATED_CFLAGS to get around flex's non-LLP64-compliant output -GENERATED_CFLAGS=\ - $(STANDARD_CFLAGS) \ - /I. /I.. /I..\.. $(GLIB_CFLAGS) \ - /I$(LEMON) \ - /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) \ - $(NODIST_GENERATED_C_FILES:.c=.obj) - -dfilter.lib : $(OBJECTS) - link /lib /out:dfilter.lib $(OBJECTS) - -$(OBJECTS): ..\..\config.h - -..\..\config.h: ..\..\config.h.win32 ..\..\config.nmake - cd ..\.. - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake config.h - cd epan\dfilter - -clean: - rm -f $(OBJECTS) dfilter.lib *.nativecodeanalysis.xml *.pdb *.sbr - -# -# We remove the generated files with "distclean" because one of them, -# "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 "scanner.c" from "scanner.l" with Flex. -# This might not be necessary for "grammar.{c,h}", but we handle them -# the same for now. -# -distclean: clean - rm -f $(GENERATED_C_FILES) \ - $(NODIST_GENERATED_C_FILES) \ - $(GENERATED_HEADER_FILES) \ - $(NODIST_GENERATED_HEADER_FILES) \ - grammar.out - -maintainer-clean: distclean - -RUNLEX=../../tools/runlex.sh - -scanner_lex.h : scanner.c -scanner.obj : scanner.c grammar.h - $(CC) $(GENERATED_CFLAGS) -Fd.\ -c scanner.c - -scanner.c: grammar.h - -grammar.h : grammar.c -grammar.c : $(LEMON)\lemon.exe $(LEMON)\lempar.c grammar.lemon - $(LEMON)\lemon.exe T=$(LEMON)\lempar.c grammar.lemon - -$(LEMON)\lemon.exe: - cd ../../tools - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake lemon - cd ../epan/dfilter - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ - $(NONGENERATED_C_FILES) diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am index 010e165135..bf14ad5824 100644 --- a/epan/dissectors/Makefile.am +++ b/epan/dissectors/Makefile.am @@ -51,7 +51,6 @@ EXTRA_DIST = \ .editorconfig \ Custom.common \ Makefile.common \ - Makefile.nmake \ packet-ncp2222.inc \ README.X11 \ x11-fields \ diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake deleted file mode 100644 index 75a9f1fcc9..0000000000 --- a/epan/dissectors/Makefile.nmake +++ /dev/null @@ -1,92 +0,0 @@ -## Makefile for building wireshark.exe with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# - -include ..\..\config.nmake - -############### no need to modify below this line ######### - -include Makefile.common - -CFLAGS= $(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I. /I.. /I../.. $(GLIB_CFLAGS) \ - $(ZLIB_CFLAGS) -DWS_BUILD_DLL\ - $(GNUTLS_CFLAGS) $(KFW_CFLAGS) \ - $(AIRPCAP_CFLAGS) $(GEOIP_CFLAGS) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -DISSECTOR_OBJECTS = \ - $(ALL_DISSECTORS_SRC:.c=.obj) - -DISSECTOR_SUPPORT_OBJECTS = \ - $(DISSECTOR_SUPPORT_SRC:.c=.obj) - -dissectors.lib: register.obj packet-ncp2222.c $(GENERATED_HEADER_FILES) ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) - @echo Linking dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) - link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) - -# -# Build register.c, which contains a function register_all_protocols() -# that calls the register routines for all protocols and a function -# register_all_protocol_handoffs() that calls the handoff registration -# routines for all protocols. -# -# We do this by scanning through sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines and -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# ALL_DISSECTORS_SRC is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "dissectors", to indicate that we should build -# a register.c file for libwireshark. -# All subsequent arguments are the files to scan. -# - -register.c: $(ALL_DISSECTORS_SRC) Makefile.common ..\..\tools\make-dissector-reg.py - @echo Making register.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . dissectors $(ALL_DISSECTORS_SRC) - -packet-ncp2222.c: ..\..\tools/ncp2222.py - @echo Making packet-ncp2222.c - $(PYTHON) "../../tools/ncp2222.py" -o packet-ncp2222.c - -packet-ncp2222.obj: packet-ncp2222.inc - -# Target to rebuild the X11 dissector header files. -# See README.X11 before using this--it requires the xcb and mesa source. -x11-dissector: ..\..\tools/process-x11-fields.pl x11-fields ..\..\tools/process-x11-xcb.pl - $(PERL) ../../tools/process-x11-fields.pl < x11-fields - $(PERL) ../../tools/process-x11-xcb.pl - -clean-local: - rm -f dissectors.lib *.nativecodeanalysis.xml *.pdb *.sbr register.c-tmp register-cache.pkl \ - $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) - -clean: clean-local - cd asn1 - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd .. - -distclean: clean - -maintainer-clean: distclean - rm -f $(GENERATED_FILES) - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(ALL_DISSECTORS_SRC) $(DISSECTOR_INCLUDES) $(DISSECTOR_SUPPORT_SRC) diff --git a/epan/dissectors/asn1/HI2Operations/Makefile.nmake b/epan/dissectors/asn1/HI2Operations/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/HI2Operations/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/Makefile.am b/epan/dissectors/asn1/Makefile.am index 5980360b56..8628cf6683 100644 --- a/epan/dissectors/asn1/Makefile.am +++ b/epan/dissectors/asn1/Makefile.am @@ -135,10 +135,7 @@ DIST_SUBDIRS = $(SUBDIRS) $(DONT_BUILD_SUBDIRS) EXTRA_DIST = \ CMakeLists.txt \ Makefile.inc \ - Makefile.nmake \ - Makefile.inc.nmake \ - Makefile.preinc \ - Makefile.preinc.nmake + Makefile.preinc MAINTAINERCLEANFILES = \ Makefile.in diff --git a/epan/dissectors/asn1/Makefile.inc.nmake b/epan/dissectors/asn1/Makefile.inc.nmake deleted file mode 100644 index f7a76bd093..0000000000 --- a/epan/dissectors/asn1/Makefile.inc.nmake +++ /dev/null @@ -1,74 +0,0 @@ -# To be included into the asn1 Makefiles for Windows builds -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -DISSECTOR=../../packet-$(PROTOCOL_NAME).c -# This header file need not exist/get generated. It is only used when cleaning. -DISSECTOR_HEADER=../../packet-$(PROTOCOL_NAME).h - -all: generate_export $(DISSECTOR) - -generate_export: $(EXPORT_FILES) - -!IFNDEF PROTO_OPT -PROTO_OPT = -p $(PROTOCOL_NAME) -!ENDIF - -$(DISSECTOR): ../../../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) - $(PYTHON) "../../../../tools/asn2wrs.py" \ - $(A2W_FLAGS) \ - $(PROTO_OPT) \ - -c ./$(PROTOCOL_NAME).cnf \ - -s ./packet-$(PROTOCOL_NAME)-template \ - -D . \ - -O ../.. \ - $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE) - -!IFDEF EXPORT_FILES -$(EXPORT_FILES): ../../../../tools/asn2wrs.py $(SRC_FILES) $(EXPORT_DEPENDS) - $(PYTHON) "../../../../tools/asn2wrs.py" \ - -E $(A2W_FLAGS) \ - $(PROTO_OPT) \ - -c ./$(PROTOCOL_NAME).cnf \ - -D . \ - $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE) -!ENDIF - -# Don't clean these up until/unless we start building them... -# $(DISSECTOR) \ -# $(DISSECTOR_HEADER) -clean: - rm -f parsetab.py \ - parsetab.pyc \ - *-exp.cnf \ - packet-*-{dis-tab,ettarr,ett,fn,hfarr,hf,table*,val}.[hc] - - -distclean: clean - -maintainer-clean: distclean - -# Fix EOL in generated dissectors. Cygwin's python generates files with -# mixed EOL styles, which can't be commited to the SVN repository. -# Stuff included from template and "cnf" files has "\r\n" on windows, while -# the generated stuff has "\n". - -fix_eol: $(DISSECTOR) - u2d $(DISSECTOR) $(DISSECTOR_HEADER) diff --git a/epan/dissectors/asn1/Makefile.nmake b/epan/dissectors/asn1/Makefile.nmake deleted file mode 100644 index 8e3a3952a3..0000000000 --- a/epan/dissectors/asn1/Makefile.nmake +++ /dev/null @@ -1,176 +0,0 @@ -## Makefile for building wireshark.exe with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -## (See 'Logic' below for additional details) -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -# Logic; -# 1. If this Makefile is invoked w/o a target: -# Do default target 'all' which invokes the Makefile.nmake -# in each individual ASN1 sub-directory using the value of ASN1_MAKE_TARGET -# as the make target. -# (If ASN1_MAKE_TARGET is not defined then default to "all" -# which generates the individual ASN1 dissector files into -# epan\dissectors). -# -# 2. If this Makefile is invoked with one of the following targets, then do the action for the target: -# Reinvoke this Makefile with 'all' as target and with ASN1_MAKE_TARGET -# defined as appropriate. -# clean -# copy_files : generate the dissectors into epan\dissectors -# : (This is, in effect, the same as invoking this makefile w/o a target). - -include Custom.make - -BER_LIST= \ - acp133 \ - acse \ - ansi_map \ - ansi_tcap \ - atn-cm \ - atn-cpdlc \ - atn-ulcs \ - c1222 \ - camel \ - cdt \ - charging_ase \ - cmip \ - cmp \ - crmf \ - cms \ - credssp \ - dap \ - dop \ - disp \ - dsp \ - ess \ - ftam \ - goose \ - gsm_map \ - gprscdr \ - h248 \ - HI2Operations \ - idmp \ - inap \ - isdn-sup \ - kerberos \ - ldap \ - logotypecertextn \ - mms \ - ns_cert_exts \ - novell_pkis \ - ocsp \ - p1 \ - p22 \ - p7 \ - p772 \ - pkcs1 \ - pkcs12 \ - pkinit \ - pkixac \ - pkix1explicit \ - pkix1implicit \ - pkixproxy \ - pkixqualified \ - pkixtsp \ - pres \ - q932 \ - q932-ros \ - qsig \ - ros \ - rtse \ - smrse \ - snmp \ - spnego \ - sv \ - t125 \ - tcap \ - wlancertextn \ - x509af \ - x509ce \ - x509if \ - x509sat \ - $(CUSTOM_BER_LIST) - -PER_LIST= \ - h225 \ - h235 \ - h245 \ - h282 \ - h283 \ - h323 \ - h450 \ - h450-ros \ - h460 \ - h501 \ - hnbap \ - ilp \ - lcsap \ - lpp \ - lppa \ - lppe \ - lte-rrc \ - nbap \ - m3ap \ - mpeg-audio \ - mpeg-pes \ - pcap \ - ranap \ - rnsap \ - rrc \ - rrlp \ - rua \ - s1ap \ - sabp \ - sbc-ap \ - t124 \ - t38 \ - tetra \ - ulp \ - x2ap \ -### x721 - $(CUSTOM_PER_LIST) - -!IFNDEF ASN1_MAKE_TARGET -ASN1_MAKE_TARGET=all -!ENDIF - -all: ber per - -ber: $(BER_LIST) - -per: $(PER_LIST) - -$(BER_LIST) $(PER_LIST) : _FORCE_ # _FORCE_ req'd since each target actually exists - cd $@ - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(ASN1_MAKE_TARGET) - cd .. - -# When this Makefile is invoked with an explicit target then -# this Makefile is re-invoked with 'all' as target and with -# ASN1_MAKE_TARGET defined as to the action needed. -# copy_files is a bit of a misnomer now, but we need another -# (non-"all") target... - -clean copy_files : - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake all ASN1_MAKE_TARGET=$@ - -#### -_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory diff --git a/epan/dissectors/asn1/Makefile.preinc b/epan/dissectors/asn1/Makefile.preinc index de372ba9aa..8bd5481e61 100644 --- a/epan/dissectors/asn1/Makefile.preinc +++ b/epan/dissectors/asn1/Makefile.preinc @@ -21,5 +21,4 @@ MAKE_CNF_EXPORT = $(MAKE) generate_export EXTRA_DIST_COMMON = \ - CMakeLists.txt \ - Makefile.nmake + CMakeLists.txt diff --git a/epan/dissectors/asn1/Makefile.preinc.nmake b/epan/dissectors/asn1/Makefile.preinc.nmake deleted file mode 100644 index 31720eb40d..0000000000 --- a/epan/dissectors/asn1/Makefile.preinc.nmake +++ /dev/null @@ -1,25 +0,0 @@ -# To be included into the asn1 Makefiles for Windows builds -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -MAKE_CNF_EXPORT = $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake generate_export - -# An automake variable used in several Makefile.common's -builddir=. diff --git a/epan/dissectors/asn1/acp133/Makefile.nmake b/epan/dissectors/asn1/acp133/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/acp133/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/acse/Makefile.nmake b/epan/dissectors/asn1/acse/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/acse/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/ansi_map/Makefile.nmake b/epan/dissectors/asn1/ansi_map/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/ansi_map/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/ansi_tcap/Makefile.nmake b/epan/dissectors/asn1/ansi_tcap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/ansi_tcap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/atn-cm/Makefile.nmake b/epan/dissectors/asn1/atn-cm/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/atn-cm/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/atn-cpdlc/Makefile.nmake b/epan/dissectors/asn1/atn-cpdlc/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/atn-cpdlc/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/atn-ulcs/Makefile.nmake b/epan/dissectors/asn1/atn-ulcs/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/atn-ulcs/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/c1222/Makefile.nmake b/epan/dissectors/asn1/c1222/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/c1222/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/camel/Makefile.nmake b/epan/dissectors/asn1/camel/Makefile.nmake deleted file mode 100644 index d1c6fb064a..0000000000 --- a/epan/dissectors/asn1/camel/Makefile.nmake +++ /dev/null @@ -1,30 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -build \ - $(PROTOCOL_NAME).cnf \ - packet-$(PROTOCOL_NAME)-template.c diff --git a/epan/dissectors/asn1/cdt/Makefile.nmake b/epan/dissectors/asn1/cdt/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/cdt/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/charging_ase/Makefile.nmake b/epan/dissectors/asn1/charging_ase/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/charging_ase/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/cmip/Makefile.nmake b/epan/dissectors/asn1/cmip/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/cmip/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/cmp/Makefile.nmake b/epan/dissectors/asn1/cmp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/cmp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/cms/Makefile.nmake b/epan/dissectors/asn1/cms/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/cms/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/credssp/Makefile.nmake b/epan/dissectors/asn1/credssp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/credssp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/crmf/Makefile.nmake b/epan/dissectors/asn1/crmf/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/crmf/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/dap/Makefile.nmake b/epan/dissectors/asn1/dap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/dap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/disp/Makefile.nmake b/epan/dissectors/asn1/disp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/disp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/dop/Makefile.nmake b/epan/dissectors/asn1/dop/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/dop/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/dsp/Makefile.nmake b/epan/dissectors/asn1/dsp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/dsp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/ess/Makefile.nmake b/epan/dissectors/asn1/ess/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/ess/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/ftam/Makefile.nmake b/epan/dissectors/asn1/ftam/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/ftam/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/goose/Makefile.nmake b/epan/dissectors/asn1/goose/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/goose/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/gprscdr/Makefile.nmake b/epan/dissectors/asn1/gprscdr/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/gprscdr/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/gsm_map/Makefile.nmake b/epan/dissectors/asn1/gsm_map/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/gsm_map/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/h225/Makefile.nmake b/epan/dissectors/asn1/h225/Makefile.nmake deleted file mode 100644 index d1c6fb064a..0000000000 --- a/epan/dissectors/asn1/h225/Makefile.nmake +++ /dev/null @@ -1,30 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -build \ - $(PROTOCOL_NAME).cnf \ - packet-$(PROTOCOL_NAME)-template.c diff --git a/epan/dissectors/asn1/h235/Makefile.nmake b/epan/dissectors/asn1/h235/Makefile.nmake deleted file mode 100644 index d1c6fb064a..0000000000 --- a/epan/dissectors/asn1/h235/Makefile.nmake +++ /dev/null @@ -1,30 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -build \ - $(PROTOCOL_NAME).cnf \ - packet-$(PROTOCOL_NAME)-template.c diff --git a/epan/dissectors/asn1/h245/Makefile.nmake b/epan/dissectors/asn1/h245/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/h245/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/h248/Makefile.nmake b/epan/dissectors/asn1/h248/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/h248/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/h282/Makefile.nmake b/epan/dissectors/asn1/h282/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/h282/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/h283/Makefile.nmake b/epan/dissectors/asn1/h283/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/h283/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/h323/Makefile.nmake b/epan/dissectors/asn1/h323/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/h323/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/h450-ros/Makefile.nmake b/epan/dissectors/asn1/h450-ros/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/h450-ros/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/h450/Makefile.nmake b/epan/dissectors/asn1/h450/Makefile.nmake deleted file mode 100644 index d1c6fb064a..0000000000 --- a/epan/dissectors/asn1/h450/Makefile.nmake +++ /dev/null @@ -1,30 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -build \ - $(PROTOCOL_NAME).cnf \ - packet-$(PROTOCOL_NAME)-template.c diff --git a/epan/dissectors/asn1/h460/Makefile.nmake b/epan/dissectors/asn1/h460/Makefile.nmake deleted file mode 100644 index 89e6811e7d..0000000000 --- a/epan/dissectors/asn1/h460/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/h501/Makefile.nmake b/epan/dissectors/asn1/h501/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/h501/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/hnbap/Makefile.nmake b/epan/dissectors/asn1/hnbap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/hnbap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/idmp/Makefile.nmake b/epan/dissectors/asn1/idmp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/idmp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/ilp/Makefile.nmake b/epan/dissectors/asn1/ilp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/ilp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/inap/Makefile.nmake b/epan/dissectors/asn1/inap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/inap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/isdn-sup/Makefile.nmake b/epan/dissectors/asn1/isdn-sup/Makefile.nmake deleted file mode 100644 index d1c6fb064a..0000000000 --- a/epan/dissectors/asn1/isdn-sup/Makefile.nmake +++ /dev/null @@ -1,30 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -build \ - $(PROTOCOL_NAME).cnf \ - packet-$(PROTOCOL_NAME)-template.c diff --git a/epan/dissectors/asn1/kerberos/Makefile.nmake b/epan/dissectors/asn1/kerberos/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/kerberos/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/lcsap/Makefile.nmake b/epan/dissectors/asn1/lcsap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/lcsap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/ldap/Makefile.nmake b/epan/dissectors/asn1/ldap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/ldap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/logotypecertextn/Makefile.nmake b/epan/dissectors/asn1/logotypecertextn/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/logotypecertextn/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/lpp/Makefile.nmake b/epan/dissectors/asn1/lpp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/lpp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/lppa/Makefile.nmake b/epan/dissectors/asn1/lppa/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/lppa/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/lppe/Makefile.nmake b/epan/dissectors/asn1/lppe/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/lppe/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/lte-rrc/Makefile.nmake b/epan/dissectors/asn1/lte-rrc/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/lte-rrc/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/m3ap/Makefile.nmake b/epan/dissectors/asn1/m3ap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/m3ap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/mms/Makefile.nmake b/epan/dissectors/asn1/mms/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/mms/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/mpeg-audio/Makefile.nmake b/epan/dissectors/asn1/mpeg-audio/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/mpeg-audio/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/mpeg-pes/Makefile.nmake b/epan/dissectors/asn1/mpeg-pes/Makefile.nmake deleted file mode 100644 index d1c6fb064a..0000000000 --- a/epan/dissectors/asn1/mpeg-pes/Makefile.nmake +++ /dev/null @@ -1,30 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -build \ - $(PROTOCOL_NAME).cnf \ - packet-$(PROTOCOL_NAME)-template.c diff --git a/epan/dissectors/asn1/nbap/Makefile.nmake b/epan/dissectors/asn1/nbap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/nbap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/novell_pkis/Makefile.nmake b/epan/dissectors/asn1/novell_pkis/Makefile.nmake deleted file mode 100644 index 4480307364..0000000000 --- a/epan/dissectors/asn1/novell_pkis/Makefile.nmake +++ /dev/null @@ -1,24 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/ns_cert_exts/Makefile.nmake b/epan/dissectors/asn1/ns_cert_exts/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/ns_cert_exts/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/ocsp/Makefile.nmake b/epan/dissectors/asn1/ocsp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/ocsp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/p1/Makefile.nmake b/epan/dissectors/asn1/p1/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/p1/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/p22/Makefile.nmake b/epan/dissectors/asn1/p22/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/p22/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/p7/Makefile.nmake b/epan/dissectors/asn1/p7/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/p7/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/p772/Makefile.nmake b/epan/dissectors/asn1/p772/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/p772/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/pcap/Makefile.nmake b/epan/dissectors/asn1/pcap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/pcap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/pkcs1/Makefile.nmake b/epan/dissectors/asn1/pkcs1/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/pkcs1/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/pkcs12/Makefile.nmake b/epan/dissectors/asn1/pkcs12/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/pkcs12/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/pkinit/Makefile.nmake b/epan/dissectors/asn1/pkinit/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/pkinit/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/pkix1explicit/Makefile.nmake b/epan/dissectors/asn1/pkix1explicit/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/pkix1explicit/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/pkix1implicit/Makefile.nmake b/epan/dissectors/asn1/pkix1implicit/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/pkix1implicit/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/pkixac/Makefile.nmake b/epan/dissectors/asn1/pkixac/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/pkixac/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/pkixproxy/Makefile.nmake b/epan/dissectors/asn1/pkixproxy/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/pkixproxy/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/pkixqualified/Makefile.nmake b/epan/dissectors/asn1/pkixqualified/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/pkixqualified/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/pkixtsp/Makefile.nmake b/epan/dissectors/asn1/pkixtsp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/pkixtsp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/pres/Makefile.nmake b/epan/dissectors/asn1/pres/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/pres/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/q932-ros/Makefile.nmake b/epan/dissectors/asn1/q932-ros/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/q932-ros/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/q932/Makefile.nmake b/epan/dissectors/asn1/q932/Makefile.nmake deleted file mode 100644 index d1c6fb064a..0000000000 --- a/epan/dissectors/asn1/q932/Makefile.nmake +++ /dev/null @@ -1,30 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -build \ - $(PROTOCOL_NAME).cnf \ - packet-$(PROTOCOL_NAME)-template.c diff --git a/epan/dissectors/asn1/qsig/Makefile.nmake b/epan/dissectors/asn1/qsig/Makefile.nmake deleted file mode 100644 index d1c6fb064a..0000000000 --- a/epan/dissectors/asn1/qsig/Makefile.nmake +++ /dev/null @@ -1,30 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -build \ - $(PROTOCOL_NAME).cnf \ - packet-$(PROTOCOL_NAME)-template.c diff --git a/epan/dissectors/asn1/ranap/Makefile.nmake b/epan/dissectors/asn1/ranap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/ranap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/rnsap/Makefile.nmake b/epan/dissectors/asn1/rnsap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/rnsap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/ros/Makefile.nmake b/epan/dissectors/asn1/ros/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/ros/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/rrc/Makefile.nmake b/epan/dissectors/asn1/rrc/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/rrc/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/rrlp/Makefile.nmake b/epan/dissectors/asn1/rrlp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/rrlp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/rtse/Makefile.nmake b/epan/dissectors/asn1/rtse/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/rtse/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/rua/Makefile.nmake b/epan/dissectors/asn1/rua/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/rua/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/s1ap/Makefile.nmake b/epan/dissectors/asn1/s1ap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/s1ap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/sabp/Makefile.nmake b/epan/dissectors/asn1/sabp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/sabp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/sbc-ap/Makefile.nmake b/epan/dissectors/asn1/sbc-ap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/sbc-ap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/smrse/Makefile.nmake b/epan/dissectors/asn1/smrse/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/smrse/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/snmp/Makefile.nmake b/epan/dissectors/asn1/snmp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/snmp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/spnego/Makefile.nmake b/epan/dissectors/asn1/spnego/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/spnego/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/sv/Makefile.nmake b/epan/dissectors/asn1/sv/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/sv/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/t124/Makefile.nmake b/epan/dissectors/asn1/t124/Makefile.nmake deleted file mode 100644 index bc74eda685..0000000000 --- a/epan/dissectors/asn1/t124/Makefile.nmake +++ /dev/null @@ -1,28 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake - -MCS-PROTOCOL.asn: ../t125/MCS-PROTOCOL.asn - cp $** $@ diff --git a/epan/dissectors/asn1/t125/Makefile.nmake b/epan/dissectors/asn1/t125/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/t125/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/t38/Makefile.nmake b/epan/dissectors/asn1/t38/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/t38/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/tcap/Makefile.nmake b/epan/dissectors/asn1/tcap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/tcap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/tetra/Makefile.nmake b/epan/dissectors/asn1/tetra/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/tetra/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/ulp/Makefile.nmake b/epan/dissectors/asn1/ulp/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/ulp/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/wlancertextn/Makefile.nmake b/epan/dissectors/asn1/wlancertextn/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/wlancertextn/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/x2ap/Makefile.nmake b/epan/dissectors/asn1/x2ap/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/x2ap/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/x509af/Makefile.nmake b/epan/dissectors/asn1/x509af/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/x509af/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/x509ce/Makefile.nmake b/epan/dissectors/asn1/x509ce/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/x509ce/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/x509if/Makefile.nmake b/epan/dissectors/asn1/x509if/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/x509if/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/x509sat/Makefile.nmake b/epan/dissectors/asn1/x509sat/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/x509sat/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/dissectors/asn1/x721/Makefile.nmake b/epan/dissectors/asn1/x721/Makefile.nmake deleted file mode 100644 index 966d190619..0000000000 --- a/epan/dissectors/asn1/x721/Makefile.nmake +++ /dev/null @@ -1,25 +0,0 @@ -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -include ../../../../config.nmake -include ../Makefile.preinc.nmake -include Makefile.common -include ../Makefile.inc.nmake diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am index a10d1b2c90..659865cc44 100644 --- a/epan/ftypes/Makefile.am +++ b/epan/ftypes/Makefile.am @@ -39,7 +39,6 @@ libftypes_la_SOURCES = $(NONGENERATED_C_FILES) $(NONGENERATED_HEADER_FILES) EXTRA_DIST = \ .editorconfig \ Makefile.common \ - Makefile.nmake \ CMakeLists.txt checkapi: diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake deleted file mode 100644 index 1acff2ef92..0000000000 --- a/epan/ftypes/Makefile.nmake +++ /dev/null @@ -1,32 +0,0 @@ -## Makefile for building wireshark.exe with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# - -include ..\..\config.nmake - -include Makefile.common - -############### no need to modify below this line ######### - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I. /I.. /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include -DWS_BUILD_DLL - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) - -ftypes.lib : $(OBJECTS) - link /lib /out:ftypes.lib $(OBJECTS) - -clean: - rm -f $(OBJECTS) ftypes.lib *.nativecodeanalysis.xml *.pdb *.sbr - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ - $(NONGENERATED_C_FILES) diff --git a/epan/nghttp2/Makefile.am b/epan/nghttp2/Makefile.am index cb82795f97..0845718d99 100644 --- a/epan/nghttp2/Makefile.am +++ b/epan/nghttp2/Makefile.am @@ -44,7 +44,6 @@ libnghttp2_la_SOURCES = \ EXTRA_DIST = \ .editorconfig \ Makefile.common \ - Makefile.nmake \ README.nghttp2 \ CMakeLists.txt diff --git a/epan/nghttp2/Makefile.nmake b/epan/nghttp2/Makefile.nmake deleted file mode 100644 index 140f8c2285..0000000000 --- a/epan/nghttp2/Makefile.nmake +++ /dev/null @@ -1,44 +0,0 @@ -## Makefile for building nghttp2.lib with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# - -include ..\..\config.nmake - -include Makefile.common - -############### no need to modify below this line ######### - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I. /Inghttp2 /I../.. $(GLIB_CFLAGS) -DWS_BUILD_DLL - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -OBJECTS = $(LIBNGHTTP2_SRC:.c=.obj) - -nghttp2.lib: $(OBJECTS) - link /lib /out:nghttp2.lib $(OBJECTS) - -clean: - rm -f $(OBJECTS) nghttp2.lib *.nativecodeanalysis.xml *.pdb *.sbr - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ - $(LIBNGHTTP2_SRC) - -# -# 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: -# diff --git a/epan/wmem/Makefile.am b/epan/wmem/Makefile.am index 6d001fb865..99f519af83 100644 --- a/epan/wmem/Makefile.am +++ b/epan/wmem/Makefile.am @@ -51,7 +51,6 @@ libwmem_la_SOURCES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ CMakeLists.txt checkapi: diff --git a/epan/wmem/Makefile.nmake b/epan/wmem/Makefile.nmake deleted file mode 100644 index 1378be6860..0000000000 --- a/epan/wmem/Makefile.nmake +++ /dev/null @@ -1,61 +0,0 @@ -## Makefile for building wmem.lib with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# - -include ..\..\config.nmake -include Makefile.common - -############### no need to modify below this line ######### - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) -DWS_BUILD_DLL - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -WMEM_OBJECTS = $(LIBWMEM_SRC:.c=.obj) - -wmem.lib: $(WMEM_OBJECTS) - link /lib /out:wmem.lib $(WMEM_OBJECTS) - -clean: - rm -f $(WMEM_OBJECTS) wmem.lib *.nativecodeanalysis.xml *.pdb *.sbr wmem_test.obj wmem_test.exe wmem_test.exp - -distclean: clean - -maintainer-clean: distclean - -# Rule for making unit tests -wmem_test: wmem_test.exe - -# Object files for wmem_test -WMEM_TEST_OBJ=wmem_test.obj -WMEM_TEST_LIBS= wmem.lib - -wmem_test.exe: $(WMEM_TEST_OBJ) $(WMEM_TEST_LIBS) - @echo Linking $@ - link /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ - $(WMEM_TEST_LIBS) $(GLIB_LIBS) $(WMEM_TEST_OBJ) - -wmem_test_install: wmem_test.exe - set copycmd=/y - xcopy wmem_test.exe ..\..\$(INSTALL_DIR) /d - -test-programs: wmem_test_install - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ - $(WMEM_SRC) - -# -# 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: -# diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am index f003269045..e5b730c7a5 100644 --- a/epan/wslua/Makefile.am +++ b/epan/wslua/Makefile.am @@ -109,7 +109,6 @@ EXTRA_DIST = \ template-init.lua \ make-init-lua.pl \ make-taps.pl \ - Makefile.nmake \ CMakeLists.txt taps_used = \ diff --git a/epan/wslua/Makefile.nmake b/epan/wslua/Makefile.nmake deleted file mode 100644 index 9ad3ac5c88..0000000000 --- a/epan/wslua/Makefile.nmake +++ /dev/null @@ -1,130 +0,0 @@ -# - -include ..\..\config.nmake - -############### no need to modify below this line ######### - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I. /I.. /I../.. $(GLIB_CFLAGS) \ - $(LUA_CFLAGS) -DWS_BUILD_DLL\ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -MODULES = \ - lrexlib.c \ - lrexlib_glib.c \ - lrexlib_glib_f.c \ - lua_bitop.c \ - wslua_address.c \ - wslua_byte_array.c \ - wslua_capture_info.c \ - wslua_column.c \ - wslua_dir.c \ - wslua_dissector.c \ - wslua_dumper.c \ - wslua_field.c \ - wslua_file.c \ - wslua_file_common.c \ - wslua_file_handler.c \ - wslua_frame_info.c \ - wslua_gui.c \ - wslua_int64.c \ - wslua_internals.c \ - wslua_listener.c \ - wslua_nstime.c \ - wslua_pinfo.c \ - wslua_pref.c \ - wslua_proto.c \ - wslua_proto_expert.c \ - wslua_proto_field.c \ - wslua_struct.c \ - wslua_tree.c \ - wslua_tvb.c \ - wslua_util.c - -OBJECTS= \ - init_wslua.obj \ - register_wslua.obj \ - taps_wslua.obj \ - lrexlib.obj \ - lrexlib_glib.obj \ - lrexlib_glib_f.obj \ - lua_bitop.obj \ - wslua_address.obj \ - wslua_byte_array.obj \ - wslua_capture_info.obj \ - wslua_column.obj \ - wslua_dir.obj \ - wslua_dissector.obj \ - wslua_dumper.obj \ - wslua_field.obj \ - wslua_file.obj \ - wslua_file_common.obj \ - wslua_file_handler.obj \ - wslua_frame_info.obj \ - wslua_gui.obj \ - wslua_int64.obj \ - wslua_internals.obj \ - wslua_listener.obj \ - wslua_nstime.obj \ - wslua_pinfo.obj \ - wslua_pref.obj \ - wslua_proto.obj \ - wslua_proto_expert.obj \ - wslua_proto_field.obj \ - wslua_struct.obj \ - wslua_tree.obj \ - wslua_tvb.obj \ - wslua_util.obj - -wslua.lib : $(OBJECTS) init.lua - link /lib /NODEFAULTLIB /out:wslua.lib $(OBJECTS) - -clean: - rm -f $(OBJECTS) wslua.lib init.lua taps_wslua.c declare_wslua.h register_wslua.c taps.txt \ - *.nativecodeanalysis.xml *.pdb *.sbr - -init_wslua.c: declare_wslua.h - -distclean: clean - -maintainer-clean: distclean - -TAPS_USED = \ - ../dissectors/packet-http.h \ - ../dissectors/packet-ip.h \ - ../dissectors/packet-udp.h \ - ../dissectors/packet-h225.h - -taps: $(TAPS_USED) - touch taps - -taps_wslua.c: make-taps.pl taps - $(PERL) make-taps.pl taps taps_wslua.c taps.txt . - -taps.txt: taps_wslua.c - -register_wslua.c: declare_wslua.h - -wslua.h: declare_wslua.h - -declare_wslua.h: make-reg.pl $(MODULES) - $(PERL) make-reg.pl $(MODULES) - -doc: $(MODULES) - $(PERL) make-doc.pl $(MODULES) - -dummy: - touch dummy - -init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h ../proto.h - $(PERL) make-init-lua.pl "../.." template-init.lua > init.lua - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ - $(MODULES) \ - init_wslua.c \ - register_wslua.c \ - taps_wslua.c diff --git a/extcap/Makefile.nmake b/extcap/Makefile.nmake deleted file mode 100644 index 0641e1e060..0000000000 --- a/extcap/Makefile.nmake +++ /dev/null @@ -1,165 +0,0 @@ -## Makefile for building wireshark.exe with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# -# We "Deploy using XCopy," which is described at -# http://msdn.microsoft.com/en-us/library/ms235291.aspx - -include ..\config.nmake -include ..\Makefile.nmake.inc - -############### no need to modify below this line ######### - -CC = cl -LINK= link - -LDFLAGS = /NOLOGO /INCREMENTAL:NO $(LOCAL_LDFLAGS) - -# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output -GENERATED_CFLAGS=\ - $(STANDARD_CFLAGS) \ - /I. /I.. $(GLIB_CFLAGS) \ - $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ - $(C_ARES_CFLAGS) $(GNUTLS_CFLAGS) \ - $(SMI_CFLAGS) $(GEOIP_CFLAGS) $(LIBSSH_CFLAGS) $(WINSPARKLE_CFLAGS) - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -include Makefile.common - -androiddump_OBJECTS = $(androiddump_SOURCES:.c=.obj) - -anddroiddump_WSLIBS = \ - ..\wiretap\wiretap-$(WTAP_VERSION).lib \ - ..\wsutil\libwsutil.lib - -androiddump_LIBS = $(anddroiddump_WSLIBS) \ - wsock32.lib user32.lib \ - $(GLIB_LIBS) - -randpktdump_OBJECTS = $(randpktdump_SOURCES:.c=.obj) - -randpktdump_WSLIBS = \ - ..\randpkt_core\librandpkt_core.lib \ - ..\wiretap\wiretap-$(WTAP_VERSION).lib \ - ..\wsutil\libwsutil.lib - -randpktdump_LIBS = $(randpktdump_WSLIBS) \ - wsock32.lib user32.lib \ - $(GLIB_LIBS) - -sshdump_OBJECTS = $(sshdump_SOURCES:.c=.obj) - -sshdump_WSLIBS = \ - ..\wiretap\wiretap-$(WTAP_VERSION).lib \ - ..\wsutil\libwsutil.lib - -sshdump_LIBS = $(sshdump_WSLIBS) \ - wsock32.lib user32.lib \ - $(LIBSSH_LIBS) \ - $(GLIB_LIBS) - -ciscodump_OBJECTS = $(ciscodump_SOURCES:.c=.obj) - -ciscodump_WSLIBS = \ - ..\wiretap\wiretap-$(WTAP_VERSION).lib \ - ..\writecap\libwritecap.lib \ - ..\wsutil\libwsutil.lib - -ciscodump_LIBS = $(ciscodump_WSLIBS) \ - wsock32.lib user32.lib \ - $(LIBSSH_LIBS) \ - $(GLIB_LIBS) - -EXECUTABLES=androiddump.exe randpktdump.exe - -!IFDEF LIBSSH_DIR -EXECUTABLES = $(EXECUTABLES) sshdump.exe ciscodump.exe -!ENDIF - -all: $(EXECUTABLES) - -androiddump.exe : $(LIBS_CHECK) ..\config.h androiddump.obj extcap-base.obj $(anddroiddump_WSLIBS) - @echo Linking $@ - $(LINK) @<< - /OUT:androiddump.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:WINDOWS androiddump.obj extcap-base.obj $(androiddump_LIBS) -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "androiddump.exe.manifest" -outputresource:androiddump.exe;1 -!ENDIF - -randpktdump.exe : $(LIBS_CHECK) ..\config.h randpktdump.obj extcap-base.obj $(randpktdump_WSLIBS) - @echo Linking $@ - $(LINK) @<< - /OUT:randpktdump.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:WINDOWS randpktdump.obj extcap-base.obj $(randpktdump_LIBS) -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "randpktdump.exe.manifest" -outputresource:randpktdump.exe;1 -!ENDIF - -!IFDEF LIBSSH_DIR -sshdump.exe : $(LIBS_CHECK) ..\config.h sshdump.obj extcap-base.obj ssh-base.obj $(sshdump_WSLIBS) - @echo Linking $@ - $(LINK) @<< - /OUT:sshdump.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:WINDOWS sshdump.obj extcap-base.obj ssh-base.obj $(sshdump_LIBS) -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "sshdump.exe.manifest" -outputresource:sshdump.exe;1 -!ENDIF -ciscodump.exe : $(LIBS_CHECK) ..\config.h ciscodump.obj extcap-base.obj ssh-base.obj $(ciscodump_WSLIBS) - @echo Linking $@ - $(LINK) @<< - /OUT:ciscodump.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:WINDOWS ciscodump.obj extcap-base.obj ssh-base.obj $(ciscodump_LIBS) -<< -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "ciscodump.exe.manifest" -outputresource:ciscodump.exe;1 -!ENDIF -!ENDIF - -clean: - rm -f $(androiddump_OBJECTS) $(randpktdump_OBJECTS) $(sshdump_OBJECTS) \ - $(ciscodump_OBJECTS) $(EXECUTABLES) *.nativecodeanalysis.xml *.pdb *.sbr \ - doxygen.cfg *.exe.manifest - -# "distclean" removes all files not part of the distribution. -# It does not remove generated files that are part of the distribution. -distclean: clean - rm -f $(BUILT_SOURCES) - -# Make "maintainer-clean" only if you would like to remove ALL generated -# files. -# Be sure to have python and perl installed to regenerate them. -maintainer-clean: distclean - -# 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 \ - $(androiddump_SOURCES) $(randpktdump_SOURCES) $(sshdump_SOURCES) $(ciscodump_SOURCES) - -checkapi-todo: - $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ - $(androiddump_SOURCES) $(randpktdump_SOURCES) $(sshdump_SOURCES) $(ciscodump_SOURCES) diff --git a/help/Makefile.am b/help/Makefile.am index ec4da12989..a32220ada7 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -34,7 +34,6 @@ help_DATA = \ EXTRA_DIST = \ $(help_DATA) \ - Makefile.nmake \ $(srcdir)/faq.py \ faq.txt diff --git a/help/Makefile.nmake b/help/Makefile.nmake deleted file mode 100644 index b8f75540f8..0000000000 --- a/help/Makefile.nmake +++ /dev/null @@ -1,21 +0,0 @@ -## Makefile for building wireshark.exe with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# - -TOOLS_DIR=..\tools -include ..\config.nmake - -############### no need to modify below this line ######### - -all: faq.txt - -faq.txt: faq.py - $(PYTHON) faq.py -b | $(PYTHON) $(TOOLS_DIR)\html2text.py > $@ - -clean: - rm -rf faq.txt - -distclean: clean - -maintainer-clean: distclean - diff --git a/image/Makefile.nmake b/image/Makefile.nmake deleted file mode 100644 index 2e9a99de86..0000000000 --- a/image/Makefile.nmake +++ /dev/null @@ -1,109 +0,0 @@ -# - -include ..\config.nmake - -# Nmake uses an implicit rule to build a .res from a .rc file! - -ALL_RC=wireshark.rc libwireshark.rc tshark.rc tfshark.rc rawshark.rc capinfos.rc captype.rc editcap.rc text2pcap.rc mergecap.rc reordercap.rc wiretap.rc dumpcap.rc libwscodecs.rc libwsutil.rc wireshark.exe.manifest -all : $(ALL_RC) - -# wireshark.exe.manifest and wireshark.rc are used for both Qt and GTK+ executables. -wireshark.exe.manifest: wireshark.exe.manifest.in ..\config.nmake - sed -e s/@VERSION_MAJOR@/$(VERSION_MAJOR)/ \ - -e s/@VERSION_MINOR@/$(VERSION_MINOR)/ \ - -e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \ - -e s/@PROCESSOR_ARCHITECTURE@/$(PROCESSOR_ARCHITECTURE)/ \ - < wireshark.exe.manifest.in > $@ - -wireshark.rc : file_dlg_win32.rc wireshark.rc.in wireshark.exe.manifest ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@ICON_PATH@// \ - < wireshark.rc.in > $@ - -libwireshark.rc: libwireshark.rc.in ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - < libwireshark.rc.in > $@ - -tshark.rc : tshark.rc.in wireshark.exe.manifest ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@ICON_PATH@// \ - < tshark.rc.in > $@ - -tfshark.rc : tfshark.rc.in wireshark.exe.manifest ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@ICON_PATH@// \ - < tfshark.rc.in > $@ - -rawshark.rc : rawshark.rc.in wireshark.exe.manifest ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@ICON_PATH@// \ - < rawshark.rc.in > $@ - -capinfos.rc : capinfos.rc.in ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@ICON_PATH@// \ - < capinfos.rc.in > $@ - -captype.rc : captype.rc.in ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@ICON_PATH@// \ - < captype.rc.in > $@ - -editcap.rc : editcap.rc.in ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@ICON_PATH@// \ - < editcap.rc.in > $@ - -mergecap.rc : mergecap.rc.in ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@ICON_PATH@// \ - < mergecap.rc.in > $@ - -reordercap.rc : reordercap.rc.in ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@ICON_PATH@// \ - < reordercap.rc.in > $@ - -text2pcap.rc : text2pcap.rc.in ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@ICON_PATH@// \ - < text2pcap.rc.in > $@ - -wiretap.rc : wiretap.rc.in ..\config.nmake - sed -e s/@VERSION@/$(WTAP_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_WTAP_VERSION)/ \ - < wiretap.rc.in > $@ - -libwscodecs.rc : libwscodecs.rc.in ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - < libwscodecs.rc.in > $@ - -libwsutil.rc : libwsutil.rc.in ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - < libwsutil.rc.in > $@ - -dumpcap.rc : dumpcap.rc.in wireshark.exe.manifest ..\config.nmake - sed -e s/@VERSION@/$(VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@ICON_PATH@// \ - < dumpcap.rc.in > $@ - -clean : - rm -f $(ALL_RC) - -distclean: clean - -maintainer-clean: distclean diff --git a/make-version.pl b/make-version.pl index 74b9490a86..f5c21dd521 100755 --- a/make-version.pl +++ b/make-version.pl @@ -38,7 +38,7 @@ # pkg_format - Like "format", but used for the local package version. # # If run with the "-r" or "--set-release" argument the AC_INIT macro in -# configure.ac and the VERSION macro in config.nmake will have the +# configure.ac and the VERSION macro in CMakeLists.txt will have the # pkg_format template appended to the version number. version.h will # _not_ be generated if either argument is present. # @@ -255,20 +255,6 @@ sub read_repo_info { unlink($tortoise_file); } - if ($num_commits == 0) { - # Fall back to config.nmake - $info_source = "Prodding config.nmake"; - my $filepath = "$srcdir/config.nmake"; - open(CFGNMAKE, "< $filepath") || die "Can't read $filepath!"; - while ($line = <CFGNMAKE>) { - if ($line =~ /^VCS_REVISION=(\d+)/) { - $num_commits = $1; - $do_hack = 0; - last; - } - } - close (CFGNMAKE); - } if ($num_commits == 0 and -d "$srcdir/.git") { # Try git... @@ -461,41 +447,6 @@ sub update_configure_ac print "$filepath has been updated.\n"; } -# Read config.nmake, then write it back out with an updated -# "VERSION" line. -sub update_config_nmake -{ - my $line; - my $contents = ""; - my $version = ""; - my $filepath = "$srcdir/config.nmake"; - my $win_package_string = "\$(WIRESHARK_VERSION_EXTRA)"; - - if ($package_string ne "") { $win_package_string = $package_string; } - - - open(CFGNMAKE, "< $filepath") || die "Can't read $filepath!"; - while ($line = <CFGNMAKE>) { - if ($line =~ /^VCS_REVISION=.*([\r\n]+)$/) { - $line = sprintf("VCS_REVISION=%d$1", $num_commits); - } elsif ($set_version && $line =~ /^VERSION_MAJOR=.*([\r\n]+)$/) { - $line = sprintf("VERSION_MAJOR=%d$1", $version_pref{"version_major"}); - } elsif ($set_version && $line =~ /^VERSION_MINOR=.*([\r\n]+)$/) { - $line = sprintf("VERSION_MINOR=%d$1", $version_pref{"version_minor"}); - } elsif ($set_version && $line =~ /^VERSION_MICRO=.*([\r\n]+)$/) { - $line = sprintf("VERSION_MICRO=%d$1", $version_pref{"version_micro"}); - } elsif ($line =~ /^VERSION_EXTRA=.*([\r\n]+)$/) { - $line = "VERSION_EXTRA=$win_package_string$1"; - } - $contents .= $line - } - - open(CFGNMAKE, "> $filepath") || die "Can't write $filepath!"; - print(CFGNMAKE $contents); - close(CFGNMAKE); - print "$filepath has been updated.\n"; -} - # Read docbook/asciidoc.conf, then write it back out with an updated # wireshark-version replacement line. sub update_release_notes @@ -626,7 +577,6 @@ sub update_versioned_files $package_string; &update_cmakelists_txt; &update_configure_ac; - &update_config_nmake; if ($set_version) { &update_release_notes; &update_debian_changelog; @@ -795,15 +745,13 @@ make-version.pl [options] [source directory] --print-vcs Print the vcs version to standard output --set-version, -v Set the major, minor, and micro versions in the top-level CMakeLists.txt, configure.ac, - config.nmake, docbook/asciidoc.conf, - debian/changelog, the Makefile.am for all - libraries, and the CMakeLists.txt for all - libraries. + docbook/asciidoc.conf, debian/changelog, + the Makefile.am for all libraries, and the + CMakeLists.txt for all libraries. Resets the release information when used by itself. --set-release, -r Set the release information in the top-level - CMakeLists.txt, configure.ac, and - config.nmake. + CMakeLists.txt, configure.ac --package-version, -p Deprecated. Same as --set-release. --verbose Print diagnostic messages to STDERR. diff --git a/packaging/Makefile.am b/packaging/Makefile.am index 345fbd0173..1535072307 100644 --- a/packaging/Makefile.am +++ b/packaging/Makefile.am @@ -5,12 +5,10 @@ MAINTAINERCLEANFILES = \ Makefile.in EXTRA_DIST = \ - Makefile.nmake \ macosx/Info.plist.in \ portableapps/appinfo.tmpl \ portableapps/CMakeLists.txt \ portableapps/help.html \ - portableapps/Makefile.nmake \ portableapps/readme.txt \ portableapps/WiresharkPortable.ini \ portableapps/xcopy-deploy-exclude.txt diff --git a/packaging/Makefile.nmake b/packaging/Makefile.nmake deleted file mode 100644 index af21e532ea..0000000000 --- a/packaging/Makefile.nmake +++ /dev/null @@ -1,10 +0,0 @@ -# This is no longer used and can probably be removed. - -include ../config.nmake - -clean: - rm -rf wireshark.manifest - -distclean: clean - -maintainer-clean: distclean diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index dec5cb5dbc..00e920c72b 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -43,16 +43,6 @@ set(NSIS_FILES PARENT_SCOPE ) -# Check for leftover NMake-generated files. -foreach(_nsh_file all-manifest.nsh config.nsh gtk-dll-manifest.nsh qt-dll-manifest.nsh) - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_nsh_file}) - message(FATAL_ERROR - "Found ${CMAKE_CURRENT_SOURCE_DIR}/${_nsh_file}.\n" - "Please run nmake -f Makefile.nmake distclean in ${CMAKE_SOURCE_DIR}." - ) - endif() -endforeach() - # Variables required for config.nsh set(PROGRAM_NAME ${CMAKE_PROJECT_NAME}) file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}" TOP_SRC_DIR) @@ -83,7 +73,7 @@ set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_ set(WTAP_VERSION ${PROJECT_VERSION}) # To do: -# - Sync the various version names between CMake, NMake, and NSIS. +# - Sync the various version names between CMake and NSIS. # - Set CMakeLists.txt version strings in make-version.pl # - Add a VERSION_EXTRA cmake option set (VERSION "${PROJECT_VERSION}") @@ -218,8 +208,7 @@ macro( ADD_NSIS_PACKAGE_TARGET ) ) set_target_properties(nsis_package_prep PROPERTIES FOLDER "Packaging") - # Dump the installer into ${CMAKE_CURRENT_SOURCE_DIR}/packaging/nsis to match - # the NMake environment for now. + # Dump the installer into ${CMAKE_CURRENT_SOURCE_DIR}/packaging/nsis # Note that executables and DLLs *must* be built separately add_custom_target(nsis_package COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_DEFINES} diff --git a/packaging/nsis/Custom.nmake b/packaging/nsis/Custom.nmake deleted file mode 100644 index 49979f9367..0000000000 --- a/packaging/nsis/Custom.nmake +++ /dev/null @@ -1,6 +0,0 @@ -# -# Add your custom plugins here -CUSTOM_PLUGINS= \ -# Example: -# ../../plugins/foo/foo.dll - diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am index 22de5e1819..a02722a44f 100644 --- a/packaging/nsis/Makefile.am +++ b/packaging/nsis/Makefile.am @@ -6,13 +6,11 @@ EXTRA_DIST = \ CMakeLists.txt \ common.nsh \ config.nsh.in \ - Custom.nmake \ custom_diameter_xmls.txt \ custom_mibs.txt \ custom_plugins.txt \ custom_radius_dict.txt \ GetWindowsVersion.nsh \ - Makefile.nmake \ servicelib.nsh \ uninstall.nsi \ VersionCompare.nsh \ diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake deleted file mode 100644 index 63a6d1add7..0000000000 --- a/packaging/nsis/Makefile.nmake +++ /dev/null @@ -1,312 +0,0 @@ -# -# NSIS is a free packager/installer/uninstaller program for Win32. -# It was originally written for the Winamp package, but various -# freeware and non-freeware packages are using it, too. -# -# http://www.nullsoft.com/free/nsis/ - -include ../../config.nmake -# Contains a list of custom plugins(default empty) -include Custom.nmake - -TOP_SRC_DIR=$(MAKEDIR)\..\.. -# Must be absolue for uninstall.nsi -STAGING_DIR=$(MAKEDIR)\..\..\$(INSTALL_DIR) - -EXE=../../tshark.exe ../../editcap.exe \ -!IFDEF GTK_DIR - ../../wireshark-gtk.exe \ -!ENDIF - ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe $(WIRESHARK_LIB_DIR)\WinPcap_$(WINPCAP_VERSION).exe -DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll ../../codecs/libwscodecs.dll -DOC=../../doc/ws.css \ - ../../doc/androiddump.html \ - ../../doc/capinfos.html \ - ../../doc/ciscodump.html \ - ../../doc/dumpcap.html \ - ../../doc/editcap.html \ - ../../doc/extcap.html \ - ../../doc/mergecap.html \ - ../../doc/randpktdump.html \ - ../../doc/rawshark.html \ - ../../doc/sshdump.html \ - ../../doc/text2pcap.html \ - ../../doc/tshark.html \ - ../../doc/wireshark-filter.html \ - ../../doc/wireshark.html \ - $(STAGING_DIR)/COPYING.txt \ - $(STAGING_DIR)/NEWS.txt \ - $(STAGING_DIR)/README.txt \ - $(STAGING_DIR)/README.windows.txt - -GPL=../../COPYING -HELP=$(STAGING_DIR)/help/capture_filters.txt \ - $(STAGING_DIR)/help/capturing.txt \ - $(STAGING_DIR)/help/display_filters.txt \ - $(STAGING_DIR)/help/faq.txt \ - $(STAGING_DIR)/help/getting_started.txt \ - $(STAGING_DIR)/help/overview.txt \ - $(STAGING_DIR)/help/toc - -PLUGINS= \ - ../../plugins/docsis/docsis.dll \ - ../../plugins/ethercat/ethercat.dll \ - ../../plugins/gryphon/gryphon.dll \ - ../../plugins/irda/irda.dll \ - ../../plugins/m2m/m2m.dll \ - ../../plugins/mate/mate.dll \ - ../../plugins/opcua/opcua.dll \ - ../../plugins/profinet/profinet.dll \ - ../../plugins/stats_tree/stats_tree.dll \ - ../../plugins/unistim/unistim.dll \ - ../../plugins/wimax/wimax.dll \ - ../../plugins/wimaxasncp/wimaxasncp.dll \ - ../../plugins/wimaxmacphy/wimaxmacphy.dll \ - $(CUSTOM_PLUGINS) - -NSI=\ - wireshark.nsi \ - uninstall.nsi \ - common.nsh \ - GetWindowsVersion.nsh \ - servicelib.nsh \ - AdditionalTasksPage.ini \ - WinPcapPage.ini \ - USBPcapPage.ini - -UNINSTALL_INSTALLER = $(STAGING_DIR)\uninstall_installer.exe - -DELIVERABLES=$(EXE) $(DLL) $(DOC) $(DOC_dos) $(GPL) $(HELP) $(PLUGINS) - -!IFDEF MAKENSIS -all: wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe -!ELSE -all: _FORCE_ - @echo ? NSIS not available (MAKENSIS not defined in config.nmake) - @echo. - @exit 1 -!ENDIF - -# fetch the latest available user-guide.chm version -user-guide.chm:: - if exist ..\..\docbook\user-guide.chm xcopy ..\..\docbook\user-guide.chm . /Y /D - if exist $(WIRESHARK_LIB_DIR)\user-guide\user-guide.chm xcopy $(WIRESHARK_LIB_DIR)\user-guide\user-guide.chm . /Y /D - -common.nsh: config.nsh -config.nsh: config.nsh.in ..\..\config.nmake - sed \ - -e s/@PROGRAM_NAME@/$(PROGRAM_NAME)/ \ - -e 's/@TOP_SRC_DIR@/$(TOP_SRC_DIR:\=\\\\)/' \ - -e 's/@STAGING_DIR@/$(STAGING_DIR:\=\\\\)/' \ - -e s/@USER_GUIDE_DIR@/./ \ - -e s/@WIRESHARK_TARGET_PLATFORM@/$(WIRESHARK_TARGET_PLATFORM)/ \ - -e s/@TARGET_MACHINE@/$(TARGET_MACHINE)/ \ - -e s/@MSC_VER_REQUIRED@/$(MSC_VER_REQUIRED)/ \ - -e 's/@WIRESHARK_LIB_DIR@/$(WIRESHARK_LIB_DIR:\=\\\\)/' \ - -e s/@WINPCAP_PACKAGE_VERSION@/$(WINPCAP_VERSION)/ \ - -e s/@PCAP_DISPLAY_VERSION@/$(WINPCAP_VERSION:_=.)/ \ - -e s/@INTL_DLL@/$(INTL_DLL)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@VERSION_MAJOR@/$(VERSION_MAJOR)/ \ - -e s/@VERSION_MINOR@/$(VERSION_MINOR)/ \ - -e s/@PRODUCT_VERSION@/$(PRODUCT_VERSION)/ \ - -e s/@WTAP_VERSION@/$(WTAP_VERSION)/ \ - -e 's/@MSVCR_DLL@/$(MSVCR_DLL:\=\\\\)/' \ -!IFDEF VCREDIST_EXE - -e 's/@VCREDIST_EXE@/$(VCREDIST_EXE:\=\\\\)/' \ -!ENDIF - -e s/@ENABLE_LIBWIRESHARK@/$(ENABLE_LIBWIRESHARK)/ \ - -e 's/@SMI_DIR@/$(SMI_DIR:\=\\\\)/' \ -!IFDEF GTK_DIR - -e 's/@GTK_DIR@/$(GTK_DIR:\=\\\\)/' \ -!ENDIF -!IF EXIST("..\..\wireshark-qt-release\wireshark.exe") - -e s/@QT_DIR@/..\\..\\wireshark-qt-release/ \ -!ENDIF - -e 's/\(^^!define .*\) \"*@.*@\"*/; \1/' \ - < config.nsh.in > $@ - -wireshark.nsi: all-manifest.nsh qt-dll-manifest.nsh gtk-dll-manifest.nsh common.nsh - -all-manifest.nsh: Makefile.nmake ..\..\config.nmake - @echo # Files required for all sections. Generated from Makefile.nmake > $@ - @echo # GLib >> $@ - @echo File "$(STAGING_DIR)\libgio-2.0-0.dll" >> $@ - @echo File "$(STAGING_DIR)\libglib-2.0-0.dll" >> $@ - @echo File "$(STAGING_DIR)\libgobject-2.0-0.dll" >> $@ - @echo File "$(STAGING_DIR)\libgmodule-2.0-0.dll" >> $@ - @echo File "$(STAGING_DIR)\$(INTL_DLL)" >> $@ - @echo File "$(STAGING_DIR)\gspawn-$(WIRESHARK_TARGET_PLATFORM)-helper.exe" >> $@ - @echo File "$(STAGING_DIR)\gspawn-$(WIRESHARK_TARGET_PLATFORM)-helper-console.exe" >> $@ -!IF "$(C_ARES_DIR)" != "" - @echo # C-Ares >> $@ - @echo File "$(STAGING_DIR)\libcares-2.dll" >> $@ -!ENDIF -!IF "$(GNUTLS_DIR)" != "" - @echo # GnuTLS >> $@ - @echo File "$(STAGING_DIR)\libffi-6.dll" >> $@ - @echo File "$(STAGING_DIR)\$(GCC_DLL)" >> $@ - @echo File "$(STAGING_DIR)\libgcrypt-20.dll" >> $@ - @echo File "$(STAGING_DIR)\libgmp-10.dll" >> $@ - @echo File "$(STAGING_DIR)\libgnutls-28.dll" >> $@ - @echo File "$(STAGING_DIR)\$(GPGERROR_DLL)" >> $@ - @echo File "$(STAGING_DIR)\libhogweed-2-4.dll" >> $@ - @echo File "$(STAGING_DIR)\libnettle-4-6.dll" >> $@ - @echo File "$(STAGING_DIR)\libp11-kit-0.dll" >> $@ - @echo File "$(STAGING_DIR)\libtasn1-6.dll" >> $@ -!ENDIF -!IF "$(KFW_DIR)" != "" - @echo # Kerberos >> $@ - @echo File "$(STAGING_DIR)\$(COMERR_DLL)" >> $@ - @echo File "$(STAGING_DIR)\$(KRB5_DLL)" >> $@ - @echo File "$(STAGING_DIR)\$(K5SPRT_DLL)" >> $@ -!ENDIF -!IFDEF LUA_DIR - @echo # Lua >> $@ - @echo File "$(STAGING_DIR)\lua52.dll" >> $@ - @echo File "..\..\epan\wslua\init.lua" >> $@ - @echo File "..\..\epan\wslua\console.lua" >> $@ - @echo File "..\..\epan\wslua\dtd_gen.lua" >> $@ -!ENDIF -!IFDEF GEOIP_DIR - @echo File "$(STAGING_DIR)\libGeoIP-1.dll" >> $@ -!ENDIF -!IFDEF SMI_DIR - @echo # SMI >> $@ - @echo File "$(STAGING_DIR)\libsmi-2.dll" >> $@ -!ENDIF -!IFDEF LIBSSH_DIR - @echo File "$(STAGING_DIR)\libssh.dll" >> $@ -!ENDIF -!IFDEF WINSPARKLE_DIR - @echo # WinSparkle >> $@ - @echo File "$(STAGING_DIR)\WinSparkle.dll" >> $@ -!ENDIF -!IF "$(ZLIB_DIR)" != "" - @echo # Zlib >> $@ - @echo File "$(STAGING_DIR)\zlib1.dll" >> $@ -!ENDIF - -gtk-dll-manifest.nsh: Makefile.nmake ..\..\config.nmake - @echo # Files required for the GTK+ section. Generated from Makefile.nmake > $@ - @echo # Mandatory >> $@ - @echo File "$(STAGING_DIR)\$(GDK_DLL)" >> $@ - @echo File "$(STAGING_DIR)\libgdk_pixbuf-2.0-0.dll" >> $@ - @echo File "$(STAGING_DIR)\$(GTK_DLL)" >> $@ - @echo File "$(STAGING_DIR)\libatk-1.0-0.dll" >> $@ - @echo File "$(STAGING_DIR)\libpango-1.0-0.dll" >> $@ - @echo File "$(STAGING_DIR)\libpangowin32-1.0-0.dll" >> $@ - @echo # Optional >> $@ -!IFDEF NEED_CAIRO_DLL - @echo File "$(STAGING_DIR)\libcairo-2.dll" >> $@ - @echo File "$(STAGING_DIR)\libpangocairo-1.0-0.dll" >> $@ -!ENDIF -!IFDEF NEED_CAIRO_GOBJECT_DLL - @echo File "$(STAGING_DIR)\libcairo-gobject-2.dll" >> $@ -!ENDIF -!IFDEF NEED_EXPAT_DLL - @echo File "$(STAGING_DIR)\${EXPAT_DLL)" >> $@ -!ENDIF -!IFDEF NEED_FFI_DLL - @echo File "$(STAGING_DIR)\$(FFI_DLL)" >> $@ -!ENDIF -!IFDEF NEED_FONTCONFIG_DLL - @echo File "$(STAGING_DIR)\$(FONTCONFIG_DLL)" >> $@ -!ENDIF -!IFDEF NEED_FREETYPE_DLL - @echo File "$(STAGING_DIR)\libpangoft2-1.0-0.dll" >> $@ - @echo File "$(STAGING_DIR)\$(FREETYPE_DLL)" >> $@ -!ENDIF -!IFDEF NEED_HARFBUZZ_DLL - @echo File "$(STAGING_DIR)\$(HARFBUZZ_DLL)" >> $@ -!ENDIF -!IFDEF NEED_JASPER_DLL - @echo File "$(STAGING_DIR)\$(JASPER_DLL)" >> $@ -!ENDIF -!IFDEF NEED_JPEG_DLL - @echo File "$(STAGING_DIR)\$(JPEG_DLL)" >> $@ -!ENDIF -!IFDEF NEED_LZMA_DLL - @echo File "$(STAGING_DIR)\$(LZMA_DLL)" >> $@ -!ENDIF -!IFDEF NEED_PIXMAN_DLL - @echo File "$(STAGING_DIR)\$(PIXMAN_DLL)" >> $@ -!ENDIF -!IFDEF NEED_PNG_DLL - @echo File "$(STAGING_DIR)\$(PNG_DLL)" >> $@ -!ENDIF -!IFDEF NEED_SEH_DLL - @echo File "$(STAGING_DIR)\$(SEH_DLL)" >> $@ -!ENDIF -!IFDEF NEED_SJLJ_DLL - @echo File "$(STAGING_DIR)\$(SJLJ_DLL)" >> $@ -!ENDIF -!IFDEF NEED_TIFF_DLL - @echo File "$(STAGING_DIR)\$(TIFF_DLL)" >> $@ -!ENDIF -!IFDEF NEED_XML_DLL - @echo File "$(STAGING_DIR)\$(XML_DLL)" >> $@ -!ENDIF - @echo # Subdirectories >> $@ - @echo SetOutPath ^$INSTDIR\$(GTK_ETC_DIR) >> $@ - @echo File "$(GTK_DIR)\$(GTK_ETC_DIR)\*.*" >> $@ -!IFDEF GTK_ENGINES_DIR - @echo SetOutPath ^$INSTDIR\$(GTK_ENGINES_DIR) >> $@ - @echo File "$(STAGING_DIR)\$(GTK_ENGINES_DIR)\libpixmap.dll" >> $@ - @echo File "$(STAGING_DIR)\$(GTK_ENGINES_DIR)\libwimp.dll" >> $@ -!ENDIF -!IFDEF GTK_MODULES_DIR - @echo SetOutPath ^$INSTDIR\$(GTK_MODULES_DIR) >> $@ - @echo File "$(STAGING_DIR)\$(GTK_MODULES_DIR)\libgail.dll" >> $@ -!ENDIF -!IFDEF GTK_SCHEMAS_DIR - @echo SetOutPath ^$INSTDIR\$(GTK_SCHEMAS_DIR) >> $@ - @echo File "$(STAGING_DIR)\$(GTK_SCHEMAS_DIR)\*.*" >> $@ -!ENDIF - -qt-dll-manifest.nsh: windeployqt-to-nsis.ps1 Makefile.nmake -!IF EXIST("$(QT5_BASE_DIR)\bin\qmake.exe") - set PATH=%PATH%;$(QT5_BASE_DIR)\bin -!ENDIF - $(POWERSHELL) windeployqt-to-nsis.ps1 \ - -Executable ..\..\wireshark-qt-release\wireshark.exe \ - -FilePath $@ - -$(STAGING_DIR)\uninstall.exe : $(NSI) - rm -f $(UNINSTALL_INSTALLER) - $(MAKENSIS) uninstall.nsi - $(UNINSTALL_INSTALLER) - rm -f $(UNINSTALL_INSTALLER) - -uninstall-exe : $(STAGING_DIR)\uninstall.exe - -wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake $(STAGING_DIR)\uninstall.exe - $(MAKENSIS) wireshark.nsi - -clean: - rm -f all-manifest.nsh - rm -f config.nsh - rm -f gtk-dll-manifest.nsh - rm -f NEWS.txt - rm -f qt-dll-manifest.nsh - rm -f user-guide.chm - rm -f $(UNINSTALL_INSTALLER) - rm -f wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe - -distclean: clean - rm -f wireshark-$(WIRESHARK_TARGET_PLATFORM)-*.exe - -maintainer-clean: distclean - -$(DOC): - cd ../../doc - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd ../packaging/nsis - -$(EXE) $(DLL): - cd ../.. - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd packaging/nsis - -#### -_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 145fad17ed..cbb9439cf6 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -408,7 +408,7 @@ Delete "$INSTDIR\vcredist_${TARGET_MACHINE}.exe" !else !ifdef MSVCR_DLL ; msvcr*.dll (MSVC V7 or V7.1) - simply copy the dll file -!echo "IF YOU GET AN ERROR HERE, check the MSVC_VARIANT setting in config.nmake: MSVC2005 vs. MSVC2005EE." +!echo "IF YOU GET AN ERROR HERE, check the CMAKE_GENERATOR setting" File "${MSVCR_DLL}" !endif ; MSVCR_DLL !endif ; VCREDIST_EXE diff --git a/packaging/portableapps/Makefile.nmake b/packaging/portableapps/Makefile.nmake deleted file mode 100644 index 2a9af43365..0000000000 --- a/packaging/portableapps/Makefile.nmake +++ /dev/null @@ -1,133 +0,0 @@ -# - -TOPDIR = ..\.. -TOOLS_DIR = $(TOPDIR)\tools - -include ../../config.nmake - -PROGRAM_PORTABLE = $(PROGRAM_NAME)Portable - -STAGING_DIR = $(PROGRAM_PORTABLE) -APP = $(STAGING_DIR)\App -APPINFO = $(APP)\AppInfo -LAUNCHER_DIR = $(APPINFO)\Launcher -WIRESHARK_DIR = $(APP)\$(PROGRAM_NAME) -DATA = $(STAGING_DIR)\Data -OTHER = $(STAGING_DIR)\Other -SOURCE = $(OTHER)\Source - -APPINFO_INI = $(APPINFO)\appinfo.ini -LAUNCHER_INI = $(LAUNCHER_DIR)\$(PROGRAM_PORTABLE).ini - -COPY = xcopy -MKDIR = mkdir -COPY_FLAGS = /d /y -!IFNDEF WIN32_SETUP_OPT -WIN32_SETUP_OPT = --download -!ENDIF - -# XXX This should be defined in config.nmake. -!IF EXIST("$(TOPDIR)\wireshark-qt-release\wireshark.exe") -QT_DIR = "$(TOPDIR)\wireshark-qt-release" -!ENDIF -!IF EXIST("$(TOPDIR)\wireshark-qt-release\Qt5Core.dll") -NEED_QT5_DLL = USE -!ENDIF -!IF EXIST("$(TOPDIR)\wireshark-qt-release\QtCore4.dll") -NEED_QT4_DLL = USE -!ENDIF - -UPX_FLAGS = -q - -PAPPS_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).0 -PAPPS_PACKAGE=$(PROGRAM_PORTABLE)_$(VERSION).paf.exe - -all: package - -package: $(PAPPS_PACKAGE) - -dirs: - if not exist $(STAGING_DIR) $(MKDIR) $(STAGING_DIR) - if not exist $(APP) $(MKDIR) $(APP) - if not exist $(APPINFO) $(MKDIR) $(APPINFO) - if not exist $(LAUNCHER_DIR) $(MKDIR) $(LAUNCHER_DIR) - if not exist $(WIRESHARK_DIR) $(MKDIR) $(WIRESHARK_DIR) - if not exist $(DATA) $(MKDIR) $(DATA) - if not exist $(OTHER) $(MKDIR) $(OTHER) - if not exist $(SOURCE) $(MKDIR) $(SOURCE) - -# XXX - Figure out how to use the PA AppCompactor non-interactively and -# use it instead. -#pack: distribution -#!IFDEF UPX -# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\[a-z]*.exe -# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.dll -# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\plugins\$(VERSION)\*.dll -# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\*.dll -# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules\*.dll -# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\$(GTK_WIMP_DLLDST_DIR)\*.dll -#!ENDIF - -$(APPINFO_INI): dirs appinfo.tmpl $(TOPDIR)\config.nmake - sed -e 's/@PORTABLEAPPS_PACKAGE_VERSION@/$(PAPPS_VERSION)/g' \ - -e 's/@VERSION@/$(VERSION)/g' \ - < appinfo.tmpl > $@ - -$(LAUNCHER_INI): dirs $(PROGRAM_PORTABLE).ini - copy $(PROGRAM_PORTABLE).ini $(LAUNCHER_INI) /y - -appinfo: $(APPINFO_INI) $(LAUNCHER_INI) - copy help.html $(STAGING_DIR)\help.html /y - copy $(TOPDIR)\image\wireshark.ico $(APPINFO)\appicon.ico /y - copy $(TOPDIR)\image\wsicon16.png $(APPINFO)\appicon_16.png /y - copy $(TOPDIR)\image\wsicon32.png $(APPINFO)\appicon_32.png /y - copy $(TOPDIR)\image\wsicon128.png $(APPINFO)\appicon_128.png /y - -# It'd be nice if we could get some sort of status or debugging output. For now -# just cross our fingers. -applauncher: appinfo - $(PORTABLEAPPS_DIR)\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe \ - $(MAKEDIR)\$(PROGRAM_PORTABLE) - -appbinaries: applauncher - xcopy $(TOPDIR)\wireshark-qt-release $(WIRESHARK_DIR) /D /I /E /Y /exclude:xcopy-deploy-exclude.txt - xcopy $(TOPDIR)\capinfos.exe $(WIRESHARK_DIR) /d - xcopy $(TOPDIR)\captype.exe $(WIRESHARK_DIR) /d - xcopy $(TOPDIR)\dumpcap.exe $(WIRESHARK_DIR) /d - xcopy $(TOPDIR)\editcap.exe $(WIRESHARK_DIR) /d - xcopy $(TOPDIR)\mergecap.exe $(WIRESHARK_DIR) /d - xcopy $(TOPDIR)\randpkt.exe $(WIRESHARK_DIR) /d - xcopy $(TOPDIR)\reordercap.exe $(WIRESHARK_DIR) /d - xcopy $(TOPDIR)\rawshark.exe $(WIRESHARK_DIR) /d - xcopy $(TOPDIR)\text2pcap.exe $(WIRESHARK_DIR) /d - xcopy $(TOPDIR)\tfshark.exe $(WIRESHARK_DIR) /d - xcopy $(TOPDIR)\tshark.exe $(WIRESHARK_DIR) /d - -source: dirs - $(COPY) readme.txt $(SOURCE) $(COPY_FLAGS) - $(TEXTIFY) -Destination $(SOURCE) \ - $(TOPDIR)/COPYING \ - $(TOPDIR)/NEWS \ - $(TOPDIR)/README.windows - -$(PAPPS_PACKAGE) : dirs appinfo appbinaries source -!IFDEF PORTABLEAPPS_DIR - $(PORTABLEAPPS_DIR)\PortableApps.comInstaller\PortableApps.comInstaller.exe \ - $(MAKEDIR)\$(PROGRAM_PORTABLE) -!ELSE -!MESSAGE PORTABLEAPPS_DIR not configured in config.nmake. Skipping. -!ENDIF - -clean: - cd .. - $(MAKE) -f Makefile.nmake $@ - cd portableapps - rm -rf $(STAGING_DIR) - rm -rf appinfo.ini - rm -rf $(PAPPS_PACKAGE) - rm -rf *~ *.*~ - -distclean: clean - rm -rf WiresharkPortable*.paf.exe - -maintainer-clean: distclean diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 9d14c0ee62..1f8281e20c 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -386,8 +386,7 @@ macro( ADD_WIX_PACKAGE_TARGET ) ) set_target_properties(wix_package_prep PROPERTIES FOLDER "Packaging") - # Dump the installer into ${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix to match - # the NMake environment for now. + # Dump the installer into ${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix # Note that executables and DLLs *must* be built separately add_custom_target(wix_package COMMAND ${WIX_CANDLE_EXECUTABLE} ${WIX_CANDLE_DEFINES} ${WIX_SOURCE_FILES} diff --git a/plugins/Custom.nmake.example b/plugins/Custom.nmake.example deleted file mode 100644 index cd97bc46da..0000000000 --- a/plugins/Custom.nmake.example +++ /dev/null @@ -1,30 +0,0 @@ -# - -include ..\config.nmake - -all: foo - -foo:: - cd foo - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. - -clean: - cd foo - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd .. - -distclean: clean - cd foo - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd .. - -maintainer-clean: distclean - cd foo - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd .. - -install-plugins: -!IFDEF ENABLE_LIBWIRESHARK - xcopy foo\*.dll ..\$(INSTALL_DIR)\plugins\ /d -!ENDIF diff --git a/plugins/Makefile.am b/plugins/Makefile.am index f12b3390b2..1a389dc6e5 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -40,10 +40,8 @@ SUBDIRS = $(_CUSTOM_SUBDIRS_) \ EXTRA_DIST = \ $(_CUSTOM_EXTRA_DIST_) \ Makefile.common.inc \ - Makefile.nmake \ Custom.make.example \ - Custom.m4.example \ - Custom.nmake.example + Custom.m4.example MAINTAINERCLEANFILES = \ Makefile.in diff --git a/plugins/Makefile.common.inc b/plugins/Makefile.common.inc index e60ce88238..c28b6a3dfe 100644 --- a/plugins/Makefile.common.inc +++ b/plugins/Makefile.common.inc @@ -37,8 +37,7 @@ # but we don't distribute Lemon-generated files, as we distribute # Lemon and can run it in the build process; # -# "make maintainer-clean" on UN*X and "nmake maintainer-clean" on -# Windows remove all generated files; +# "make maintainer-clean" on UN*X remove all generated files; # # "make distclean" on UN*X removes Lemon-generated files, as they're # not in the distribution, but not Flex-generated files, as they diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake deleted file mode 100644 index b6231a06fd..0000000000 --- a/plugins/Makefile.nmake +++ /dev/null @@ -1,73 +0,0 @@ -# - -include ..\config.nmake - -## To add a plugin: Add entry to PLUGIN_LIST - -PLUGIN_LIST = \ - docsis \ - ethercat \ - gryphon \ - irda \ - m2m \ - mate \ - opcua \ - profinet \ - stats_tree \ - unistim \ - wimax \ - wimaxasncp \ - wimaxmacphy - - -all: - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake PLUGIN_TARGET= process-plugins - -clean: clean-local - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake PLUGIN_TARGET=clean process-plugins - -distclean: distclean-local - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake PLUGIN_TARGET=distclean process-plugins - -maintainer-clean: maintainer-clean-local - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake PLUGIN_TARGET=maintainer-clean process-plugins - - -clean-local: - rm -rf $(VERSION) - -distclean-local: clean-local - -maintainer-clean-local: distclean-local - -checkapi: - $(MAKE) -f Makefile.nmake PLUGIN_TARGET=checkapi process-plugins - - - -process-plugins : $(PLUGIN_LIST) custom - -$(PLUGIN_LIST) : _FORCE_ # _FORCE_ req'd since each target actually exists - cd $@ - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET) - cd .. - -custom : - if exist Custom.nmake $(MAKE) /$(MAKEFLAGS) -f Custom.nmake $(PLUGIN_TARGET) - - -################################################################################ -# copy all plugins to $(INSTALL_DIR)/plugins/$(VERSION), so Wireshark will load them, when -# started from $(INSTALL_DIR). -################################################################################ - -install-plugins: -!IFDEF ENABLE_LIBWIRESHARK - cd .. - @for %f in ( $(PLUGIN_LIST) ) do xcopy plugins\%f\*.dll $(INSTALL_DIR)\plugins\ /d - cd plugins - if exist Custom.nmake $(MAKE) /$(MAKEFLAGS) -f Custom.nmake install-plugins -!ENDIF - -#### -_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am index 53dae04c73..39cda1e095 100644 --- a/plugins/docsis/Makefile.am +++ b/plugins/docsis/Makefile.am @@ -48,8 +48,6 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ README \ CMakeLists.txt diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake deleted file mode 100644 index 0f77199ca4..0000000000 --- a/plugins/docsis/Makefile.nmake +++ /dev/null @@ -1,90 +0,0 @@ -# Makefile.nmake -# nmake file for DOCSIS plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -# -# Build plugin.c, which contains the plugin version[] string, a -# function plugin_register() that calls the register routines for all -# protocols, and a function plugin_reg_handoff() that calls the handoff -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# a plugin.c file for a plugin. -# All subsequent arguments are the files to scan. -# -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/docsis/moduleinfo.nmake b/plugins/docsis/moduleinfo.nmake deleted file mode 100644 index 99580abefd..0000000000 --- a/plugins/docsis/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=docsis - -# The version -MODULE_VERSION_MAJOR=0 -MODULE_VERSION_MINOR=0 -MODULE_VERSION_MICRO=5 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/easy_codec/Makefile.am b/plugins/easy_codec/Makefile.am index 5ac0568705..e3ffb3cf92 100644 --- a/plugins/easy_codec/Makefile.am +++ b/plugins/easy_codec/Makefile.am @@ -25,8 +25,6 @@ EXTRA_DIST = \ $(NONGENERATED_C_FILES) \ $(CLEAN_HEADER_FILES) \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ ReadMe.txt diff --git a/plugins/easy_codec/Makefile.nmake b/plugins/easy_codec/Makefile.nmake deleted file mode 100644 index c444588404..0000000000 --- a/plugins/easy_codec/Makefile.nmake +++ /dev/null @@ -1,81 +0,0 @@ -# Makefile.nmake -# nmake file for Easy codec plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include - -CPPFLAGS = $(CFLAGS) -TP - -.c.obj:: - $(CC) $(CPPFLAGS) -Fd$(PLUGIN_NAME).pdb -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -CODEC_LIBS = \ - EasyG729A/EasyG729A.lib \ - EasyG7231/EasyG7231.lib \ - EasyG722/EasyG722.lib - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(CODEC_LIBS) $(RESOURCE) - -easy_codec_plugin.obj : easy_codec_plugin.c - $(CC) $(CFLAGS) -Fd$(PLUGIN_NAME).pdb -c easy_codec_plugin.c - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -# -# We remove the Flex-generated files with "distclean" because files -# generated by Flex need 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 re-generate -# the files from the distribution that were generated by Flex. -# -distclean: clean - rm -f $(FLEX_GENERATED_SRC_FILES) \ - $(FLEX_GENERATED_HEADER_FILES) \ - $(NODIST_GENERATED_SRC_FILES) \ - $(NODIST_GENERATED_HEADER_FILES) - -maintainer-clean: distclean - rm -f $(GENERATED_SRC_FILES) \ - $(GENERATED_HEADER_FILES) - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/easy_codec/ReadMe.txt b/plugins/easy_codec/ReadMe.txt index e85783704f..0207ed9f94 100644 --- a/plugins/easy_codec/ReadMe.txt +++ b/plugins/easy_codec/ReadMe.txt @@ -7,7 +7,6 @@ Instructions on compiling the Easy Codecs EasyG729A 2. Build plugin. - Win32: nmake -f makefile.nmake Linux: TO DO CMake: TO DO diff --git a/plugins/easy_codec/moduleinfo.nmake b/plugins/easy_codec/moduleinfo.nmake deleted file mode 100644 index 2746c3d448..0000000000 --- a/plugins/easy_codec/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=codec_test - -# The version -MODULE_VERSION_MAJOR=0 -MODULE_VERSION_MINOR=0 -MODULE_VERSION_MICRO=1 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index e0986faef5..ef85f4189d 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -48,7 +48,5 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/ethercat/Makefile.nmake b/plugins/ethercat/Makefile.nmake deleted file mode 100644 index f19eaaa760..0000000000 --- a/plugins/ethercat/Makefile.nmake +++ /dev/null @@ -1,90 +0,0 @@ -# Makefile.nmake -# nmake file for EtherCAT plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -# -# Build plugin.c, which contains the plugin version[] string, a -# function plugin_register() that calls the register routines for all -# protocols, and a function plugin_reg_handoff() that calls the handoff -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# a plugin.c file for a plugin. -# All subsequent arguments are the files to scan. -# -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/ethercat/moduleinfo.nmake b/plugins/ethercat/moduleinfo.nmake deleted file mode 100644 index 800f0f4ea6..0000000000 --- a/plugins/ethercat/moduleinfo.nmake +++ /dev/null @@ -1,25 +0,0 @@ -# - -# The name -PACKAGE=ethercat - -# The version -MODULE_VERSION_MAJOR=0 -MODULE_VERSION_MINOR=1 -MODULE_VERSION_MICRO=0 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am index 87ef9b9ba3..9028d6d9eb 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/gryphon/Makefile.am @@ -50,7 +50,5 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake deleted file mode 100644 index d5a0422456..0000000000 --- a/plugins/gryphon/Makefile.nmake +++ /dev/null @@ -1,90 +0,0 @@ -# Makefile.nmake -# nmake file for Gryphon plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -# -# Build plugin.c, which contains the plugin version[] string, a -# function plugin_register() that calls the register routines for all -# protocols, and a function plugin_reg_handoff() that calls the handoff -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# a plugin.c file for a plugin. -# All subsequent arguments are the files to scan. -# -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/gryphon/moduleinfo.nmake b/plugins/gryphon/moduleinfo.nmake deleted file mode 100644 index 48cb650887..0000000000 --- a/plugins/gryphon/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=gryphon - -# The version -MODULE_VERSION_MAJOR=0 -MODULE_VERSION_MINOR=0 -MODULE_VERSION_MICRO=4 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am index bfd3a19ff4..f9a11d5d47 100644 --- a/plugins/irda/Makefile.am +++ b/plugins/irda/Makefile.am @@ -54,7 +54,5 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake deleted file mode 100644 index 0fac0f16e4..0000000000 --- a/plugins/irda/Makefile.nmake +++ /dev/null @@ -1,90 +0,0 @@ -# Makefile.nmake -# nmake file for Wireshark plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -# -# Build plugin.c, which contains the plugin version[] string, a -# function plugin_register() that calls the register routines for all -# protocols, and a function plugin_reg_handoff() that calls the handoff -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# a plugin.c file for a plugin. -# All subsequent arguments are the files to scan. -# -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/irda/moduleinfo.nmake b/plugins/irda/moduleinfo.nmake deleted file mode 100644 index 6696416496..0000000000 --- a/plugins/irda/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=irda - -# The version -MODULE_VERSION_MAJOR=0 -MODULE_VERSION_MINOR=0 -MODULE_VERSION_MICRO=6 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am index 9299675484..41114481c1 100644 --- a/plugins/m2m/Makefile.am +++ b/plugins/m2m/Makefile.am @@ -48,7 +48,5 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/m2m/Makefile.nmake b/plugins/m2m/Makefile.nmake deleted file mode 100644 index 3cfa63cdb7..0000000000 --- a/plugins/m2m/Makefile.nmake +++ /dev/null @@ -1,90 +0,0 @@ -# Makefile.nmake -# nmake file for M2M plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. /I../wimax $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -# -# Build plugin.c, which contains the plugin version[] string, a -# function plugin_register() that calls the register routines for all -# protocols, and a function plugin_reg_handoff() that calls the handoff -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# a plugin.c file for a plugin. -# All subsequent arguments are the files to scan. -# -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/m2m/moduleinfo.nmake b/plugins/m2m/moduleinfo.nmake deleted file mode 100644 index 2a7289d77d..0000000000 --- a/plugins/m2m/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=m2m - -# The version -MODULE_VERSION_MAJOR=1 -MODULE_VERSION_MINOR=1 -MODULE_VERSION_MICRO=0 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/m2m/wimax_tlv.c b/plugins/m2m/wimax_tlv.c index 1191ed7555..8da25eab24 100644 --- a/plugins/m2m/wimax_tlv.c +++ b/plugins/m2m/wimax_tlv.c @@ -30,8 +30,6 @@ /* both .../plugins/m2m and .../plugins/wimax. If either */ /* one needs to be modified, please be sure to copy the file */ /* to the sister directory and check it in there also. */ -/* This prevents having to generate a complicated */ -/* Makefile.nmake in .../plugins/m2m. */ /*************************************************************/ #include "config.h" diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index 4928f99b8c..ec98924550 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -72,8 +72,6 @@ EXTRA_DIST = \ mate_grammar.lemon \ mate_parser.l \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt \ examples/call.mate \ diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake deleted file mode 100644 index 7687be0d6e..0000000000 --- a/plugins/mate/Makefile.nmake +++ /dev/null @@ -1,142 +0,0 @@ -# Makefile.nmake -# nmake file for mate plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -LEMON=..\..\tools\lemon - -# We use DIRTY_CFLAGS to get around flex's non-LLP64-compliant output -DIRTY_CFLAGS=\ - $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) /I$(LEMON) \ - /I$(PCAP_DIR)\include - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(DIRTY_CFLAGS) - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -# -# Build plugin.c, which contains the plugin version[] string, a -# function plugin_register() that calls the register routines for all -# protocols, and a function plugin_reg_handoff() that calls the handoff -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# a plugin.c file for a plugin. -# All subsequent arguments are the files to scan. -# -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) $(NODIST_REGISTER_SRC_FILES) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -# -# We remove the Flex-generated files with "distclean" because files -# generated by Flex need 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 re-generate -# the files from the distribution that were generated by Flex. -# -distclean: clean - rm -f $(FLEX_GENERATED_SRC_FILES) \ - $(FLEX_GENERATED_HEADER_FILES) \ - $(NODIST_SRC_FILES) \ - $(NODIST_HEADER_FILES) \ - mate_grammar.out - -maintainer-clean: distclean - rm -f $(GENERATED_SRC_FILES) \ - $(GENERATED_HEADER_FILES) - -RUNLEX = ../../tools/runlex.sh - -# -# In order to generate mate_parser_lex.h, we need to run Flex on -# mate_parser.l; that's done by generating mate_parser.c. -# -mate_parser_lex.h : mate_parser.c - -# -# We compile this specially because it's Flex-generated and thus -# "warnings are errors" will fail because there's a bunch of -# warnings we can't eliminate. -# -# It depends on mate_grammar.h to force mate_grammar.h to be -# built before we try to compile it, as mate_parser.c includes -# mate_grammar.h, and mate_grammar.h is not distributed with -# the source (it's generated with Lemon). That means we can't -# use $?, as that would make it try to compile mate_grammar.h. -# -mate_parser.obj : mate_grammar.h -mate_parser.obj : mate_parser.c - $(CC) $(DIRTY_CFLAGS) -Fd.\ -c mate_parser.c - -mate_grammar.h : mate_grammar.c -mate_grammar.c : mate_grammar.lemon $(LEMON)\lemon.exe - $(LEMON)\lemon.exe T=$(LEMON)\lempar.c mate_grammar.lemon - -$(LEMON)\lemon.exe: - cd ../../tools - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake lemon - cd ../plugins/mate - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/mate/moduleinfo.nmake b/plugins/mate/moduleinfo.nmake deleted file mode 100644 index 8ae3a8d706..0000000000 --- a/plugins/mate/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=mate - -# The version -MODULE_VERSION_MAJOR=1 -MODULE_VERSION_MINOR=0 -MODULE_VERSION_MICRO=0 -MODULE_VERSION_EXTRA=1 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am index 619d3bfaa0..94279a1788 100644 --- a/plugins/opcua/Makefile.am +++ b/plugins/opcua/Makefile.am @@ -49,8 +49,6 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ README \ CMakeLists.txt diff --git a/plugins/opcua/Makefile.nmake b/plugins/opcua/Makefile.nmake deleted file mode 100644 index fd1f19b0bd..0000000000 --- a/plugins/opcua/Makefile.nmake +++ /dev/null @@ -1,90 +0,0 @@ -# Makefile.nmake -# nmake file for OpcUa plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -# -# Build plugin.c, which contains the plugin version[] string, a -# function plugin_register() that calls the register routines for all -# protocols, and a function plugin_reg_handoff() that calls the handoff -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# a plugin.c file for a plugin. -# All subsequent arguments are the files to scan. -# -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/opcua/moduleinfo.nmake b/plugins/opcua/moduleinfo.nmake deleted file mode 100644 index 430c4733e1..0000000000 --- a/plugins/opcua/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=opcua - -# The version -MODULE_VERSION_MAJOR=1 -MODULE_VERSION_MINOR=0 -MODULE_VERSION_MICRO=0 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am index 90f78ae9a4..e650ce0bbe 100644 --- a/plugins/profinet/Makefile.am +++ b/plugins/profinet/Makefile.am @@ -48,7 +48,5 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/profinet/Makefile.nmake b/plugins/profinet/Makefile.nmake deleted file mode 100644 index dc67e64273..0000000000 --- a/plugins/profinet/Makefile.nmake +++ /dev/null @@ -1,90 +0,0 @@ -# Makefile.nmake -# nmake file for PROFINET plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -# -# Build plugin.c, which contains the plugin version[] string, a -# function plugin_register() that calls the register routines for all -# protocols, and a function plugin_reg_handoff() that calls the handoff -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# a plugin.c file for a plugin. -# All subsequent arguments are the files to scan. -# -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/profinet/moduleinfo.nmake b/plugins/profinet/moduleinfo.nmake deleted file mode 100644 index 3f05019f58..0000000000 --- a/plugins/profinet/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=profinet - -# The version -MODULE_VERSION_MAJOR=0 -MODULE_VERSION_MINOR=2 -MODULE_VERSION_MICRO=4 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am index 07c9ffa049..fe1f099439 100644 --- a/plugins/stats_tree/Makefile.am +++ b/plugins/stats_tree/Makefile.am @@ -45,7 +45,5 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake deleted file mode 100644 index 35123af5d9..0000000000 --- a/plugins/stats_tree/Makefile.nmake +++ /dev/null @@ -1,58 +0,0 @@ -# Makefile.nmake -# nmake file for stats_tree plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fdstats_tree.pdb -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/stats_tree/moduleinfo.nmake b/plugins/stats_tree/moduleinfo.nmake deleted file mode 100644 index 5f454e7edc..0000000000 --- a/plugins/stats_tree/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=stats_tree - -# The version -MODULE_VERSION_MAJOR=0 -MODULE_VERSION_MINOR=0 -MODULE_VERSION_MICRO=1 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/tpg/Makefile.am b/plugins/tpg/Makefile.am index c8d1220cda..890d289132 100644 --- a/plugins/tpg/Makefile.am +++ b/plugins/tpg/Makefile.am @@ -54,7 +54,6 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ http.tpg \ - Makefile.nmake \ CMakeLists.txt TPG = $(top_builddir)/tools/tpg diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake deleted file mode 100644 index e10daf85cc..0000000000 --- a/plugins/tpg/Makefile.nmake +++ /dev/null @@ -1,66 +0,0 @@ -# - -include ..\..\config.nmake - -############### no need to modify below this line ######### - -LEMON=..\..\tools\lemon - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) /I$(LEMON) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fdmate.pdb -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=$(CFLAGS) - -OBJECTS=packet-mate.obj\ - mate_setup.obj\ - mate_runtime.obj\ - mate_util.obj\ - mate_plugin.obj\ - mate_grammar.obj\ - mate_parser.obj - -mate.dll mate.exp mate.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) - link -dll /out:mate.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) - -!ENDIF - -clean: - rm -f $(OBJECTS) mate.dll mate.exp mate.lib *.nativecodeanalysis.xml *.pdb *.sbr - -# -# We remove the generated files with "distclean" because one of them, -# "mate_parser.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 "mate_parser.c" from "mate_parser.l" with Flex. -# This might not be necessary for "mate_grammar.{c,h}", but we handle them -# the same for now. -# -distclean: clean - rm -f mate_parser.c mate_grammar.c mate_grammar.h mate_grammar.out - -maintainer-clean: distclean - -mate_parser.c : mate_parser.l - $(LEX) -Pdf_ -omate_parser.c mate_parser.l - -mate_grammar.h : mate_grammar.c -mate_grammar.c : mate_grammar.lemon $(LEMON)\lemon.exe - $(LEMON)\lemon.exe T=$(LEMON)\lempar.c mate_grammar.lemon - -$(LEMON)\lemon.exe: - cd ../../tools - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake lemon - cd ../plugins/mate - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build $(DISSECTOR_SRC) $(DISSECTOR_INCLUDES) diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am index 635846b83a..2664f724db 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/unistim/Makefile.am @@ -49,7 +49,5 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/unistim/Makefile.nmake b/plugins/unistim/Makefile.nmake deleted file mode 100644 index 40c743d20b..0000000000 --- a/plugins/unistim/Makefile.nmake +++ /dev/null @@ -1,90 +0,0 @@ -# Makefile.nmake -# nmake file for Unistim plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -# -# Build plugin.c, which contains the plugin version[] string, a -# function plugin_register() that calls the register routines for all -# protocols, and a function plugin_reg_handoff() that calls the handoff -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# a plugin.c file for a plugin. -# All subsequent arguments are the files to scan. -# -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/unistim/moduleinfo.nmake b/plugins/unistim/moduleinfo.nmake deleted file mode 100644 index 6ea8058f35..0000000000 --- a/plugins/unistim/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=unistim - -# The version -MODULE_VERSION_MAJOR=0 -MODULE_VERSION_MINOR=0 -MODULE_VERSION_MICRO=2 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am index a270766439..e4d6bd64e2 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/wimax/Makefile.am @@ -48,8 +48,6 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt \ README.wimax diff --git a/plugins/wimax/Makefile.nmake b/plugins/wimax/Makefile.nmake deleted file mode 100644 index ddfcd0a567..0000000000 --- a/plugins/wimax/Makefile.nmake +++ /dev/null @@ -1,90 +0,0 @@ -# Makefile.nmake -# nmake file for WiMAX plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -# -# Build plugin.c, which contains the plugin version[] string, a -# function plugin_register() that calls the register routines for all -# protocols, and a function plugin_reg_handoff() that calls the handoff -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# a plugin.c file for a plugin. -# All subsequent arguments are the files to scan. -# -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/wimax/moduleinfo.nmake b/plugins/wimax/moduleinfo.nmake deleted file mode 100644 index 2a7289d77d..0000000000 --- a/plugins/wimax/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=m2m - -# The version -MODULE_VERSION_MAJOR=1 -MODULE_VERSION_MINOR=1 -MODULE_VERSION_MICRO=0 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/wimax/wimax_tlv.c b/plugins/wimax/wimax_tlv.c index 8c66b868bc..8da79b6300 100644 --- a/plugins/wimax/wimax_tlv.c +++ b/plugins/wimax/wimax_tlv.c @@ -30,8 +30,6 @@ /* both .../plugins/m2m and .../plugins/wimax. If either */ /* one needs to be modified, please be sure to copy the file */ /* to the sister directory and check it in there also. */ -/* This prevents having to generate a complicated */ -/* Makefile.nmake in .../plugins/m2m. */ /*************************************************************/ #include "config.h" diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index 2e265fbe6f..8aa916d36e 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -61,8 +61,6 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ wimaxasncp_dict.l \ CMakeLists.txt diff --git a/plugins/wimaxasncp/Makefile.nmake b/plugins/wimaxasncp/Makefile.nmake deleted file mode 100644 index abcad7723e..0000000000 --- a/plugins/wimaxasncp/Makefile.nmake +++ /dev/null @@ -1,121 +0,0 @@ -# Makefile.nmake -# nmake file for wimaxasncp plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -# We use DIRTY_CFLAGS to get around flex's non-LLP64-compliant output -DIRTY_CFLAGS=\ - $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) /I$(LEMON) \ - /I$(PCAP_DIR)\include - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(DIRTY_CFLAGS) - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -# -# Build plugin.c, which contains the plugin version[] string, a -# function plugin_register() that calls the register routines for all -# protocols, and a function plugin_reg_handoff() that calls the handoff -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# a plugin.c file for a plugin. -# All subsequent arguments are the files to scan. -# -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) $(NODIST_REGISTER_SRC_FILES) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -# -# We remove the Flex-generated files with "distclean" because files -# generated by Flex need 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 re-generate -# the files from the distribution that were generated by Flex. -# -distclean: clean - rm -f $(FLEX_GENERATED_SRC_FILES) \ - $(FLEX_GENERATED_HEADER_FILES) - -maintainer-clean: distclean - rm -f $(GENERATED_SRC_FILES) \ - $(GENERATED_HEADER_FILES) - -RUNLEX = ../../tools/runlex.sh - -# -# In order to generate wimaxasncp_dict_lex.h, we need to run Flex on -# wimaxasncp_dict.l; that's done by generating wimaxasncp_dict.c. -# -wimaxasncp_dict_lex.h : wimaxasncp_dict.c - -# -# We compile this specially because it's Flex-generated and thus -# "warnings are errors" will fail because there's a bunch of -# warnings we can't eliminate. -# -wimaxasncp_dict.obj : wimaxasncp_dict.c - $(CC) $(DIRTY_CFLAGS) -Fd.\ -c $? - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/wimaxasncp/moduleinfo.nmake b/plugins/wimaxasncp/moduleinfo.nmake deleted file mode 100644 index ccf7a4abf6..0000000000 --- a/plugins/wimaxasncp/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=wimaxasncp - -# The version -MODULE_VERSION_MAJOR=0 -MODULE_VERSION_MINOR=0 -MODULE_VERSION_MICRO=1 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am index 9033b90213..d7b7360395 100644 --- a/plugins/wimaxmacphy/Makefile.am +++ b/plugins/wimaxmacphy/Makefile.am @@ -48,7 +48,5 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ Makefile.common \ - Makefile.nmake \ - moduleinfo.nmake \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/wimaxmacphy/Makefile.nmake b/plugins/wimaxmacphy/Makefile.nmake deleted file mode 100644 index dce0967719..0000000000 --- a/plugins/wimaxmacphy/Makefile.nmake +++ /dev/null @@ -1,90 +0,0 @@ -# Makefile.nmake -# nmake file for wimaxmacphy plugin -# - -include ..\..\config.nmake -include ..\..\Makefile.nmake.inc - -include moduleinfo.nmake - -include Makefile.common - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /I../.. $(GLIB_CFLAGS) \ - /I$(PCAP_DIR)\include - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -LDFLAGS = $(PLUGIN_LDFLAGS) - -!IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=$(CFLAGS) - -OBJECTS = $(C_FILES:.c=.obj) $(CPP_FILES:.cpp=.obj) plugin.obj - -RESOURCE=$(PLUGIN_NAME).res - -all: $(PLUGIN_NAME).dll - -$(PLUGIN_NAME).rc : moduleinfo.nmake - sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \ - -e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_VERSION)/ \ - -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \ - -e s/@PACKAGE@/$(PACKAGE)/ \ - -e s/@VERSION@/$(VERSION)/ \ - -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \ - < plugin.rc.in > $@ - -$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE) - link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ - $(GLIB_LIBS) $(RESOURCE) - -# -# Build plugin.c, which contains the plugin version[] string, a -# function plugin_register() that calls the register routines for all -# protocols, and a function plugin_reg_handoff() that calls the handoff -# registration routines for all protocols. -# -# We do this by scanning sources. If that turns out to be too slow, -# maybe we could just require every .o file to have an register routine -# of a given name (packet-aarp.o -> proto_register_aarp, etc.). -# -# Formatting conventions: The name of the proto_register_* routines an -# proto_reg_handoff_* routines must start in column zero, or must be -# preceded only by "void " starting in column zero, and must not be -# inside #if. -# -# REGISTER_SRC_FILES is assumed to have all the files that need to be scanned. -# -# For some unknown reason, having a big "for" loop in the Makefile -# to scan all the files doesn't work with some "make"s; they seem to -# pass only the first few names in the list to the shell, for some -# reason. -# -# Therefore, we use a script to generate the register.c file. -# The first argument is the directory in which the source files live. -# The second argument is "plugin", to indicate that we should build -# a plugin.c file for a plugin. -# All subsequent arguments are the files to scan. -# -plugin.c: $(REGISTER_SRC_FILES) moduleinfo.h Makefile.common ../../tools/make-dissector-reg.py - @echo Making plugin.c - @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(REGISTER_SRC_FILES) - -!ENDIF - -clean: - rm -f $(OBJECTS) $(RESOURCE) plugin.c *.nativecodeanalysis.xml *.pdb *.sbr \ - $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(CLEAN_SRC_FILES) $(CLEAN_HEADER_FILES) diff --git a/plugins/wimaxmacphy/moduleinfo.nmake b/plugins/wimaxmacphy/moduleinfo.nmake deleted file mode 100644 index 14d71c1539..0000000000 --- a/plugins/wimaxmacphy/moduleinfo.nmake +++ /dev/null @@ -1,26 +0,0 @@ -# - -# The name -PACKAGE=wimaxmacphy - -# The version -MODULE_VERSION_MAJOR=0 -MODULE_VERSION_MINOR=0 -MODULE_VERSION_MICRO=1 -MODULE_VERSION_EXTRA=0 - -# -# The RC_VERSION should be comma-separated, not dot-separated, -# as per Graham Bloice's message in -# -# http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html -# -# "The RC_VERSION variable in config.nmake should be comma separated. -# This allows the resources to be built correctly and the version -# number to be correctly displayed in the explorer properties dialog -# for the executables, and XP's tooltip, rather than 0.0.0.0." -# - -MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA) -RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA) - diff --git a/randpkt_core/Makefile.am b/randpkt_core/Makefile.am index a3cb84090c..5f8456784d 100644 --- a/randpkt_core/Makefile.am +++ b/randpkt_core/Makefile.am @@ -68,5 +68,4 @@ EXTRA_DIST = \ $(GENERATOR_FILES) \ CMakeLists.txt \ doxygen.cfg.in \ - Makefile.common \ - Makefile.nmake + Makefile.common diff --git a/randpkt_core/Makefile.nmake b/randpkt_core/Makefile.nmake deleted file mode 100644 index d834d9d7bd..0000000000 --- a/randpkt_core/Makefile.nmake +++ /dev/null @@ -1,73 +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) - -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 -RANDPKT_CORE_OBJECTS = \ - $(RANDPKT_CORE_SRC:.c=.obj) - -RUNLEX=../tools/runlex.sh - -librandpkt_core.lib : ..\config.h $(RANDPKT_CORE_OBJECTS) - link /lib /out:librandpkt_core.lib $(RANDPKT_CORE_OBJECTS) - -clean: - rm -f $(RANDPKT_CORE_OBJECTS) librandpkt_core.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 \ - $(RANDPKT_CORE_SRC) - -checkapi-todo: - $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ - $(RANDPKT_CORE_SRC) diff --git a/test/suite-unittests.sh b/test/suite-unittests.sh index b9e77905a0..d7186b3a4a 100755 --- a/test/suite-unittests.sh +++ b/test/suite-unittests.sh @@ -41,7 +41,7 @@ TOOL_SEARCH_PATHS=" check_dut() { TEST_EXE="" - # WS_BIN_PATH must be checked first, otherwise when using Nmake + # WS_BIN_PATH must be checked first, otherwise # we'll find a non-functional program in epan or epan/wmem. for TEST_PATH in $TOOL_SEARCH_PATHS ; do if [ -x "$TEST_PATH/$1" ]; then diff --git a/tools/Makefile.am b/tools/Makefile.am index 22beddcd27..9e9f69c5a3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -59,7 +59,6 @@ EXTRA_DIST = \ install_rpms_for_devel.sh \ lex.py \ list_protos_in_cap.sh \ - Makefile.nmake \ make-dissector-reg.py \ make-manuf \ make-sminmpec.pl \ @@ -69,7 +68,6 @@ EXTRA_DIST = \ make-usb.py \ make_charset_table.c \ msnchat \ - native-nmake.cmd \ ncp2222.py \ netscreen2dump.py \ npl \ @@ -95,7 +93,6 @@ EXTRA_DIST = \ valgrind-wireshark.sh \ vg-suppressions \ win-setup.ps1 \ - win-setup.sh \ wireshark_be.py \ wireshark_gen.py \ WiresharkXML.py \ diff --git a/tools/Makefile.nmake b/tools/Makefile.nmake deleted file mode 100644 index e89f47d045..0000000000 --- a/tools/Makefile.nmake +++ /dev/null @@ -1,31 +0,0 @@ -## Makefile for building wireshark.exe with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake - -all: lemon - -clean-local: - rm -f *.pyc - -clean: clean-local - cd lemon - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean - cd .. - -distclean-local: clean-local - -distclean: distclean-local - cd lemon - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean - cd .. - -maintainer-clean-local: distclean-local - -maintainer-clean: maintainer-clean-local - cd lemon - $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean - cd .. - -lemon:: - cd lemon - ..\native-nmake $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake - cd .. diff --git a/tools/delete_includes.py b/tools/delete_includes.py index 20cdf6f1dd..249b722668 100755 --- a/tools/delete_includes.py +++ b/tools/delete_includes.py @@ -41,7 +41,7 @@ if lastdir == 'tools': # Make command depends upon platform. if sys.platform.startswith('win'): - default_make_command = ['nmake', '-f', 'Makefile.nmake'] + default_make_command = ['msbuild', '/m', '/p:Configuration=RelWithDebInfo', 'Wireshark.sln'] else: default_make_command = ['make'] diff --git a/tools/lemon/Makefile.am b/tools/lemon/Makefile.am index 605f0744fb..476f844608 100644 --- a/tools/lemon/Makefile.am +++ b/tools/lemon/Makefile.am @@ -48,6 +48,5 @@ EXTRA_DIST = \ lemonflex-head.inc \ lemonflex-tail.inc \ lempar.c \ - Makefile.nmake \ README \ CMakeLists.txt diff --git a/tools/lemon/Makefile.nmake b/tools/lemon/Makefile.nmake deleted file mode 100644 index fe9ff34442..0000000000 --- a/tools/lemon/Makefile.nmake +++ /dev/null @@ -1,19 +0,0 @@ -## Makefile for building wireshark.exe with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# - -include ..\..\config.nmake - -CFLAGS=$(WARNINGS_ARE_ERRORS) -I..\..\ $(LOCAL_CFLAGS) - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -all : lemon.exe - -clean: - rm -f lemon.obj lemon.exe lemon.ilk *.nativecodeanalysis.xml *.pdb *.sbr lemon.exe.manifest - -distclean: clean - -maintainer-clean: distclean diff --git a/tools/make-dissector-reg.py b/tools/make-dissector-reg.py index 947b581a6e..38efc15976 100755 --- a/tools/make-dissector-reg.py +++ b/tools/make-dissector-reg.py @@ -48,8 +48,7 @@ elif registertype in ("dissectors", "dissectorsinfile"): * Do not modify this file. Changes will be overwritten. * * Generated automatically by the "register.c" target in - * epan/dissectors/Makefile or Makefile.nmake using - * %s + * epan/dissectors/Makefile using %s * and information in epan/dissectors/register-cache.pkl. * * You can force this file to be regenerated completely by deleting diff --git a/tools/native-nmake.cmd b/tools/native-nmake.cmd deleted file mode 100755 index 5d95c9a7a1..0000000000 --- a/tools/native-nmake.cmd +++ /dev/null @@ -1,13 +0,0 @@ -@echo off - -rem -set WIRESHARK_TARGET_PLATFORM= - -if NOT DEFINED VCINSTALLDIR goto RUN_NMAKE - -if NOT EXIST "%VCINSTALLDIR%\vcvarsall.bat" goto RUN_NMAKE - -call "%VCINSTALLDIR%\vcvarsall.bat" - -:RUN_NMAKE -%1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/tools/tpg/Makefile.am b/tools/tpg/Makefile.am index 52ceac1e60..b937b50735 100644 --- a/tools/tpg/Makefile.am +++ b/tools/tpg/Makefile.am @@ -37,7 +37,6 @@ EXTRA_DIST = \ V2P.pl \ TPG.pm \ tpg.pl \ - Makefile.nmake \ README TPG.pm: tpg.yp diff --git a/tools/tpg/Makefile.nmake b/tools/tpg/Makefile.nmake deleted file mode 100644 index 214b9f767e..0000000000 --- a/tools/tpg/Makefile.nmake +++ /dev/null @@ -1,14 +0,0 @@ -## Makefile for building wireshark.exe with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# - -include ..\..\config.nmake - -all : TPG.pm - -clean: - rm -f TPG.pm tpg.output - -distclean: clean - -maintainer-clean: distclean diff --git a/tools/win-setup.sh b/tools/win-setup.sh deleted file mode 100755 index 023975f134..0000000000 --- a/tools/win-setup.sh +++ /dev/null @@ -1,244 +0,0 @@ -#!/bin/bash -# -# Copyright 2013 Gerald Combs <gerald@wireshark.org> -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# The cygwin version of bash has an option to ignore the extra CR at -# the end of a script line that would cause an error otherwise. Use this -# option if supported. -# Note: The following line must be the first non-comment line -(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed as well - -err_exit () { - echo "" - echo "ERROR: $1" - shift - for str in "$@" ; do - echo "$str" - done - echo "" - exit 1 -} - -usage () { - echo "Usage:" - echo " $0 --appverify <appname> [<appname>] ..." - echo " $0 --libverify <destination> <subdirectory> <package>" - echo " $0 --download <destination> <subdirectory> <package> <tag> <platform>" - echo " $0 --settag <destination> <tag>" - echo " $0 --checktag <destination> <tag>" - echo "" - exit 1 -} - -# Try to find our proxy settings, and set http_proxy/use_proxy accordingly. -find_proxy() { - # Someone went to the trouble of configuring wget. - if grep "^use_proxy *= *on" $HOME/.wgetrc > /dev/null 2>&1 ; then - return - fi - - # ...and wget can't fetch two registry keys because...? - proxy_enabled=$(regtool get /HKCU/Software/Microsoft/Windows/CurrentVersion/Internet\ Settings/ProxyEnable 2>/dev/null | tr -d '\012') - # - # Bash's test command appears not to use short-circuit evaluation, - # so - # - # -n "$proxy_enabled" -a "$proxy_enabled" -ne 0 - # - # causes a complaint if "$proxy_enabled" is an empty string - - # the first test fails, but the second test is done anyway, - # and generates a complaint about the LHS of -ne not being - # numeric. Therefore, we do the tests separately. - # - if [ -n "$proxy_enabled" ] ; then - if [ "$proxy_enabled" -ne 0 ] ; then - export http_proxy=$(regtool get /HKCU/Software/Microsoft/Windows/CurrentVersion/Internet\ Settings/ProxyServer 2>/dev/null) - echo "Using Internet Explorer proxy settings." - fi - fi - - if [ -z "$http_proxy" -a -z "$HTTP_PROXY" ] ; then - echo "No HTTP proxy specified (http_proxy and HTTP_PROXY are empty)." - # a proxy might also be specified using .wgetrc, so don't switch off the proxy - #use_proxy="-Y off" - return - fi - - # We found a proxy somewhere - use_proxy="-Y on" - if [ -z "$http_proxy" ] ; then - echo "HTTP proxy ($HTTP_PROXY) has been specified and will be used." - export http_proxy=$HTTP_PROXY - else - echo "HTTP proxy ($http_proxy) has been specified and will be used." - fi -} - -# Main -TAG_FILE="current_tag.txt" -if [ -z "$*" ] ; then - usage -fi -case "$1" in ---appverify) - shift - if [ -z "$*" ] ; then - usage - fi - - echo "Checking for required applications:" - which which > /dev/null 2>&1 || \ - err_exit "Can't find 'which'. Unable to proceed." - - MISSING_APPS= - PATH_RE="" - for APP in $* ; do - - case "$APP" in - --windowsonly) - PATH_RE="^/cygdrive/.*/" - continue - ;; - --cygwinonly) - PATH_RE="^/usr/.*/" - continue - ;; - esac - - APP_PATH=$(cygpath --unix "$APP") - if [ -x "$APP_PATH" -a ! -d "$APP_PATH" ] ; then - APP_LOC="$APP_PATH" - else - APP_LOC=$(which "$APP_PATH" 2> /dev/null) - fi - echo "$APP_LOC" | grep "$PATH_RE" > /dev/null 2>&1 - IN_PATH=$? - if [ "$APP_LOC" = "" -o $IN_PATH -ne 0 ] ; then - MISSING_APPS="$MISSING_APPS $APP" - else - echo " $APP: $APP_LOC $res" - fi - - PATH_RE="" - done - - if [ -n "$MISSING_APPS" ]; then - echo - echo "Can't find: $MISSING_APPS" - err_exit "These application(s) are either not installed or simply can't be found in the current PATH: $PATH." \ - "" "For additional help, please visit:" " http://www.wireshark.org/docs/wsdg_html_chunked/ChSetupWin32.html" - fi - ;; ---libverify) - if [ -z "$2" -o -z "$3" -o -z "$4" ] ; then - usage - fi - DEST_PATH=$(cygpath "$2") - PACKAGE_PATH=$4 - PACKAGE=$(basename "$PACKAGE_PATH") - if [ ! -e "$DEST_PATH/$PACKAGE" ] ; then - err_exit "Package $PACKAGE is needed but is apparently not downloaded; 'nmake -f ... setup' required ?" - fi - ;; ---download) - if [ -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" -o -z "$6" ] ; then - usage - fi - DEST_PATH=$(cygpath "$2") - DEST_SUBDIR=$3 - PACKAGE_PATH=$4 - DOWNLOAD_TAG=$5 - WIRESHARK_TARGET_PLATFORM=$6 - - if [ -z "$WIRESHARK_TARGET_PLATFORM" ]; then - err_exit "WIRESHARK_TARGET_PLATFORM not defined" - fi - # DOWNLOAD_PREFIX MUST be in the form - # http://anonsvn.wireshark.org/wireshark-win32-libs/tags/<date>/packages - # or - # http://anonsvn.wireshark.org/wireshark-win64-libs/tags/<date>/packages - # or - # /packages to test uploads before creating the tag. - #DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/trunk/packages" - DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/tags/$DOWNLOAD_TAG/packages" - - PACKAGE=$(basename "$PACKAGE_PATH") - echo "" - echo "****** $PACKAGE ******" - find_proxy - echo "Downloading $4 into '$DEST_PATH', installing into $3" - if [ ! -d "$DEST_PATH/$DEST_SUBDIR" ] ; then - mkdir -p "$DEST_PATH/$DEST_SUBDIR" || \ - err_exit "Can't create '$DEST_PATH/$DEST_SUBDIR'" - fi - cd "$DEST_PATH" || err_exit "Can't find '$DEST_PATH'" - PKG_PATH="$PWD" - wget $use_proxy -nc "$DOWNLOAD_PREFIX/$PACKAGE_PATH" || \ - err_exit "Can't download $DOWNLOAD_PREFIX/$PACKAGE_PATH" - cd "$DEST_SUBDIR" || err_exit "Can't find $DEST_SUBDIR" - echo "Extracting '$PKG_PATH/$PACKAGE' into '$PKG_PATH/$DEST_SUBDIR'" - if [[ "$PACKAGE" == *.zip ]] ; then - unzip -oq "$PKG_PATH/$PACKAGE" || - err_exit "Couldn't unpack '$PKG_PATH/$PACKAGE'" - echo "Verifying that the DLLs and EXEs in $DEST_SUBDIR are executable." - # XX: Note that find will check *all* dlls/exes in DEST_SUBDIR and below - # which may be more than those just unzipped depending upon DEST_SUBDIR. - # This may cause extra repeated checks but will do no harm. - for i in $(/usr/bin/find . \( -name '*\.dll' -o -name '*\.exe' \)) ; do - if [ ! -x "$i" ] ; then - echo "Changing file permissions (add executable bit) to:" - echo "$i" - chmod a+x "$i" - fi - done - fi - ;; ---settag) - if [ -z "$2" -o -z "$3" ] ; then - usage - fi - DEST_PATH=$(cygpath "$2") - DOWNLOAD_TAG=$3 - echo "$DOWNLOAD_TAG" > "$DEST_PATH/$TAG_FILE" - ;; ---checktag) - if [ -z "$2" -o -z "$3" ] ; then - usage - fi - DEST_PATH=$(cygpath "$2") - WIN_PATH=$(cygpath --windows "$2") - DOWNLOAD_TAG=$3 - LAST_TAG=$(cat "$DEST_PATH/$TAG_FILE" 2> /dev/null) - if [ "$DOWNLOAD_TAG" != "$LAST_TAG" ] ; then - if [ -z "$LAST_TAG" ] ; then - LAST_TAG="(unknown)" - fi - err_exit \ - "The contents of '$WIN_PATH\\$TAG_FILE' is $LAST_TAG." \ - "It should be $DOWNLOAD_TAG." - fi - ;; -*) - usage - ;; -esac - -exit 0 diff --git a/ui/Makefile.am b/ui/Makefile.am index a1185688bf..befc051784 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -86,5 +86,4 @@ EXTRA_DIST = \ CMakeLists.txt \ doxygen.cfg.in \ Makefile.common \ - Makefile.nmake \ win32 diff --git a/ui/Makefile.nmake b/ui/Makefile.nmake deleted file mode 100644 index 55fe06d036..0000000000 --- a/ui/Makefile.nmake +++ /dev/null @@ -1,85 +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) $(WINSPARKLE_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 -WIRESHARK_UI_OBJECTS = \ - $(WIRESHARK_UI_SRC:.c=.obj) \ - $(GENERATED_C_FILES:.c=.obj) \ - $(DIRTY_GENERATED_C_FILES:.c=.obj) - -RUNLEX=../tools/runlex.sh - -text_import_scanner.h: text_import_scanner.c -text_import_scanner_lex.h: text_import_scanner.c -text_import_scanner.obj : text_import_scanner.c - $(CC) $(GENERATED_CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $? - -libui.lib : ..\config.h $(WIRESHARK_UI_OBJECTS) - link /lib /out:libui.lib $(WIRESHARK_UI_OBJECTS) - -clean: - rm -f $(WIRESHARK_UI_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libui.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 \ - $(WIRESHARK_UI_SRC) - -checkapi-todo: - $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ - $(WIRESHARK_UI_SRC) 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) diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am index 2ccbd86919..c9c8b071e6 100644 --- a/ui/gtk/Makefile.am +++ b/ui/gtk/Makefile.am @@ -67,7 +67,6 @@ EXTRA_DIST = \ main_airpcap_toolbar.c \ main_airpcap_toolbar.h \ Makefile.common \ - Makefile.nmake \ Makefile_custom.common \ pixbuf-csource.c \ pixbuf-csource.h diff --git a/ui/gtk/Makefile.nmake b/ui/gtk/Makefile.nmake deleted file mode 100644 index f2cf3968ee..0000000000 --- a/ui/gtk/Makefile.nmake +++ /dev/null @@ -1,176 +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../.. $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \ - $(ZLIB_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 -WIRESHARK_CLEAN_LIBGTKUI_SRC = \ - $(WIRESHARK_COMMON_GTK_SRC) \ - $(WIRESHARK_TAP_SRC) \ - $(GENERATED_FILES) \ - airpcap_dlg.c \ - airpcap_gui_utils.c \ - capture_if_details_dlg_win32.c \ - main_airpcap_toolbar.c \ - pixbuf-csource.c \ - extcap_gtk.c - -WIRESHARK_LIBGTKUI_SRC = \ - $(WIRESHARK_CLEAN_LIBGTKUI_SRC) - -PORT_AUDIO_SRC = \ -!IFDEF PORTAUDIO_DIR -!IF "$(PORTAUDIO_VERSION)" == "18" - pa_lib.c \ -!ELSE - pa_allocation.c \ - pa_converters.c \ - pa_cpuload.c \ - pa_dither.c \ - pa_front.c \ - pa_process.c \ - pa_skeleton.c \ - pa_stream.c \ - pa_trace.c \ - pa_win_util.c \ - pa_win_hostapis.c \ - pa_x86_plain_converters.c \ - pa_win_waveformat.c \ -!ENDIF - pa_win_wmme.c -!ENDIF - -WIRESHARK_LIBGTKUI_OBJECTS = \ - $(WIRESHARK_LIBGTKUI_SRC:.c=.obj) \ - $(PORT_AUDIO_SRC:.c=.obj) - -libgtkui.lib: ..\..\config.h $(WIRESHARK_LIBGTKUI_OBJECTS) - link /lib /out:libgtkui.lib $(WIRESHARK_LIBGTKUI_OBJECTS) winmm.lib - -# The first argument is the directory in which the source files live. -# The second argument is "taps", to indicate that we should build -# a tap register file. -# All subsequent arguments are the files to scan. -# -wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) Makefile.common Makefile_custom.common ../../tools/make-tap-reg.py - @echo Making wireshark-tap-register.c - @$(PYTHON) "../../tools/make-tap-reg.py" . taps $(WIRESHARK_TAP_SRC) - -!IF "$(PORTAUDIO_VERSION)" == "18" -pa_lib.obj: $(PORTAUDIO_DIR)\pa_common\pa_lib.c - $(CC) -c $(LOCAL_CFLAGS) $? - -pa_win_wmme.obj: $(PORTAUDIO_DIR)\pa_win_wmme\pa_win_wmme.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? -!ELSE -pa_front.obj: $(PORTAUDIO_DIR)\src\common\pa_front.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_allocation.obj: $(PORTAUDIO_DIR)\src\common\pa_allocation.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_converters.obj: $(PORTAUDIO_DIR)\src\common\pa_converters.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_cpuload.obj: $(PORTAUDIO_DIR)\src\common\pa_cpuload.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_dither.obj: $(PORTAUDIO_DIR)\src\common\pa_dither.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_process.obj: $(PORTAUDIO_DIR)\src\common\pa_process.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_skeleton.obj: $(PORTAUDIO_DIR)\src\common\pa_skeleton.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_stream.obj: $(PORTAUDIO_DIR)\src\common\pa_stream.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_trace.obj: $(PORTAUDIO_DIR)\src\common\pa_trace.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_win_wmme.obj: $(PORTAUDIO_DIR)\src\hostapi\wmme\pa_win_wmme.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_win_util.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_util.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_win_hostapis.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_hostapis.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_x86_plain_converters.obj: $(PORTAUDIO_DIR)\src\os\win\pa_x86_plain_converters.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -pa_win_waveformat.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_waveformat.c - $(CC) -c $(LOCAL_CFLAGS) $(PORTAUDIO_CFLAGS) $? - -!ENDIF - -clean: - rm -f $(WIRESHARK_LIBGTKUI_OBJECTS) libgtkui.lib *.nativecodeanalysis.xml *.pdb *.sbr \ - doxygen.cfg html/*.* wireshark-tap-register-cache.pkl \ - wireshark-tap-register.c-tmp - 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 \ - $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \ - $(WIRESHARK_TAP_SRC) - -checkapi-todo: - $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ - $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \ - $(WIRESHARK_TAP_SRC) diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index 90633af04c..435d494e16 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -326,8 +326,6 @@ endif # HAVE_DOXYGEN #checkapi: checkapi-base checkapi-todo -# XXX to be created -# Makefile.nmake EXTRA_DIST = \ $(GENERATOR_FILES) \ $(UI_FILES) \ diff --git a/ui/qt/Wireshark.pro b/ui/qt/Wireshark.pro index adcc95eaf9..d99cb17a53 100644 --- a/ui/qt/Wireshark.pro +++ b/ui/qt/Wireshark.pro @@ -29,11 +29,7 @@ isEqual(QT_MAJOR_VERSION, 4) { QT += core widgets printsupport multimedia } -isEqual(QT_MAJOR_VERSION, 5): greaterThan(QT_MINOR_VERSION, 1): win32 { - QT += winextras -} - -win32|macx { +macx { TARGET = Wireshark } else { TARGET = wireshark @@ -62,8 +58,6 @@ xxx { isEmpty (QMAKE_EXTENSION_SHLIB) { macx { QMAKE_EXTENSION_SHLIB=".dylib" - } else: win32 { - QMAKE_EXTENSION_SHLIB=".dll" } else { # Everyone else runs Linux or Solaris, right? QMAKE_EXTENSION_SHLIB=".so" } @@ -111,55 +105,6 @@ unix { } } -win32 { - # Note: - # Windows Wireshark is compiled with /MD and thus must - # be linked with the "release" versions of the Qt libraries - # which are also compiled with /MD. - # - # Also: Windows Wireshark is compiled with /Zi and linked with /DEBUG - # which enables source level Wireshark debugging using the - # Windows Visual Studio debugger. - # So: QMAKE_CFLAGS, QMAKE_CXXFLAGS and QMAKE_LFLAGS are set to match - # those used building Windows Wireshark. (See config.pri). - # Among other things source-level debugging of the Qt version of Wireshark - # (including the ui/qt source) is thus enabled. - # - # Note that in this case source level debugging of the Qt - # *libraries* will not be possible since the Qt release libs are - # not compiled with /Zi (and not linked with /DEBUG). - # The Qt "debug" libraries are compiled with /MDd. To build a - # Wireshark-Qt debug version with the ability to do source level debugging - # of the Qt libraries themselves requires that Wireshark first be built with /MDd. - # Presumably doing source-level Qt library debugging shoyuld rarely be needed. - - # We want to build only the Wireshark linked with the Qt "release" libraries - # so disable debug & etc. -## CONFIG -= release - CONFIG -= debug - CONFIG -= debug_and_release - - # Use only Wireshark CFLAGS, CXXFLAGS and LDFLAGS from config.nmake (as provided via config.pri) - # for building the "release" version of Wireshark-Qt - # (e.g., so we don't get the Qt release CFLAGS [specifically /O2] - QMAKE_CFLAGS_RELEASE = "" - QMAKE_CXXFLAGS_RELEASE = "" - QMAKE_LFLAGS_RELEASE = "" - - # XXX We need to figure out how to pull this in from config.nmake. - !include( config.pri ) { - error("Can't find config.pri. Have you run 'nmake -f Makefile.nmake' two directories up?") - } - - !wireshark_manifest_info_required { - CONFIG -= embed_manifest_dll - CONFIG -= embed_manifest_exe - } - - # Use xcopy instead of copy so as to ensure that newer version of files are copied - QMAKE_COPY_FILE = xcopy /d /y -} - SOURCES_TAP = \ "stats_tree_dialog.cpp" @@ -167,23 +112,11 @@ tap_register.name = Generate wireshark-tap-register.c tap_register.input = SOURCES_TAP tap_register.output = wireshark-tap-register.c tap_register.variable_out = SOURCES -win32 { - tap_register.commands = $${PYTHON} "../../tools/make-tap-reg.py" "\"""$$PWD""\"" taps $$SOURCES_TAP -} else { - tap_register.commands = python ../../tools/make-tap-reg.py "\"""$$PWD""\"" taps $$SOURCES_TAP -} +tap_register.commands = python ../../tools/make-tap-reg.py "\"""$$PWD""\"" taps $$SOURCES_TAP #tap_register.CONFIG += no_link QMAKE_EXTRA_COMPILERS += tap_register INCLUDEPATH += ../.. -win32:INCLUDEPATH += \ - $${WIRESHARK_LIB_DIR}/gtk2/include/glib-2.0 $${WIRESHARK_LIB_DIR}/gtk2/lib/glib-2.0/include \ - $${WIRESHARK_LIB_DIR}/gtk3/include/glib-2.0 $${WIRESHARK_LIB_DIR}/gtk3/lib/glib-2.0/include \ - $${WIRESHARK_LIB_DIR}/WpdPack/Include \ - $${WIRESHARK_LIB_DIR}/AirPcap_Devpack_4_1_0_1622/Airpcap_Devpack/include \ - $${GNUTLS_DIR}/include \ - $${GEOIP_DIR}/include \ - $${ZLIB_DIR} # We have to manually trigger relinking each time one of these is modified. # Is there any way to do this automatically? @@ -201,10 +134,6 @@ SOURCES_WS_C = \ ../../sync_pipe_write.c \ ../../ws_version_info.c -win32:SOURCES_WS_C += \ - ../../ui/win32/console_win32.c \ - ../../ui/win32/file_dlg_win32.c - HEADERS_WS_C = \ ../../wsutil/privileges.h @@ -388,15 +317,8 @@ HEADERS += $$HEADERS_WS_C \ wireless_frame.h \ wlan_statistics_dialog.h -win32 { - OBJECTS_WS_C = $$SOURCES_WS_C - OBJECTS_WS_C ~= s/[.]c/.obj/g - OBJECTS_WS_C ~= s,/,\\,g - OBJECTS_WS_C += ../../image/file_dlg_win32.res -} else { ## XXX: Shouldn't need to (re)compile WS_C sources ?? - SOURCES += $$SOURCES_WS_C -} +SOURCES += $$SOURCES_WS_C DEFINES += REENTRANT unix:DEFINES += _U_=\"__attribute__((unused))\" @@ -481,106 +403,6 @@ macx { QMAKE_POST_LINK += $$quote(chmod 444 \"$${FRAMEWORKS_DIR}/\"*.dylib$$escape_expand(\\n\\t)) } -win32 { - DEFINES+=HAVE_PCAP_REMOTE - DEFINES+=HAVE_PCAP_SETSAMPLING - # Add the wireshark objects to LIBS - LIBS += $$OBJECTS_WS_C - LIBS += $$PA_OBJECTS - LIBS += \ - $${guilibsdll} $${HHC_LIBS} \ - -L../../epan -llibwireshark -L../../wsutil -llibwsutil \ - -L../../wiretap -lwiretap-$${WTAP_VERSION} \ - -L../../capchild -llibcapchild -L../../caputils -llibcaputils \ - -L.. -llibui -L../../codecs -llibwscodecs \ - -L$${GLIB_DIR}/lib -lglib-2.0 -lgmodule-2.0 \ - -L$${ZLIB_DIR}/lib -lzdll \ - -L$${WINSPARKLE_DIR} -lWinSparkle - - !isEmpty(MSVCR_DLL) { - EXTRA_BINFILES += \"$${MSVCR_DLL}\" - } - - PLATFORM_DLL_DIR = $(DESTDIR)platforms - CONFIG(debug, debug|release) { - isEqual(QT_MAJOR_VERSION, 4) { - EXTRA_DLLS = QtCored4 QtGuid4 - } else: lessThan(QT_MINOR_VERSION, 3) { - # The QT lib parts are copied by windeployqt post 5.3 - EXTRA_DLLS = Qt5Cored Qt5Guid Qt5Widgetsd Qt5PrintSupportd Qt5Multimediad - EXTRA_PLATFORM_DLLS = qwindowsd - QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${PLATFORM_DLL_DIR} $(MKDIR) $${PLATFORM_DLL_DIR}$$escape_expand(\\n\\t)) - } - } - CONFIG(release, debug|release) { - isEqual(QT_MAJOR_VERSION, 4) { - EXTRA_DLLS = QtCore4 QtGui4 - } else: lessThan(QT_MINOR_VERSION, 3) { - # The QT lib parts are copied by windeployqt post 5.3 - EXTRA_DLLS = Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport Qt5Multimedia - EXTRA_PLATFORM_DLLS = qwindows - QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${PLATFORM_DLL_DIR} $(MKDIR) $${PLATFORM_DLL_DIR}$$escape_expand(\\n\\t)) - } - } - for(DLL,EXTRA_DLLS){ - EXTRA_BINFILES += $$[QT_INSTALL_BINS]/$${DLL}.dll - } - INSTALL_PLATFORM_DIR = $$[QT_INSTALL_PLUGINS]/platforms - INSTALL_PLATFORM_DIR ~= s,/,\\,g - for(DLL,EXTRA_PLATFORM_DLLS){ - QMAKE_POST_LINK +=$$quote($(COPY_FILE) $${INSTALL_PLATFORM_DIR}\\$${DLL}.dll $${PLATFORM_DLL_DIR}$$escape_expand(\\n\\t)) - EXTRA_BINFILES += - } - - EXTRA_BINFILES += \ - ../../dumpcap.exe \ - ../../epan/libwireshark.dll ../../wiretap/wiretap-$${WTAP_VERSION}.dll \ - ../../wsutil/libwsutil.dll ../../codecs/libwscodecs.dll \ - $${GLIB_DIR}/bin/libglib-2.0-0.dll $${GLIB_DIR}/bin/libgmodule-2.0-0.dll \ - $${GLIB_DIR}/bin/$${INTL_DLL} \ - $${GLIB_DIR}/bin/gspawn-$${WIRESHARK_TARGET_PLATFORM}-helper.exe \ - $${GLIB_DIR}/bin/gspawn-$${WIRESHARK_TARGET_PLATFORM}-helper-console.exe \ - $${C_ARES_DIR}/bin/libcares-2.dll $${ZLIB_DIR}/zlib1.dll \ - $${GNUTLS_DIR}/bin/libffi-6.dll $${GNUTLS_DIR}/bin/$${GCC_DLL} \ - $${GNUTLS_DIR}/bin/libgcrypt-20.dll $${GNUTLS_DIR}/bin/libgmp-10.dll \ - $${GNUTLS_DIR}/bin/libgnutls-28.dll $${GNUTLS_DIR}/bin/$${GPGERROR_DLL} \ - $${GNUTLS_DIR}/bin/libhogweed-2-4.dll $${GNUTLS_DIR}/bin/libnettle-4-6.dll \ - $${GNUTLS_DIR}/bin/libp11-kit-0.dll $${GNUTLS_DIR}/bin/libtasn1-6.dll \ - $${GNUTLS_DIR}/bin/libintl-8.dll $${SMI_DIR}/bin/libsmi-2.dll \ - $${LUA_DIR}/lua52.dll \ - $${GEOIP_DIR}/bin/libGeoIP-1.dll \ - $${LIBSSH_DIR}/bin/libssh.dll \ - $${WINSPARKLE_DIR}/WinSparkle.dll \ - ../../colorfilters ../../dfilters ../../cfilters - - wireshark_use_kfw { - EXTRA_BINFILES += \ - $${KFW_DIR}/bin/$${COMERR_DLL} $${KFW_DIR}/bin/$${KRB5_DLL} $${KFW_DIR}/bin/$${K5SPRT_DLL} - } - - EXTRA_BINFILES ~= s,/,\\,g - for(FILE,EXTRA_BINFILES){ - QMAKE_POST_LINK +=$$quote($(COPY_FILE) $${FILE} $(DESTDIR)$$escape_expand(\\n\\t)) - } - PLUGINS_DIR = $(DESTDIR)plugins - QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${PLUGINS_DIR} $(MKDIR) $${PLUGINS_DIR}$$escape_expand(\\n\\t)) - QMAKE_POST_LINK +=$$quote($(COPY_FILE) ..\\..\\$${INSTALL_DIR}\\plugins\\*.dll $(DESTDIR)plugins$$escape_expand(\\n\\t)) - - # This doesn't depend on wireshark-gtk2. It also doesn't work. - #PLUGINS_IN_PWD=$${IN_PWD} - #PLUGINS_OUT_PWD=$${OUT_PWD} - #QMAKE_POST_LINK +=$$quote(cd $$replace(PLUGINS_IN_PWD, /, \\)\\..\\..\\plugins$$escape_expand(\\n\\t)) - #QMAKE_POST_LINK +=$$quote(nmake -f Makefile.nmake INSTALL_DIR=$$replace(PLUGINS_OUT_PWD, /, \\)\\$(DESTDIR)$$escape_expand(\\n\\t)) - #QMAKE_POST_LINK +=$$quote(cd $$replace(PLUGINS_IN_PWD, /, \\)$$escape_expand(\\n\\t)) - - # Use windeployqt to copy the required QT libs. - # Currently the QT bin dir has to be on the path for windeployqt to work - isEqual(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 2) { - QMAKE_POST_LINK +=$$quote(set PATH=%PATH%;$${QT5_BASE_DIR}\\bin$$escape_expand(\\n\\t)) - QMAKE_POST_LINK +=$$quote(windeployqt --release --no-compiler-runtime --verbose 10 $(DESTDIR)wireshark.exe)$$escape_expand(\\n\\t)) - } -} - RESOURCES += \ ../../image/about.qrc \ ../../image/languages/languages.qrc \ @@ -609,8 +431,7 @@ RC_FILE = ../../image/wireshark.rc !isEmpty(TRANSLATIONS) { isEmpty(QMAKE_LRELEASE) { - win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe - else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease + QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease } isEmpty(TS_DIR):TS_DIR = Translations @@ -626,8 +447,6 @@ RC_FILE = ../../image/wireshark.rc message(No translation files in project) } -win32: QMAKE_CLEAN += *.pdb *.pri - HEADERS += \ byte_view_tab.h \ byte_view_text.h \ diff --git a/ui/win32/Makefile.nmake b/ui/win32/Makefile.nmake deleted file mode 100644 index 136d7efea0..0000000000 --- a/ui/win32/Makefile.nmake +++ /dev/null @@ -1,40 +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 ######### - -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - /Zm800 \ - /I../.. $(GTK_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) - -.c.obj:: - $(CC) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $< - -# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST in the main Wireshark directory -WIRESHARK_WIN32_SRC = \ - console_win32.c \ - file_dlg_win32.c \ - print_win32.c \ - -WIRESHARK_WIN32_OBJECTS = $(WIRESHARK_WIN32_SRC:.c=.obj) - -libgtkui_win32.lib : ..\..\config.h $(WIRESHARK_WIN32_OBJECTS) - link /lib /out:libgtkui_win32.lib $(WIRESHARK_WIN32_OBJECTS) winmm.lib - -clean: - rm -f $(WIRESHARK_WIN32_OBJECTS) libgtkui_win32.lib *.nativecodeanalysis.xml *.pdb *.sbr - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk -build \ - $(WIRESHARK_WIN32_SRC) 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) 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) 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: -# |