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 /plugins | |
| parent | 88bd50c592b0d24a12dd178ae2858444400a012f (diff) | |
Remove Nmake build system
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Reviewed-on: https://code.wireshark.org/review/15777
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'plugins')
51 files changed, 2 insertions, 1873 deletions
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) - |