From 6baa1b544c84a766d9f9d356e9940eccaf0a128f Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Wed, 8 Jun 2016 15:57:00 +0200 Subject: Remove Nmake build system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer Reviewed-by: Balint Reczey --- plugins/wimaxasncp/Makefile.am | 2 - plugins/wimaxasncp/Makefile.nmake | 121 ------------------------------------ plugins/wimaxasncp/moduleinfo.nmake | 26 -------- 3 files changed, 149 deletions(-) delete mode 100644 plugins/wimaxasncp/Makefile.nmake delete mode 100644 plugins/wimaxasncp/moduleinfo.nmake (limited to 'plugins/wimaxasncp') 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 , 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) - -- cgit v1.2.1