Commit a16d401b authored by João Valverde's avatar João Valverde Committed by João Valverde

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: default avatarPetri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: default avatarJoão Valverde <j@v6e.pt>
parent f6c5cf95
......@@ -362,7 +362,68 @@ plugin_ldadd =
endif # HAVE_PLUGINS
include Makefile.common
# "BUILT_SOURCES" are built before any "make all" or "make check" targets.
BUILT_HEADER_FILES = \
version.h
BUILT_C_FILES =
BUILT_SOURCES = $(BUILT_C_FILES) $(BUILT_HEADER_FILES)
# Header files generated from source files.
GENERATED_HEADER_FILES = \
text2pcap-scanner_lex.h \
$(BUILT_HEADER_FILES)
# C source files generated from source files.
GENERATED_C_FILES =
# All the generated files.
GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
EXTCAP_COMMON_SRC = \
extcap.c \
extcap_parser.c
EXTCAP_COMMON_INCLUDES = \
extcap.h \
extcap_parser.h
# sources common for wireshark, tshark, and rawshark
SHARK_COMMON_SRC = \
cfile.c \
frame_tvbuff.c \
sync_pipe_write.c
# corresponding headers
SHARK_COMMON_INCLUDES = \
cfile.h \
file.h \
fileset.h \
frame_tvbuff.h \
register.h \
ws_symbol_export.h
# wireshark specifics
WIRESHARK_COMMON_SRC = \
$(SHARK_COMMON_SRC) \
capture_info.c \
capture_opts.c \
file.c \
fileset.c \
filter_files.c \
summary.c \
ws_version_info.c
# corresponding headers
WIRESHARK_COMMON_INCLUDES = \
capture_info.h \
capture_opts.h \
filter_files.h \
globals.h \
log.h \
summary.h \
sync_pipe.h
if HAVE_EXTCAP
SHARK_COMMON_SRC += $(EXTCAP_COMMON_SRC)
......@@ -433,6 +494,13 @@ wireshark_gtk_LDADD = \
@PORTAUDIO_LIBS@
endif
tshark_SOURCES = \
$(SHARK_COMMON_SRC) \
capture_opts.c \
filter_files.c \
tshark.c \
ws_version_info.c
tshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
tshark_LDFLAGS = $(AM_LDFLAGS) $(EXTRALINKFLAGS)
......@@ -458,6 +526,11 @@ tshark_LDADD = \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
tfshark_SOURCES = \
$(SHARK_COMMON_SRC) \
tfshark.c \
ws_version_info.c
tfshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
tfshark_LDFLAGS = $(AM_LDFLAGS) $(EXTRALINKFLAGS)
......@@ -479,6 +552,11 @@ tfshark_LDADD = \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
rawshark_SOURCES = \
$(SHARK_COMMON_SRC) \
rawshark.c \
ws_version_info.c
rawshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
rawshark_LDFLAGS = $(AM_LDFLAGS) $(EXTRALINKFLAGS)
......@@ -502,6 +580,11 @@ rawshark_LDADD = \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
text2pcap_SOURCES = \
text2pcap.c \
text2pcap-scanner.l \
ws_version_info.c
text2pcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
# Don't turn on -Werror for text2pcap: its source includes text2pcap-scanner.c
......@@ -516,6 +599,10 @@ text2pcap_LDADD = \
wsutil/libwsutil.la \
@GLIB_LIBS@
mergecap_SOURCES = \
mergecap.c \
ws_version_info.c
mergecap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
# Libraries with which to link mergecap.
......@@ -524,6 +611,10 @@ mergecap_LDADD = \
wsutil/libwsutil.la \
@GLIB_LIBS@
capinfos_SOURCES = \
capinfos.c \
ws_version_info.c
capinfos_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
# Libraries with which to link capinfos.
......@@ -533,6 +624,10 @@ capinfos_LDADD = \
@GLIB_LIBS@ \
@LIBGCRYPT_LIBS@
captype_SOURCES = \
captype.c \
ws_version_info.c
captype_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
# Libraries with which to link captype.
......@@ -541,6 +636,10 @@ captype_LDADD = \
wsutil/libwsutil.la \
@GLIB_LIBS@
editcap_SOURCES = \
editcap.c \
ws_version_info.c
editcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
# Libraries with which to link editcap.
......@@ -549,6 +648,10 @@ editcap_LDADD = \
wsutil/libwsutil.la \
@GLIB_LIBS@
reordercap_SOURCES = \
reordercap.c \
ws_version_info.c
reordercap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
# Libraries with which to link reordercap.
......@@ -557,6 +660,10 @@ reordercap_LDADD = \
wsutil/libwsutil.la \
@GLIB_LIBS@
randpkt_SOURCES = \
randpkt.c \
ws_version_info.c
randpkt_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
# Libraries with which to link randpkt.
......@@ -568,6 +675,9 @@ randpkt_LDADD = \
@PCAP_LIBS@ \
@C_ARES_LIBS@
dftest_SOURCES = \
dftest.c
dftest_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
# Libraries and plugin flags with which to link dftest.
......@@ -586,7 +696,16 @@ dftest_LDADD = \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
echld_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
echld_test_SOURCES = \
echld_test.c \
capture_opts.c \
capture_stop_conditions.c \
cfile.c \
conditions.c \
ringbuffer.c \
sync_pipe_write.c
echld_test_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
echld_test_LDADD = \
epan/libwireshark.la \
......@@ -598,9 +717,19 @@ echld_test_LDADD = \
@C_ARES_LIBS@
echld_test_DEPENDENCIES = \
echld/libechld.la \
echld/libechld.la \
epan/libwireshark.la
dumpcap_SOURCES = \
capture_opts.c \
capture_stop_conditions.c \
conditions.c \
dumpcap.c \
filter_files.c \
ringbuffer.c \
sync_pipe_write.c \
ws_version_info.c
dumpcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
dumpcap_CFLAGS = $(AM_CFLAGS) $(PIE_CFLAGS)
......@@ -619,6 +748,17 @@ dumpcap_LDADD = \
@LIBCAP_LIBS@ \
@LIBNL_LIBS@
# this target needed for distribution only
noinst_HEADERS = \
$(SHARK_COMMON_INCLUDES) \
$(EXTCAP_COMMON_INCLUDES) \
$(WIRESHARK_COMMON_INCLUDES) \
capture_stop_conditions.h \
conditions.h \
ringbuffer.h \
ws_diag_control.h \
ws_version_info.h
#
# Build the version string
#
......@@ -642,7 +782,7 @@ SUFFIXES = .sh
services:
$(PYTHON) $(srcdir)/tools/make-services.py
CLEANFILES = \
CLEANFILES = \
*~ \
doxygen-core.tag \
vgcore.*
......@@ -661,7 +801,7 @@ DISTCLEANFILES = \
ps.c \
version.h
MAINTAINERCLEANFILES = \
MAINTAINERCLEANFILES = \
$(GENERATED_FILES) \
Makefile.in \
aclocal.m4 \
......@@ -679,7 +819,6 @@ EXTRA_DIST = \
.mailmap \
INSTALL.configure \
Makefile.am.inc \
Makefile.common \
README.aix \
README.bsd \
README.DECT \
......
# 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.
# "BUILT_SOURCES" are built before any "make all" or "make check" targets.
BUILT_HEADER_FILES = \
version.h
BUILT_C_FILES =
BUILT_SOURCES = $(BUILT_C_FILES) $(BUILT_HEADER_FILES)
# Header files generated from source files.
GENERATED_HEADER_FILES = \
text2pcap-scanner_lex.h \
$(BUILT_HEADER_FILES)
# C source files generated from source files.
GENERATED_C_FILES =
# All the generated files.
GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
EXTCAP_COMMON_SRC = \
extcap.c \
extcap_parser.c
EXTCAP_COMMON_INCLUDES = \
extcap.h \
extcap_parser.h
# sources common for wireshark, tshark, and rawshark
SHARK_COMMON_SRC = \
cfile.c \
frame_tvbuff.c \
sync_pipe_write.c
# corresponding headers
SHARK_COMMON_INCLUDES = \
cfile.h \
file.h \
fileset.h \
frame_tvbuff.h \
register.h \
ws_symbol_export.h
# wireshark specifics
WIRESHARK_COMMON_SRC = \
$(SHARK_COMMON_SRC) \
capture_info.c \
capture_opts.c \
file.c \
fileset.c \
filter_files.c \
summary.c \
ws_version_info.c
# corresponding headers
WIRESHARK_COMMON_INCLUDES = \
capture_info.h \
capture_opts.h \
filter_files.h \
globals.h \
log.h \
summary.h \
sync_pipe.h
# tshark specifics
tshark_SOURCES = \
$(SHARK_COMMON_SRC) \
capture_opts.c \
filter_files.c \
tshark.c \
ws_version_info.c
# tfshark specifics
tfshark_SOURCES = \
$(SHARK_COMMON_SRC) \
tfshark.c \
ws_version_info.c
# rawshark specifics
rawshark_SOURCES = \
$(SHARK_COMMON_SRC) \
rawshark.c \
ws_version_info.c
# text2pcap specifics
text2pcap_SOURCES = \
text2pcap.c \
text2pcap-scanner.l \
ws_version_info.c
text2pcap_INCLUDES = \
text2pcap.h
# mergecap specifics
mergecap_SOURCES = \
mergecap.c \
ws_version_info.c
# editcap specifics
editcap_SOURCES = \
editcap.c \
ws_version_info.c
# reordercap specifics
reordercap_SOURCES = \
reordercap.c \
ws_version_info.c
# capinfos specifics
capinfos_SOURCES = \
capinfos.c \
ws_version_info.c
# captype specifics
captype_SOURCES = \
captype.c \
ws_version_info.c
# dftest specifics
dftest_SOURCES = \
dftest.c
# echld specifics
echld_test_SOURCES = \
echld_test.c \
capture_opts.c \
capture_stop_conditions.c \
cfile.c \
conditions.c \
ringbuffer.c \
sync_pipe_write.c
# randpkt specifics
randpkt_SOURCES = \
randpkt.c \
ws_version_info.c
# dumpcap specifics
dumpcap_SOURCES = \
capture_opts.c \
capture_stop_conditions.c \
conditions.c \
dumpcap.c \
filter_files.c \
ringbuffer.c \
sync_pipe_write.c \
ws_version_info.c
# corresponding headers
dumpcap_INCLUDES = \
capture_stop_conditions.h \
conditions.h \
ringbuffer.h
# this target needed for distribution only
noinst_HEADERS = \
$(SHARK_COMMON_INCLUDES) \
$(EXTCAP_COMMON_INCLUDES) \
$(WIRESHARK_COMMON_INCLUDES) \
$(dumpcap_INCLUDES) \
ws_diag_control.h \
ws_version_info.h
......@@ -19,29 +19,33 @@
# 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)
noinst_LIBRARIES = libcapchild.a
# All sources that should be put in the source distribution tarball
libcapchild_a_SOURCES = \
capture_ifinfo.c \
capture_sync.c \
capture_session.h \
capture_sync.h
libcapchild_a_DEPENDENCIES =
EXTRA_DIST = \
CMakeLists.txt \
doxygen.cfg.in
CLEANFILES = \
doxygen-capchild.tag \
libcapchild.a \
*~
MAINTAINERCLEANFILES = \
$(GENERATED_FILES) \
Makefile.in
# All sources that should be put in the source distribution tarball
libcapchild_a_SOURCES = \
$(CAPCHILD_SRC) \
$(noinst_HEADERS)
libcapchild_a_DEPENDENCIES =
doxygen:
if HAVE_DOXYGEN
$(DOXYGEN) doxygen.cfg
......@@ -57,15 +61,9 @@ checkapi: checkapi-base checkapi-todo
checkapi-base:
$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g deprecated-gtk -build \
-sourcedir=$(srcdir) \
$(CAPCHILD_SRC)
$(libcapchild_a_SOURCES)
checkapi-todo:
$(PERL) $(top_srcdir)/tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \
-sourcedir=$(srcdir) \
$(CAPCHILD_SRC)
EXTRA_DIST = \
$(GENERATOR_FILES) \
CMakeLists.txt \
doxygen.cfg.in \
Makefile.common
\ No newline at end of file
$(libcapchild_a_SOURCES)
# 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.
CAPCHILD_SRC = \
capture_ifinfo.c \
capture_sync.c
noinst_HEADERS = \
capture_session.h \
capture_sync.h
......@@ -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)
# 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
#