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/m2m | |
| parent | f6c5cf953212248cbc680ef0d9b2f852cbfdb951 (diff) | |
| download | wireshark-a16d401b25c85ffb7fde6c46b51cb7048112f885.tar.gz | |
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/m2m')
| -rw-r--r-- | plugins/m2m/Makefile.am | 17 | ||||
| -rw-r--r-- | plugins/m2m/Makefile.common | 37 |
2 files changed, 13 insertions, 41 deletions
diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am index 41114481c1..e1aa3e88ed 100644 --- a/plugins/m2m/Makefile.am +++ b/plugins/m2m/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for M2M plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,23 @@ # 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 = m2m + +# the dissector sources (without any helpers) +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-m2m.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) \ + wimax_tlv.c + plugin_LTLIBRARIES = m2m.la m2m_la_SOURCES = \ @@ -47,6 +57,5 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/m2m/Makefile.common b/plugins/m2m/Makefile.common deleted file mode 100644 index 4070690d38..0000000000 --- a/plugins/m2m/Makefile.common +++ /dev/null @@ -1,37 +0,0 @@ -# Makefile.common for M2M 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 = m2m - -# the dissector sources (without any helpers) -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-m2m.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) \ - wimax_tlv.c - -include ../Makefile.common.inc |