diff options
Diffstat (limited to 'plugins/ethercat')
| -rw-r--r-- | plugins/ethercat/Makefile.am | 33 | ||||
| -rw-r--r-- | plugins/ethercat/Makefile.common | 53 |
2 files changed, 29 insertions, 57 deletions
diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index ef85f4189d..c1bedc99e8 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -1,5 +1,4 @@ # Makefile.am -# Automake file for EtherCAT plugin # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -18,12 +17,39 @@ # 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 = ethercat + +# Non-generated sources to be scanned for registration routines +NONGENERATED_REGISTER_C_FILES = \ + packet-ams.c \ + packet-ecatmb.c \ + packet-esl.c \ + packet-ethercat-datagram.c \ + packet-ethercat-frame.c \ + packet-ioraw.c \ + packet-nv.c + +# Non-generated sources +NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) + +# Headers. +CLEAN_HEADER_FILES = \ + packet-ams.h \ + packet-ecatmb.h \ + packet-ethercat-datagram.h \ + packet-ethercat-frame.h \ + packet-ioraw.h \ + packet-nv.h + +HEADER_FILES = \ + $(CLEAN_HEADER_FILES) + plugin_LTLIBRARIES = ethercat.la ethercat_la_SOURCES = \ @@ -47,6 +73,5 @@ MAINTAINERCLEANFILES = \ plugin.c EXTRA_DIST = \ - Makefile.common \ plugin.rc.in \ CMakeLists.txt diff --git a/plugins/ethercat/Makefile.common b/plugins/ethercat/Makefile.common deleted file mode 100644 index 6a39cff77d..0000000000 --- a/plugins/ethercat/Makefile.common +++ /dev/null @@ -1,53 +0,0 @@ -# Makefile.common for EtherCAT 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 = ethercat - -# Non-generated sources to be scanned for registration routines -NONGENERATED_REGISTER_C_FILES = \ - packet-ams.c \ - packet-ecatmb.c \ - packet-esl.c \ - packet-ethercat-datagram.c \ - packet-ethercat-frame.c \ - packet-ioraw.c \ - packet-nv.c - -# Non-generated sources -NONGENERATED_C_FILES = \ - $(NONGENERATED_REGISTER_C_FILES) - -# Headers. -CLEAN_HEADER_FILES = \ - packet-ams.h \ - packet-ecatmb.h \ - packet-ethercat-datagram.h \ - packet-ethercat-frame.h \ - packet-ioraw.h \ - packet-nv.h - -HEADER_FILES = \ - $(CLEAN_HEADER_FILES) - -include ../Makefile.common.inc |