osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

autotools: Move SBC dependency to libwscodecs 

Change-Id: I931961033798613b78f846c9176dffdb8385bf43
Reviewed-on: https://code.wireshark.org/review/13782
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2016-02-05 18:10:36 +00:00 committed by João Valverde
parent 13ec77a9fc
commit 387c8864bf
5 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -28,7 +28,7 @@ ACLOCAL_AMFLAGS = `./aclocal-flags`
# Common headers
AM_CPPFLAGS += -I$(top_srcdir)/wiretap $(LIBGNUTLS_CFLAGS) \
$(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LUA_CFLAGS) $(SBC_CFLAGS) \
$(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LUA_CFLAGS) \
$(KRB5_CFLAGS)
bin_PROGRAMS = \
@ -424,7 +424,6 @@ wireshark_common_ldadd = \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@ \
@SBC_LIBS@ \
@GLIB_LIBS@
if HAVE_Qt

44
codecs/Makefile.am
View File

@ -24,6 +24,32 @@ include $(top_srcdir)/Makefile.am.inc
AM_CPPFLAGS += -I$(top_srcdir)/wiretap -DWS_BUILD_DLL
lib_LTLIBRARIES = libwscodecs.la
if HAVE_SBC
LIBWSCODECS_SRC += sbc/sbc.c
endif
# All sources that should be put in the source distribution tarball
libwscodecs_la_SOURCES = \
$(LIBWSCODECS_SRC) \
$(noinst_HEADERS)
libwscodecs_la_CFLAGS = $(AM_CFLAGS) $(SBC_CFLAGS)
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
libwscodecs_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
libwscodecs_la_LIBADD = $(top_builddir)/wsutil/libwsutil.la $(SBC_LIBS)
libwscodecs_la_DEPENDENCIES = $(top_builddir)/wsutil/libwsutil.la
EXTRA_DIST = \
CMakeLists.txt \
Makefile.common \
Makefile.nmake \
speex/README.txt
CLEANFILES = \
libwscodec.la \
*~
@ -31,25 +57,7 @@ CLEANFILES = \
MAINTAINERCLEANFILES = \
Makefile.in
lib_LTLIBRARIES = libwscodecs.la
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
libwscodecs_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
# All sources that should be put in the source distribution tarball
libwscodecs_la_SOURCES = \
$(LIBWSCODECS_SRC) \
$(noinst_HEADERS)
libwscodecs_la_DEPENDENCIES = ${top_builddir}/wsutil/libwsutil.la
libwscodecs_la_LIBADD = ${top_builddir}/wsutil/libwsutil.la
checkapi:
$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \
-sourcedir=$(srcdir) \
$(LIBWSCODECS_SRC)
EXTRA_DIST = \
CMakeLists.txt \
Makefile.common \
Makefile.nmake

3
codecs/Makefile.common
View File

@ -27,7 +27,6 @@ LIBWSCODECS_SRC = \
G711u/G711udecode.c \
G722/G722decode.c \
G726/G726decode.c \
sbc/sbc.c \
speex/resample.c
noinst_HEADERS = \
@ -38,7 +37,5 @@ noinst_HEADERS = \
G726/G726decode.h \
sbc/sbc_private.h \
speex/arch.h \
speex/README.txt \
speex/speex_resampler.h \
speex/stack_alloc.h

2
codecs/Makefile.nmake
View File

@ -84,4 +84,4 @@ maintainer-clean: distclean
checkapi:
$(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \
$(LIBWSCODECS_SRC)
$(LIBWSCODECS_SRC) sbc/sbc.c

1
configure.ac
View File

@ -3021,6 +3021,7 @@ if test "x$with_sbc" != "xno"; then
else
have_sbc=no
fi
AM_CONDITIONAL(HAVE_SBC, test "x$have_sbc" = "xyes")
dnl
dnl check whether plugins should be enabled and, if they should be,