From 61368b24c16d7f9509fe7f5b1895d8404e23cd50 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Wed, 19 Aug 2020 22:25:01 +0200 Subject: [PATCH 1/2] [mod_spandsp] Fix typo Signed-off-by: Sebastian Kemper --- src/mod/applications/mod_spandsp/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/applications/mod_spandsp/Makefile.am b/src/mod/applications/mod_spandsp/Makefile.am index 61ae45a416..60cc0068c5 100644 --- a/src/mod/applications/mod_spandsp/Makefile.am +++ b/src/mod/applications/mod_spandsp/Makefile.am @@ -4,6 +4,6 @@ MODNAME=mod_spandsp mod_LTLIBRARIES = mod_spandsp.la mod_spandsp_la_SOURCES = mod_spandsp.c udptl.c mod_spandsp_fax.c mod_spandsp_dsp.c mod_spandsp_codecs.c mod_spandsp_modem.c mod_spandsp_la_CFLAGS = $(AM_CFLAGS) -mod_spandsp_la_CPPFLAGS = $(SPANDSL_CFLAGS) -I. +mod_spandsp_la_CPPFLAGS = $(SPANDSP_CFLAGS) -I. mod_spandsp_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LIBS) -ljpeg -lz -ltiff mod_spandsp_la_LDFLAGS = -avoid-version -module -no-undefined -shared From 51fba83ed3ed2d9753d8e6b13e13001aca50b493 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Wed, 19 Aug 2020 22:26:04 +0200 Subject: [PATCH 2/2] [mod_gsmopen] Fix build with external spandsp Signed-off-by: Sebastian Kemper --- src/mod/endpoints/mod_gsmopen/Makefile.am | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/mod/endpoints/mod_gsmopen/Makefile.am b/src/mod/endpoints/mod_gsmopen/Makefile.am index b18a665421..e7c20f257c 100644 --- a/src/mod/endpoints/mod_gsmopen/Makefile.am +++ b/src/mod/endpoints/mod_gsmopen/Makefile.am @@ -1,19 +1,9 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_gsmopen -SPANDSP_DIR=$(switch_srcdir)/libs/spandsp -SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp -SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la - mod_LTLIBRARIES = mod_gsmopen.la mod_gsmopen_la_SOURCES = mod_gsmopen.cpp gsmopen_protocol.cpp mod_gsmopen_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) -mod_gsmopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(SPANDSP_BUILDDIR)/src -I. -mod_gsmopen_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) +mod_gsmopen_la_CPPFLAGS = $(SPANDSP_CFLAGS) -I. +mod_gsmopen_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LIBS) mod_gsmopen_la_LDFLAGS = -avoid-version -module -no-undefined -lctb-0.16 -lgsmme - -BUILT_SOURCES = $(SPANDSP_LA) - -$(SPANDSP_LA): $(SPANDSP_DIR) $(SPANDSP_DIR)/.update - cd $(SPANDSP_BUILDDIR) && $(MAKE) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" - $(TOUCH_TARGET)