From a16d401b25c85ffb7fde6c46b51cb7048112f885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Tue, 21 Jun 2016 05:06:23 +0100 Subject: Remove Makefile.common files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- plugins/wimaxmacphy/Makefile.am | 22 +++++++++++++++---- plugins/wimaxmacphy/Makefile.common | 42 ------------------------------------- 2 files changed, 18 insertions(+), 46 deletions(-) delete mode 100644 plugins/wimaxmacphy/Makefile.common (limited to 'plugins/wimaxmacphy') diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am index d7b7360395..c4d79a08ce 100644 --- a/plugins/wimaxmacphy/Makefile.am +++ b/plugins/wimaxmacphy/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for wimaxmacphy plugin # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -18,12 +17,28 @@ # 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 = wimaxmacphy + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-wimaxmacphy.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) + +# Headers. +CLEAN_HEADER_FILES = \ + packet-wimaxmacphy.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = wimaxmacphy.la wimaxmacphy_la_SOURCES = \ @@ -47,6 +62,5 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/wimaxmacphy/Makefile.common b/plugins/wimaxmacphy/Makefile.common deleted file mode 100644 index d8d9953d26..0000000000 --- a/plugins/wimaxmacphy/Makefile.common +++ /dev/null @@ -1,42 +0,0 @@ -# Makefile.common for wimaxmacphy 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 -# 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 = wimaxmacphy - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-wimaxmacphy.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) - -# Headers. -CLEAN_HEADER_FILES = \ - packet-wimaxmacphy.h - -HEADER_FILES = \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc -- cgit v1.2.1