aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-11-05 12:44:40 +0000
committerJoão Valverde <j@v6e.pt>2017-11-05 13:31:29 +0000
commitf891603a47cb99fd842fb06a6b0712fa92041fc8 (patch)
tree94897ca33654a0895b2e9d72edd59cafe3f48bdf
parentff3bd8c7ce5197ec533c8115a96655a4829d9c82 (diff)
autotools: Eliminate spurious libwireshark_asmopt library
Change-Id: I96e03f136efd90892fbcf812ea37e36a2bed5ab9 Reviewed-on: https://code.wireshark.org/review/24253 Reviewed-by: João Valverde <j@v6e.pt>
-rw-r--r--epan/Makefile.am16
1 files changed, 4 insertions, 12 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am
index e85f97b..e09bee4 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -34,7 +34,7 @@ AM_CPPFLAGS = $(INCLUDEDIRS) -I$(builddir)/wslua $(WS_CPPFLAGS) \
$(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) \
$(LZ4_CFLAGS) $(KRB5_CFLAGS) $(SNAPPY_CFLAGS) $(LIBXML2_CFLAGS)
-noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
+noinst_LTLIBRARIES = libwireshark_generated.la
lib_LTLIBRARIES = libwireshark.la
LIBWIRESHARK_SRC = \
@@ -44,6 +44,7 @@ LIBWIRESHARK_SRC = \
afn.c \
aftypes.c \
app_mem_usage.c \
+ asm_utils.c \
asn1.c \
capture_dissectors.c \
charsets.c \
@@ -284,6 +285,7 @@ LIBWIRESHARK_INCLUDES_PUBLIC = \
xdlc.h
LIBWIRESHARK_INCLUDES_PRIVATE = \
+ asm_utils.h \
epan-int.h \
to_str-int.h
@@ -314,7 +316,6 @@ endif
#
libwireshark_la_LIBADD = \
libwireshark_generated.la \
- libwireshark_asmopt.la \
crypt/libairpdcap.la \
ftypes/libftypes.la \
dfilter/libdfilter.la \
@@ -339,7 +340,6 @@ libwireshark_la_LIBADD = \
libwireshark_la_DEPENDENCIES = \
libwireshark_generated.la \
- libwireshark_asmopt.la \
crypt/libairpdcap.la \
ftypes/libftypes.la \
dfilter/libdfilter.la \
@@ -360,15 +360,9 @@ nodist_libwireshark_generated_la_SOURCES = \
libwireshark_generated_la_CFLAGS = $(GENERATED_CFLAGS)
-# code optionally implemented in assembler
-# only C source available for platforms other than Win32
-libwireshark_asmopt_la_SOURCES = \
- asm_utils.c \
- asm_utils.h \
- asm_utils_win32_x86.asm
-
EXTRA_DIST = \
.editorconfig \
+ asm_utils_win32_x86.asm \
diam_dict.l \
dtd_grammar.lemon \
dtd_parse.l \
@@ -386,8 +380,6 @@ CLEANFILES = \
libwireshark.la \
libwireshark_generated.a \
libwireshark_generated.la \
- libwireshark_asmopt.a \
- libwireshark_asmopt.la \
*~
DISTCLEANFILES = \