diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-11-25 00:45:06 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-11-27 22:22:06 +0000 |
| commit | 7c8314a68340a331c43f3232f6158a9c3afff641 (patch) | |
| tree | 2e648c0dc0c755e8820c9b0bfc3a8b66ea560d43 /caputils | |
| parent | d7f12436709e40d58d7fcdfbcdd08740c039e162 (diff) | |
Fix ISO C forbids an empty translation unit [-Wpedantic] (airpcap)
Autotools only warning.
Change-Id: I30f33d2f8611d662dbc62326862707bf05ad3f60
Reviewed-on: https://code.wireshark.org/review/12150
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/Makefile.am | 33 | ||||
| -rw-r--r-- | caputils/Makefile.common | 6 | ||||
| -rw-r--r-- | caputils/Makefile.nmake | 7 | ||||
| -rw-r--r-- | caputils/airpcap_loader.c | 3 |
4 files changed, 26 insertions, 23 deletions
diff --git a/caputils/Makefile.am b/caputils/Makefile.am index fe3d5735e0..1710d8b587 100644 --- a/caputils/Makefile.am +++ b/caputils/Makefile.am @@ -31,6 +31,10 @@ noinst_LIBRARIES = libcaputils.a PLATFORM_CAPUTILS_SRC = \ capture-pcap-util-unix.c +CAPUTILS_SRC = \ + $(COMMON_CAPUTILS_SRC) \ + $(PLATFORM_CAPUTILS_SRC) + CLEANFILES = \ doxygen-caputils.tag \ libcaputils.a \ @@ -40,6 +44,22 @@ MAINTAINERCLEANFILES = \ $(GENERATED_FILES) \ Makefile.in +EXTRA_DIST = \ + $(GENERATOR_FILES) \ + airpcap.h \ + airpcap_loader.c \ + airpcap_loader.h \ + capture_win_ifnames.c \ + capture_win_ifnames.h \ + capture-wpcap.c \ + capture-wpcap.h \ + capture_wpcap_packet.c \ + capture_wpcap_packet.h \ + CMakeLists.txt \ + doxygen.cfg.in \ + Makefile.common \ + Makefile.nmake + # All sources that should be put in the source distribution tarball libcaputils_a_SOURCES = \ $(CAPUTILS_SRC) \ @@ -80,16 +100,3 @@ checkapi-todo: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ -sourcedir=$(srcdir) \ $(CAPUTILS_SRC) - -EXTRA_DIST = \ - $(GENERATOR_FILES) \ - capture_win_ifnames.c \ - capture_win_ifnames.h \ - capture-wpcap.c \ - capture-wpcap.h \ - capture_wpcap_packet.c \ - capture_wpcap_packet.h \ - CMakeLists.txt \ - doxygen.cfg.in \ - Makefile.common \ - Makefile.nmake diff --git a/caputils/Makefile.common b/caputils/Makefile.common index 75544e757e..ca4559473c 100644 --- a/caputils/Makefile.common +++ b/caputils/Makefile.common @@ -21,16 +21,12 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -CAPUTILS_SRC = \ - $(PLATFORM_CAPUTILS_SRC) \ - airpcap_loader.c \ +COMMON_CAPUTILS_SRC = \ capture-pcap-util.c \ iface_monitor.c \ ws80211_utils.c noinst_HEADERS = \ - airpcap.h \ - airpcap_loader.h \ capture_ifinfo.h \ capture-pcap-util.h \ capture-pcap-util-int.h \ diff --git a/caputils/Makefile.nmake b/caputils/Makefile.nmake index 1c9149771b..f3eeae37c9 100644 --- a/caputils/Makefile.nmake +++ b/caputils/Makefile.nmake @@ -4,6 +4,7 @@ include ..\config.nmake include ..\Makefile.nmake.inc +include Makefile.common ############### no need to modify below this line ######### @@ -28,8 +29,10 @@ PLATFORM_CAPUTILS_SRC = \ capture-wpcap.c \ capture_wpcap_packet.c -include Makefile.common - +CAPUTILS_SRC = \ + $(COMMON_CAPUTILS_SRC) \ + $(PLATFORM_CAPUTILS_SRC) \ + airpcap_loader.c # if you add files here, be sure to include them also in Makefile.am EXTRA_DIST CAPUTILS_OBJECTS = \ diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c index 7d2fbc7349..98e4699b83 100644 --- a/caputils/airpcap_loader.c +++ b/caputils/airpcap_loader.c @@ -24,8 +24,6 @@ #include "config.h" -#ifdef HAVE_AIRPCAP - #ifdef HAVE_LIBPCAP #include <glib.h> #include <gmodule.h> @@ -1244,7 +1242,6 @@ get_runtime_airpcap_version(GString *str) g_string_append_printf(str, "with AirPcap %d.%d.%d build %d", vmaj, vmin, vrev, build); } -#endif /* HAVE_AIRPCAP */ /* * Editor modelines - http://www.wireshark.org/tools/modelines.html |