diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-05 18:10:36 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-02-07 23:23:16 +0000 |
| commit | 387c8864bff0921593ab4849c4868a66948c2c7c (patch) | |
| tree | d095619baef0c46e1789ce470bd9a2ad4fcb2fe5 /codecs | |
| parent | 13ec77a9fc3af3b0b502820d0b55796c89997896 (diff) | |
| download | wireshark-387c8864bff0921593ab4849c4868a66948c2c7c.tar.gz | |
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>
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/Makefile.am | 40 | ||||
| -rw-r--r-- | codecs/Makefile.common | 3 | ||||
| -rw-r--r-- | codecs/Makefile.nmake | 2 |
3 files changed, 25 insertions, 20 deletions
diff --git a/codecs/Makefile.am b/codecs/Makefile.am index d75f246f2b..9242f8a5b0 100644 --- a/codecs/Makefile.am +++ b/codecs/Makefile.am @@ -24,32 +24,40 @@ include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS += -I$(top_srcdir)/wiretap -DWS_BUILD_DLL -CLEANFILES = \ - libwscodec.la \ - *~ - -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@ + +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_DEPENDENCIES = ${top_builddir}/wsutil/libwsutil.la +libwscodecs_la_CFLAGS = $(AM_CFLAGS) $(SBC_CFLAGS) -libwscodecs_la_LIBADD = ${top_builddir}/wsutil/libwsutil.la +# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +libwscodecs_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ -checkapi: - $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ - -sourcedir=$(srcdir) \ - $(LIBWSCODECS_SRC) +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 + Makefile.nmake \ + speex/README.txt + +CLEANFILES = \ + libwscodec.la \ + *~ + +MAINTAINERCLEANFILES = \ + Makefile.in + +checkapi: + $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ + -sourcedir=$(srcdir) \ + $(LIBWSCODECS_SRC) diff --git a/codecs/Makefile.common b/codecs/Makefile.common index 66aa79dde4..a4163abfb4 100644 --- a/codecs/Makefile.common +++ b/codecs/Makefile.common @@ -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 - diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake index 336bd74cef..cb59f32b50 100644 --- a/codecs/Makefile.nmake +++ b/codecs/Makefile.nmake @@ -84,4 +84,4 @@ maintainer-clean: distclean checkapi: $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(LIBWSCODECS_SRC) + $(LIBWSCODECS_SRC) sbc/sbc.c |