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 --- extcap/Makefile.am | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) (limited to 'extcap/Makefile.am') diff --git a/extcap/Makefile.am b/extcap/Makefile.am index 81bcd2b549..7c3bdba14b 100644 --- a/extcap/Makefile.am +++ b/extcap/Makefile.am @@ -19,7 +19,6 @@ # 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 ../Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) @@ -28,17 +27,20 @@ MAINTAINERCLEANFILES = \ Makefile.in EXTRA_DIST = \ - .editorconfig \ - Makefile.common + .editorconfig extcap_PROGRAMS = \ @androiddump_bin@ \ @randpktdump_bin@ \ - @sshdump_bin@ \ + @sshdump_bin@ \ @ciscodump_bin@ EXTRA_PROGRAMS = androiddump randpktdump sshdump ciscodump +androiddump_SOURCES = \ + androiddump.c \ + extcap-base.c + if ENABLE_STATIC androiddump_LDFLAGS = -Wl,-static -all-static else @@ -51,6 +53,10 @@ androiddump_LDADD = \ ../wsutil/libwsutil.la \ @GLIB_LIBS@ +randpktdump_SOURCES = \ + randpktdump.c \ + extcap-base.c + if ENABLE_STATIC randpktdump_LDFLAGS = -Wl,-static -all-static else @@ -59,11 +65,16 @@ endif # Libraries and plugin flags with which to link randpktdump. randpktdump_LDADD = \ - ../randpkt_core/librandpkt_core.a \ + ../randpkt_core/librandpkt_core.a \ ../wiretap/libwiretap.la \ ../wsutil/libwsutil.la \ @GLIB_LIBS@ +sshdump_SOURCES = \ + sshdump.c \ + extcap-base.c \ + ssh-base.c + if ENABLE_STATIC sshdump_LDFLAGS = -Wl,-static -all-static else @@ -77,6 +88,11 @@ sshdump_LDADD = \ @GLIB_LIBS@ \ @LIBSSH_LIBS@ +ciscodump_SOURCES = \ + ciscodump.c \ + extcap-base.c \ + ssh-base.c + if ENABLE_STATIC ciscodump_LDFLAGS = -Wl,-static -all-static else @@ -89,3 +105,7 @@ ciscodump_LDADD = \ ../wsutil/libwsutil.la \ @GLIB_LIBS@ \ @LIBSSH_LIBS@ + +noinst_HEADERS = \ + extcap-base.h \ + ssh-base.h -- cgit v1.2.1