create libfiledissectors.a during the autotools build

svn path=/trunk/; revision=50097
This commit is contained in:
Martin Kaiser 2013-06-21 00:08:20 +00:00
parent de10bc6b5e
commit 35708dfd13
3 changed files with 9 additions and 3 deletions

View File

@ -140,7 +140,8 @@ libwireshark_la_LIBADD = \
libwireshark_generated.la \
libwireshark_asmopt.la crypt/libairpdcap.la \
ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
dissectors/libdirtydissectors.la wmem/libwmem.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
dissectors/libdirtydissectors.la dissectors/libfiledissectors.la \
wmem/libwmem.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
@C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
@KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \
${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \

View File

@ -20,7 +20,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
noinst_LTLIBRARIES = libdirtydissectors.la libdissectors.la
noinst_LTLIBRARIES = libdirtydissectors.la libfiledissectors.la libdissectors.la
AM_CPPFLAGS = -I$(srcdir)/../.. -I$(srcdir)/.. \
$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
@ -36,6 +36,9 @@ if HAVE_WARNINGS_AS_ERRORS
AM_CLEAN_CFLAGS = -Werror
endif
libfiledissectors_la_SOURCES = \
$(FILE_DISSECTOR_SRC)
libdissectors_la_SOURCES = \
$(DISSECTOR_SRC) \
$(ASN1_DISSECTOR_SRC) \

View File

@ -210,6 +210,8 @@ DIRTY_ASN1_DISSECTOR_SRC = \
packet-tcap.c \
$(CUSTOM_DIRTY_ASN1_DISSECTOR_SRC)
FILE_DISSECTOR_SRC = \
packet-mp4.c
#
# Dissectors without warnings.
@ -813,7 +815,6 @@ DISSECTOR_SRC = \
packet-mongo.c \
packet-mount.c \
packet-mp2t.c \
packet-mp4.c \
packet-mp4ves.c \
packet-mpeg-ca.c \
packet-mpeg-descriptor.c \
@ -1635,6 +1636,7 @@ noinst_HEADERS = \
ALL_DISSECTORS_SRC = \
$(DISSECTOR_SRC) \
$(FILE_DISSECTOR_SRC) \
$(DIRTY_DISSECTOR_SRC) \
$(PIDL_DISSECTOR_SRC) \
$(DIRTY_PIDL_DISSECTOR_SRC) \