Commit 6baa1b54 authored by Pascal Quantin's avatar Pascal Quantin Committed by Michael Mann

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: default avatarPetri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: default avatarJörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey's avatarBalint Reczey <balint@balintreczey.hu>
parent 88bd50c5
......@@ -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
......
......@@ -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
......
......@@ -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()
......
......@@ -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 \
......
This diff is collapsed.
# 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$@ $<
......@@ -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
## 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)
......@@ -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 = \
......
## 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)
# 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
......
......@@ -62,7 +62,6 @@ noinst_HEADERS = \
EXTRA_DIST = \
CMakeLists.txt \
Makefile.common \
Makefile.nmake \
speex/README.txt
CLEANFILES = \
......
## 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
/* 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>
This diff is collapsed.
......@@ -290,7 +290,6 @@ MAINTAINERCLEANFILES = \
Makefile.in
EXTRA_DIST = \
Makefile.nmake \
README.capture \
README.design \
README.developer \
......
This diff is collapsed.
......@@ -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
......
......@@ -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)).