Incorporate plugin dissector into build in collection.
svn path=/trunk/; revision=27501
This commit is contained in:
Jaap Keuter
parent
eb77f8a35e
commit
03bbd18a0b
|
|
@ -253,7 +253,6 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
|
|||
-dlopen plugins/gryphon/gryphon.la \
|
||||
-dlopen plugins/infiniband/infiniband.la \
|
||||
-dlopen plugins/irda/irda.la \
|
||||
-dlopen plugins/lwres/lwres.la \
|
||||
-dlopen plugins/m2m/m2m.la \
|
||||
-dlopen plugins/mate/mate.la \
|
||||
-dlopen plugins/opcua/opcua.la \
|
||||
|
|
|
|||
|
|
@ -1681,7 +1681,6 @@ AC_OUTPUT(
|
|||
plugins/gryphon/Makefile
|
||||
plugins/infiniband/Makefile
|
||||
plugins/irda/Makefile
|
||||
plugins/lwres/Makefile
|
||||
plugins/m2m/Makefile
|
||||
plugins/mate/Makefile
|
||||
plugins/opcua/Makefile
|
||||
|
|
|
|||
|
|
@ -220,7 +220,6 @@ plugin_src = \
|
|||
../plugins/gryphon/packet-gryphon.c \
|
||||
../plugins/infiniband/packet-infiniband.c \
|
||||
../plugins/irda/packet-irda.c \
|
||||
../plugins/lwres/packet-lwres.c \
|
||||
../plugins/m2m/packet-m2m.c \
|
||||
../plugins/m2m/wimax_tlv.c \
|
||||
../plugins/mgcp/packet-mgcp.c \
|
||||
|
|
|
|||
|
|
@ -581,6 +581,7 @@ DISSECTOR_SRC = \
|
|||
packet-lpd.c \
|
||||
packet-lsc.c \
|
||||
packet-lwapp.c \
|
||||
packet-lwres.c \
|
||||
packet-m2pa.c \
|
||||
packet-m2tp.c \
|
||||
packet-m2ua.c \
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@ PLUGINS= \
|
|||
../../plugins/gryphon/gryphon.dll \
|
||||
../../plugins/infiniband/infiniband.dll \
|
||||
../../plugins/irda/irda.dll \
|
||||
../../plugins/lwres/lwres.dll \
|
||||
../../plugins/m2m/m2m.dll \
|
||||
../../plugins/mate/mate.dll \
|
||||
../../plugins/sercosiii/sercosiii.dll \
|
||||
|
|
|
|||
|
|
@ -796,7 +796,6 @@ File "..\..\plugins\giop\tango.dll"
|
|||
File "..\..\plugins\gryphon\gryphon.dll"
|
||||
File "..\..\plugins\infiniband\infiniband.dll"
|
||||
File "..\..\plugins\irda\irda.dll"
|
||||
File "..\..\plugins\lwres\lwres.dll"
|
||||
File "..\..\plugins\m2m\m2m.dll"
|
||||
File "..\..\plugins\profinet\profinet.dll"
|
||||
File "..\..\plugins\sercosiii\sercosiii.dll"
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ SUBDIRS = $(_CUSTOM_SUBDIRS_) \
|
|||
gryphon \
|
||||
infiniband \
|
||||
irda \
|
||||
lwres \
|
||||
m2m \
|
||||
mate \
|
||||
opcua \
|
||||
|
|
|
|||
|
|
@ -63,9 +63,6 @@ process-plugins:
|
|||
cd irda
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
|
||||
cd ..
|
||||
cd lwres
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
|
||||
cd ..
|
||||
cd m2m
|
||||
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
|
||||
cd ..
|
||||
|
|
@ -114,7 +111,6 @@ install-plugins:
|
|||
xcopy plugins\gryphon\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
|
||||
xcopy plugins\infiniband\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
|
||||
xcopy plugins\irda\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
|
||||
xcopy plugins\lwres\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
|
||||
xcopy plugins\m2m\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
|
||||
xcopy plugins\mate\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
|
||||
xcopy plugins\opcua\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
Author :
|
||||
Oleg Terletsky <oleg.terletsky@comverse.com>
|
||||
|
|
@ -1,127 +0,0 @@
|
|||
# Makefile.am
|
||||
# Automake file for lwres plugin
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
# Wireshark - Network traffic analyzer / light waight resolver (part of Bind9)
|
||||
# By Steve Oleg Terletsky <oleg.terletsky@comverse.com>
|
||||
# Copyright 2003
|
||||
#
|
||||
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
|
||||
INCLUDES = -I$(top_srcdir) -I$(includedir)
|
||||
|
||||
include Makefile.common
|
||||
|
||||
if HAVE_WARNINGS_AS_ERRORS
|
||||
AM_CFLAGS = -Werror
|
||||
endif
|
||||
|
||||
plugindir = @plugindir@
|
||||
|
||||
plugin_LTLIBRARIES = lwres.la
|
||||
lwres_la_SOURCES = \
|
||||
plugin.c \
|
||||
moduleinfo.h \
|
||||
$(DISSECTOR_SRC) \
|
||||
$(DISSECTOR_INCLUDES)
|
||||
lwres_la_LDFLAGS = -module -avoid-version
|
||||
lwres_la_LIBADD = @PLUGIN_LIBS@
|
||||
|
||||
# Libs must be cleared, or else libtool won't create a shared module.
|
||||
# If your module needs to be linked against any particular libraries,
|
||||
# add them here.
|
||||
LIBS =
|
||||
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
# DISSECTOR_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 have a script to generate the plugin.c file.
|
||||
# The shell script runs slowly, as multiple greps and seds are run
|
||||
# for each input file; this is especially slow on Windows. Therefore,
|
||||
# if Python is present (as indicated by PYTHON being defined), we run
|
||||
# a faster Python script to do that work instead.
|
||||
#
|
||||
# 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: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
|
||||
$(top_srcdir)/tools/make-dissector-reg.py
|
||||
@if test -n "$(PYTHON)"; then \
|
||||
echo Making plugin.c with python ; \
|
||||
$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
|
||||
plugin $(DISSECTOR_SRC) ; \
|
||||
else \
|
||||
echo Making plugin.c with shell script ; \
|
||||
$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
|
||||
$(plugin_src) plugin $(DISSECTOR_SRC) ; \
|
||||
fi
|
||||
|
||||
#
|
||||
# Currently plugin.c can be included in the distribution because
|
||||
# we always build all protocol dissectors. We used to have to check
|
||||
# whether or not to build the snmp dissector. If we again need to
|
||||
# variably build something, making plugin.c non-portable, uncomment
|
||||
# the dist-hook line below.
|
||||
#
|
||||
# Oh, yuk. We don't want to include "plugin.c" in the distribution, as
|
||||
# its contents depend on the configuration, and therefore we want it
|
||||
# to be built when the first "make" is done; however, Automake insists
|
||||
# on putting *all* source into the distribution.
|
||||
#
|
||||
# We work around this by having a "dist-hook" rule that deletes
|
||||
# "plugin.c", so that "dist" won't pick it up.
|
||||
#
|
||||
#dist-hook:
|
||||
# @rm -f $(distdir)/plugin.c
|
||||
|
||||
CLEANFILES = \
|
||||
lwres \
|
||||
*~
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
Makefile.in \
|
||||
plugin.c
|
||||
|
||||
EXTRA_DIST = \
|
||||
Makefile.common \
|
||||
Makefile.nmake \
|
||||
moduleinfo.nmake \
|
||||
plugin.rc.in
|
||||
|
||||
checkapi:
|
||||
$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
# Makefile.common for lwres plugin
|
||||
# Contains the stuff from Makefile.am and Makefile.nmake that is
|
||||
# a) common to both files and
|
||||
# b) portable between both files
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
# the name of the plugin
|
||||
PLUGIN_NAME = lwres
|
||||
|
||||
# the dissector sources (without any helpers)
|
||||
DISSECTOR_SRC = \
|
||||
packet-lwres.c
|
||||
|
|
@ -1,106 +0,0 @@
|
|||
# Makefile.nmake
|
||||
# nmake file for Wireshark plugin
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
|
||||
include ..\..\config.nmake
|
||||
include moduleinfo.nmake
|
||||
|
||||
include Makefile.common
|
||||
|
||||
CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
|
||||
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
|
||||
|
||||
.c.obj::
|
||||
$(CC) $(CFLAGS) -Fd.\ -c $<
|
||||
|
||||
LDFLAGS = $(PLUGIN_LDFLAGS)
|
||||
|
||||
!IFDEF ENABLE_LIBWIRESHARK
|
||||
LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
|
||||
CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
|
||||
|
||||
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
|
||||
|
||||
DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
|
||||
|
||||
OBJECTS = $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) 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)
|
||||
!IF $(MSC_VER_REQUIRED) >= 1400
|
||||
mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
|
||||
!ENDIF
|
||||
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
# DISSECTOR_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 have a script to generate the plugin.c file.
|
||||
# The shell script runs slowly, as multiple greps and seds are run
|
||||
# for each input file; this is especially slow on Windows. Therefore,
|
||||
# if Python is present (as indicated by PYTHON being defined), we run
|
||||
# a faster Python script to do that work instead.
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
!IFDEF PYTHON
|
||||
plugin.c: $(DISSECTOR_SRC) moduleinfo.h ../../tools/make-dissector-reg.py
|
||||
@echo Making plugin.c (using python)
|
||||
@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(DISSECTOR_SRC)
|
||||
!ELSE
|
||||
plugin.c: $(DISSECTOR_SRC) moduleinfo.h ../../tools/make-dissector-reg
|
||||
@echo Making plugin.c (using sh)
|
||||
@$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC)
|
||||
!ENDIF
|
||||
|
||||
!ENDIF
|
||||
|
||||
clean:
|
||||
rm -f $(OBJECTS) $(RESOURCE) plugin.c *.pdb \
|
||||
$(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 $(DISSECTOR_SRC)
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
/* Included *after* config.h, in order to re-define these macros */
|
||||
|
||||
#ifdef PACKAGE
|
||||
#undef PACKAGE
|
||||
#endif
|
||||
|
||||
/* Name of package */
|
||||
#define PACKAGE "lwres"
|
||||
|
||||
|
||||
#ifdef VERSION
|
||||
#undef VERSION
|
||||
#endif
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "0.0.1"
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
#
|
||||
# $Id$
|
||||
#
|
||||
|
||||
# The name
|
||||
PACKAGE=lwres
|
||||
|
||||
# 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)
|
||||
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
#include "winver.h"
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION @RC_MODULE_VERSION@
|
||||
PRODUCTVERSION @RC_VERSION@
|
||||
FILEFLAGSMASK 0x0L
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS VS_FF_DEBUG
|
||||
#else
|
||||
FILEFLAGS 0
|
||||
#endif
|
||||
FILEOS VOS_NT_WINDOWS32
|
||||
FILETYPE VFT_DLL
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904b0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0"
|
||||
VALUE "FileDescription", "@PACKAGE@ dissector\0"
|
||||
VALUE "FileVersion", "@MODULE_VERSION@\0"
|
||||
VALUE "InternalName", "@PACKAGE@ @MODULE_VERSION@\0"
|
||||
VALUE "LegalCopyright", "Copyright © 1998 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
|
||||
VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
|
||||
VALUE "ProductName", "Wireshark\0"
|
||||
VALUE "ProductVersion", "@VERSION@\0"
|
||||
VALUE "Comments", "Build with @MSVC_VARIANT@\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
Loading…
Reference in New Issue