forked from osmocom/wireshark
autotools: Improve SUBDIRS usage
Change-Id: Ia40970c37f4b60f8b820c334c3c728a0ac33f228 Reviewed-on: https://code.wireshark.org/review/23996 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde
João Valverde
parent
e6e8b7b662
commit
0a6c51e4a0
12
Makefile.am
12
Makefile.am
|
|
@ -842,6 +842,14 @@ endif
|
|||
endif
|
||||
|
||||
|
||||
if HAVE_PLUGINS
|
||||
plugins_subdir = plugins
|
||||
endif
|
||||
|
||||
if HAVE_EXTCAP
|
||||
extcap_subdir = extcap
|
||||
endif
|
||||
|
||||
DIST_SUBDIRS = \
|
||||
capchild \
|
||||
caputils \
|
||||
|
|
@ -871,14 +879,14 @@ SUBDIRS = \
|
|||
epan \
|
||||
capchild \
|
||||
caputils \
|
||||
@plugins_dir@ \
|
||||
$(plugins_subdir) \
|
||||
help \
|
||||
ui \
|
||||
codecs \
|
||||
@wireshark_SUBDIRS@ \
|
||||
ui/cli \
|
||||
randpkt_core \
|
||||
@extcap_subdir@ \
|
||||
$(extcap_subdir) \
|
||||
. \
|
||||
doc
|
||||
|
||||
|
|
|
|||
|
|
@ -2573,12 +2573,8 @@ AC_ARG_WITH(plugins,
|
|||
AM_CONDITIONAL(HAVE_PLUGINS, test "x$have_plugins" = "xyes")
|
||||
if test x$have_plugins = xyes
|
||||
then
|
||||
plugins_dir="plugins"
|
||||
AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled])
|
||||
else
|
||||
plugins_dir=""
|
||||
fi
|
||||
AC_SUBST(plugins_dir)
|
||||
AC_SUBST(plugindir)
|
||||
|
||||
#
|
||||
|
|
@ -2612,10 +2608,8 @@ AM_CONDITIONAL(HAVE_EXTCAP, test "x$have_extcap" = "xyes")
|
|||
if test "x$have_extcap" = "xyes"
|
||||
then
|
||||
AC_DEFINE(HAVE_EXTCAP, 1, [Define if external capture sources should be enabled])
|
||||
extcap_subdir="extcap"
|
||||
extcap_man="extcap.4"
|
||||
fi
|
||||
AC_SUBST(extcap_subdir)
|
||||
AC_SUBST(extcap_man)
|
||||
AC_SUBST(extcapdir)
|
||||
|
||||
|
|
@ -2933,7 +2927,6 @@ AC_CONFIG_FILES(
|
|||
epan/dissectors/asn1/x509ce/Makefile
|
||||
epan/dissectors/asn1/x509if/Makefile
|
||||
epan/dissectors/asn1/x509sat/Makefile
|
||||
epan/dissectors/asn1/x721/Makefile
|
||||
capchild/Makefile
|
||||
capchild/doxygen.cfg
|
||||
caputils/Makefile
|
||||
|
|
|
|||
|
|
@ -24,19 +24,11 @@
|
|||
include $(top_srcdir)/Makefile.am.inc
|
||||
|
||||
if HAVE_LIBLUA
|
||||
wslua_lib = wslua/libwslua.la
|
||||
wslua_dir = wslua
|
||||
wslua_dist_dir =
|
||||
else # HAVE_LIBLUA
|
||||
wslua_lib =
|
||||
wslua_dir =
|
||||
wslua_dist_dir = wslua
|
||||
endif # HAVE_LIBLUA
|
||||
endif
|
||||
|
||||
SUBDIRS = compress crypt ftypes dfilter dissectors wmem $(wslua_dir)
|
||||
|
||||
DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir)
|
||||
|
||||
AM_CPPFLAGS = $(INCLUDEDIRS) -I$(builddir)/wslua $(WS_CPPFLAGS) \
|
||||
$(GLIB_CFLAGS) $(PCAP_CFLAGS) $(LUA_CFLAGS) $(LIBGNUTLS_CFLAGS) \
|
||||
$(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) \
|
||||
|
|
@ -315,6 +307,10 @@ libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL
|
|||
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
|
||||
libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_BIGSHAREDLIB@ @LDFLAGS_SHAREDLIB@
|
||||
|
||||
if HAVE_LIBLUA
|
||||
wslua_lib = wslua/libwslua.la
|
||||
endif
|
||||
|
||||
#
|
||||
# Add the object files for missing routines, if any.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -128,12 +128,11 @@ SUBDIRS = \
|
|||
x509if \
|
||||
x509sat
|
||||
|
||||
# x721 doesn't build
|
||||
DONT_BUILD_SUBDIRS = \
|
||||
x721
|
||||
|
||||
DIST_SUBDIRS = $(SUBDIRS) $(DONT_BUILD_SUBDIRS)
|
||||
|
||||
EXTRA_DIST = \
|
||||
CMakeLists.txt \
|
||||
Makefile.inc
|
||||
Makefile.inc \
|
||||
x721/CMakeLists.txt \
|
||||
x721/Attribute-ASN1Module.asn \
|
||||
x721/ManagedObjectClassesDefinitions.asn \
|
||||
x721/Notification-ASN1Module.asn \
|
||||
x721/Parameter-ASN1Module.asn
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
# 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.
|
||||
|
||||
include ../Makefile.inc
|
||||
|
||||
#Dummy entry to pass the clean target
|
||||
PROTOCOL_NAME = dummy
|
||||
|
||||
ASN_FILE_LIST =
|
||||
|
||||
INCLUDED_ASN_FILE_LIST =
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(EXTRA_DIST_COMMON) \
|
||||
$(ASN_FILE_LIST) \
|
||||
$(INCLUDED_ASN_FILE_LIST) \
|
||||
Attribute-ASN1Module.asn \
|
||||
ManagedObjectClassesDefinitions.asn \
|
||||
Notification-ASN1Module.asn \
|
||||
Parameter-ASN1Module.asn
|
||||
Loading…
Reference in New Issue