aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.am
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-10-15 11:00:38 +0100
committerJoão Valverde <j@v6e.pt>2017-10-20 05:33:38 +0000
commit0a6c51e4a0319ca62fb41664da4eac7482844227 (patch)
treeff7a4b06c51cb0d1a0583078d0a99e203aa87ef8 /epan/Makefile.am
parente6e8b7b662419466a264201a6d08af2dc9a737e9 (diff)
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>
Diffstat (limited to 'epan/Makefile.am')
-rw-r--r--epan/Makefile.am14
1 files changed, 5 insertions, 9 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am
index e1a0993027..ab8570270f 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -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.
#