aboutsummaryrefslogtreecommitdiffstats
path: root/caputils
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-06-21 05:06:23 +0100
committerJoão Valverde <j@v6e.pt>2016-06-30 11:04:17 +0000
commita16d401b25c85ffb7fde6c46b51cb7048112f885 (patch)
tree71ba692edcdb6f2a10ed566e18bcfbbc456cfad1 /caputils
parentf6c5cf953212248cbc680ef0d9b2f852cbfdb951 (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 'caputils')
-rw-r--r--caputils/Makefile.am52
-rw-r--r--caputils/Makefile.common36
2 files changed, 25 insertions, 63 deletions
diff --git a/caputils/Makefile.am b/caputils/Makefile.am
index 043ad29ff4..ebd311aaf6 100644
--- a/caputils/Makefile.am
+++ b/caputils/Makefile.am
@@ -19,19 +19,35 @@
# 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
AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) $(LIBNL_CFLAGS)
noinst_LIBRARIES = libcaputils.a
-PLATFORM_CAPUTILS_SRC = \
- capture-pcap-util-unix.c
+# All sources that should be put in the source distribution tarball
+libcaputils_a_SOURCES = \
+ capture_ifinfo.h \
+ capture-pcap-util.h \
+ capture-pcap-util.c \
+ capture-pcap-util-unix.c \
+ capture-pcap-util-int.h \
+ capture-wpcap.h \
+ capture_wpcap_packet.h \
+ iface_monitor.c \
+ iface_monitor.h \
+ ws80211_utils.c \
+ ws80211_utils.h
+
+#
+# This is used to build dumpcap, and dumpcap is, if possible, built as
+# a position-independent executable (for address space layout randomization,
+# as it might be running with extra privileges), so this library needs
+# to be built that way as well.
+#
+libcaputils_a_CFLAGS = $(AM_CFLAGS) $(PIE_CFLAGS)
-CAPUTILS_SRC = \
- $(COMMON_CAPUTILS_SRC) \
- $(PLATFORM_CAPUTILS_SRC)
+libcaputils_a_DEPENDENCIES =
CLEANFILES = \
doxygen-caputils.tag \
@@ -39,12 +55,10 @@ CLEANFILES = \
*~
MAINTAINERCLEANFILES = \
- $(GENERATED_FILES) \
Makefile.in
EXTRA_DIST = \
.editorconfig \
- $(GENERATOR_FILES) \
airpcap.h \
airpcap_loader.c \
airpcap_loader.h \
@@ -55,23 +69,7 @@ EXTRA_DIST = \
capture_wpcap_packet.c \
capture_wpcap_packet.h \
CMakeLists.txt \
- doxygen.cfg.in \
- Makefile.common
-
-# All sources that should be put in the source distribution tarball
-libcaputils_a_SOURCES = \
- $(CAPUTILS_SRC) \
- $(noinst_HEADERS)
-
-#
-# This is used to build dumpcap, and dumpcap is, if possible, built as
-# a position-independent executable (for address space layout randomization,
-# as it might be running with extra privileges), so this library needs
-# to be built that way as well.
-#
-libcaputils_a_CFLAGS = $(AM_CFLAGS) $(PIE_CFLAGS)
-
-libcaputils_a_DEPENDENCIES =
+ doxygen.cfg.in
doxygen:
if HAVE_DOXYGEN
@@ -88,9 +86,9 @@ checkapi: checkapi-base checkapi-todo
checkapi-base:
$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g deprecated-gtk -build \
-sourcedir=$(srcdir) \
- $(CAPUTILS_SRC)
+ $(libcaputils_a_SOURCES)
checkapi-todo:
$(PERL) $(top_srcdir)/tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \
-sourcedir=$(srcdir) \
- $(CAPUTILS_SRC)
+ $(libcaputils_a_SOURCES)
diff --git a/caputils/Makefile.common b/caputils/Makefile.common
deleted file mode 100644
index ca4559473c..0000000000
--- a/caputils/Makefile.common
+++ /dev/null
@@ -1,36 +0,0 @@
-# Makefile.common
-# 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.
-
-COMMON_CAPUTILS_SRC = \
- capture-pcap-util.c \
- iface_monitor.c \
- ws80211_utils.c
-
-noinst_HEADERS = \
- capture_ifinfo.h \
- capture-pcap-util.h \
- capture-pcap-util-int.h \
- capture-wpcap.h \
- capture_wpcap_packet.h \
- iface_monitor.h \
- ws80211_utils.h