diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-06-21 05:06:23 +0100 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-06-30 11:04:17 +0000 |
commit | a16d401b25c85ffb7fde6c46b51cb7048112f885 (patch) | |
tree | 71ba692edcdb6f2a10ed566e18bcfbbc456cfad1 /plugins/wimax | |
parent | f6c5cf953212248cbc680ef0d9b2f852cbfdb951 (diff) |
Remove Makefile.common files
Now that nmake build system has been removed they are not needed anymore.
Change-Id: I88075f955bb4349185859c1af4be22e53de5850f
Reviewed-on: https://code.wireshark.org/review/16050
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'plugins/wimax')
-rw-r--r-- | plugins/wimax/Makefile.am | 69 | ||||
-rw-r--r-- | plugins/wimax/Makefile.common | 89 |
2 files changed, 65 insertions, 93 deletions
diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am index e4d6bd64e2..5cfaa06276 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/wimax/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for Wireshark WiMAX Plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,75 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -include Makefile.common include $(top_srcdir)/Makefile.am.inc include ../Makefile.am.inc +# the name of the plugin +PLUGIN_NAME = wimax + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-wmx.c \ + wimax_cdma_code_decoder.c \ + wimax_compact_dlmap_ie_decoder.c \ + wimax_compact_ulmap_ie_decoder.c \ + wimax_fch_decoder.c \ + wimax_ffb_decoder.c \ + wimax_hack_decoder.c \ + wimax_harq_map_decoder.c \ + wimax_pdu_decoder.c \ + wimax_phy_attributes_decoder.c \ + mac_hd_generic_decoder.c \ + mac_hd_type1_decoder.c \ + mac_hd_type2_decoder.c \ + mac_mgmt_msg_decoder.c \ + msg_aas_fbck.c \ + msg_aas_beam.c \ + msg_arq.c \ + msg_clk_cmp.c \ + msg_dcd.c \ + msg_dlmap.c \ + msg_dreg.c \ + msg_dsa.c \ + msg_dsc.c \ + msg_dsd.c \ + msg_dsx_rvd.c \ + msg_fpc.c \ + msg_pkm.c \ + msg_pmc.c \ + msg_prc_lt_ctrl.c \ + msg_reg_req.c \ + msg_reg_rsp.c \ + msg_rep.c \ + msg_res_cmd.c \ + msg_rng_req.c \ + msg_rng_rsp.c \ + msg_sbc.c \ + msg_ucd.c \ + msg_ulmap.c \ + wimax_utils.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) \ + crc.c \ + crc_data.c \ + wimax_tlv.c + +# Headers. +CLEAN_HEADER_FILES = \ + crc.h \ + wimax_bits.h \ + wimax_compact_dlmap_ie_decoder.h \ + wimax_compact_ulmap_ie_decoder.h \ + wimax_mac.h \ + wimax_tlv.h \ + wimax_utils.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = wimax.la wimax_la_SOURCES = \ @@ -47,7 +109,6 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt \ README.wimax diff --git a/plugins/wimax/Makefile.common b/plugins/wimax/Makefile.common deleted file mode 100644 index 68f795e97f..0000000000 --- a/plugins/wimax/Makefile.common +++ /dev/null @@ -1,89 +0,0 @@ -# Makefile.common for WiMAX plugin -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# the name of the plugin -PLUGIN_NAME = wimax - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-wmx.c \ - wimax_cdma_code_decoder.c \ - wimax_compact_dlmap_ie_decoder.c \ - wimax_compact_ulmap_ie_decoder.c \ - wimax_fch_decoder.c \ - wimax_ffb_decoder.c \ - wimax_hack_decoder.c \ - wimax_harq_map_decoder.c \ - wimax_pdu_decoder.c \ - wimax_phy_attributes_decoder.c \ - mac_hd_generic_decoder.c \ - mac_hd_type1_decoder.c \ - mac_hd_type2_decoder.c \ - mac_mgmt_msg_decoder.c \ - msg_aas_fbck.c \ - msg_aas_beam.c \ - msg_arq.c \ - msg_clk_cmp.c \ - msg_dcd.c \ - msg_dlmap.c \ - msg_dreg.c \ - msg_dsa.c \ - msg_dsc.c \ - msg_dsd.c \ - msg_dsx_rvd.c \ - msg_fpc.c \ - msg_pkm.c \ - msg_pmc.c \ - msg_prc_lt_ctrl.c \ - msg_reg_req.c \ - msg_reg_rsp.c \ - msg_rep.c \ - msg_res_cmd.c \ - msg_rng_req.c \ - msg_rng_rsp.c \ - msg_sbc.c \ - msg_ucd.c \ - msg_ulmap.c \ - wimax_utils.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) \ - crc.c \ - crc_data.c \ - wimax_tlv.c - -# Headers. -CLEAN_HEADER_FILES = \ - crc.h \ - wimax_bits.h \ - wimax_compact_dlmap_ie_decoder.h \ - wimax_compact_ulmap_ie_decoder.h \ - wimax_mac.h \ - wimax_tlv.h \ - wimax_utils.h - -HEADER_FILES = \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc |