Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af342e6e authored Jan 02, 2017 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jan 02, 2017

Merge "mm-audio: avoid library version" into audio-userspace.lnx.2.2-dev

parents edaa1828 d0faf2e0

mm-audio/aenc-aac/qdsp6/Makefile.am

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,8 +24,8 @@ lib_LTLIBRARIES = libOmxAacEnc.la
		libOmxAacEnc_la_SOURCES = $(c_sources)
		libOmxAacEnc_la_CFLAGS = $(AM_CFLAGS) -fPIC $(GLIB_CFLAGS) -include glib.h -Dstrlcpy=g_strlcpy
		libOmxAacEnc_la_CPPFLAGS = $(AM_CPPFLAGS) -fPIC $(GLIB_CFLAGS) -include glib.h -Dstrlcpy=g_strlcpy
		libOmxAacEnc_la_LDLIBS = -lmm-omxcore -lstdc++ -lpthread $(GLIB_LIBS) -ldl -llog
		libOmxAacEnc_la_LDFLAGS = -shared $(GLIB_LIBS) -version-info $(OMXAUDIO_LIBRARY_VERSION)
		libOmxAacEnc_la_LIBADD = -lmm-omxcore -lstdc++ -lpthread $(GLIB_LIBS) -ldl -llog
		libOmxAacEnc_la_LDFLAGS = -shared $(GLIB_LIBS) -avoid-version $(OMXAUDIO_LIBRARY_VERSION)

		bin_PROGRAMS = mm-aenc-omxaac-test
		mm_aenc_omxaac_test_SOURCES = ./test/omx_aac_enc_test.c

mm-audio/aenc-amrnb/qdsp6/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ libOmxAmrEnc_la_SOURCES = $(c_sources)
		libOmxAmrEnc_la_LIBADD = -lcutils -llog
		libOmxAmrEnc_la_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(GLIB_CFLAGS) -include glib.h -Dstrlcpy=g_strlcpy
		libOmxAmrEnc_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(GLIB_CFLAGS) -include glib.h -Dstrlcpy=g_strlcpy
		libOmxAmrEnc_la_LDFLAGS = $(GLIB_LIBS) -shared -version-info 1:0:0
		libOmxAmrEnc_la_LDFLAGS = $(GLIB_LIBS) -shared -avoid-version

		bin_PROGRAMS = mm_aenc_omxamr_test

mm-audio/aenc-g711/qdsp6/Makefile.am

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,8 @@ lib_LTLIBRARIES = libOmxG711Enc.la
		libOmxG711Enc_la_SOURCES = $(C_SOURCES)
		libOmxG711Enc_la_CFLAGS = $(AM_CFLAGS) -Dstrlcpy=g_strlcpy $(GLIB_CFLAGS) -include glib.h
		libOmxG711Enc_la_CPPFLAGS = $(AM_CFLAGS) -Dstrlcpy=g_strlcpy $(GLIB_CFLAGS) -include glib.h
		libOmxG711Enc_la_LDFLAGS = $(GLIB_LIBS) -lcutils -llog -lstdc++
		libOmxG711Enc_la_LIBADD = $(GLIB_LIBS) -lcutils -llog -lstdc++
		libOmxG711Enc_la_LDFLAGS = -shared -avoid-version

		bin_PROGRAMS = mm_aenc_omxg711_test
		mm_aenc_omxg711_test_SOURCES = ./test/omx_g711_enc_test.c