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/easy_codec | |
parent | 88bd50c592b0d24a12dd178ae2858444400a012f (diff) | |
download | wireshark-6baa1b544c84a766d9f9d356e9940eccaf0a128f.tar.gz |
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/easy_codec')
-rw-r--r-- | plugins/easy_codec/Makefile.am | 2 | ||||
-rw-r--r-- | plugins/easy_codec/Makefile.nmake | 81 | ||||
-rw-r--r-- | plugins/easy_codec/ReadMe.txt | 1 | ||||
-rw-r--r-- | plugins/easy_codec/moduleinfo.nmake | 26 |
4 files changed, 0 insertions, 110 deletions
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) - |