osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
daniel/osmux
Pascal Quantin 2016-06-08 15:57:00 +02:00 committed by Michael Mann
parent 88bd50c592
commit 6baa1b544c
244 changed files with 42 additions and 12291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.editorconfig
View File

@ -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

1
.gitignore vendored
View File

@ -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

1
CMakeLists.txt
View File

@ -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()

4
Makefile.am
View File

@ -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 \

1535
Makefile.nmake
View File

File diff suppressed because it is too large Load Diff

25
Makefile.nmake.inc
View File

@ -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$@ $<

3
capchild/Makefile.am
View File

@ -68,5 +68,4 @@ EXTRA_DIST = \
$(GENERATOR_FILES) \
CMakeLists.txt \
doxygen.cfg.in \
Makefile.common \
Makefile.nmake
Makefile.common

76
capchild/Makefile.nmake
View File

@ -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)

3
caputils/Makefile.am
View File

@ -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 = \

84
caputils/Makefile.nmake
View File

@ -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)

4
cmake/modules/WiresharkPlugin.cmake
View File

@ -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

1
codecs/Makefile.am
View File

@ -62,7 +62,6 @@ noinst_HEADERS = \
EXTRA_DIST = \
CMakeLists.txt \
Makefile.common \
Makefile.nmake \
speex/README.txt
CLEANFILES = \

87
codecs/Makefile.nmake
View File

@ -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

250
config.h.win32
View File

@ -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>

1753
config.nmake
View File

File diff suppressed because it is too large Load Diff

1
doc/Makefile.am
View File

@ -290,7 +290,6 @@ MAINTAINERCLEANFILES = \
Makefile.in
EXTRA_DIST = \
Makefile.nmake \
README.capture \
README.design \
README.developer \

337
doc/Makefile.nmake
View File

@ -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

3
doc/README.plugins
View File

@ -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

20
doc/README.qt
View File

@ -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

9
doc/README.wslua
View File

@ -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

1
docbook/Makefile.am
View File

@ -213,7 +213,6 @@ EXTRA_DIST = \
dfilter2xml.pl \
make-wsluarm.pl \
README.txt \
Makefile.nmake \
CMakeLists.txt
MAINTAINERCLEANFILES = \

280
docbook/Makefile.nmake
View File

@ -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

23
docbook/README.txt
View File

@ -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

3
echld/Makefile.am
View File

@ -52,8 +52,7 @@ libechld_la_LIBADD = \
EXTRA_DIST = \
CMakeLists.txt \
Makefile.common \
Makefile.nmake
Makefile.common
CLEANFILES = \
libechld.a \

19
echld/Makefile.nmake
View File

@ -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...

1
epan/Makefile.am
View File

@ -85,7 +85,6 @@ EXTRA_DIST = \
dtd_preparse.l \
enterprise-numbers \
Makefile.common \
Makefile.nmake \
radius_dict.l \
uat_load.l \
doxygen.cfg.in \

466
epan/Makefile.nmake
View File

@ -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