From 2ab491b1cd635bf194bd38e14efbde5aed637910 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 17 Jun 2009 21:40:22 +0000 Subject: [PATCH] fix mac build git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13823 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- configure.in | 1 + src/mod/asr_tts/mod_unimrcp/Makefile | 27 ------------- src/mod/asr_tts/mod_unimrcp/Makefile.am | 50 +++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 27 deletions(-) delete mode 100644 src/mod/asr_tts/mod_unimrcp/Makefile create mode 100644 src/mod/asr_tts/mod_unimrcp/Makefile.am diff --git a/configure.in b/configure.in index c4fa96805a..41d1be2489 100644 --- a/configure.in +++ b/configure.in @@ -747,6 +747,7 @@ AC_CONFIG_FILES([Makefile src/Makefile src/mod/Makefile src/mod/endpoints/mod_sofia/Makefile + src/mod/asr_tts/mod_unimrcp/Makefile src/mod/event_handlers/mod_radius_cdr/Makefile src/mod/languages/mod_java/Makefile src/mod/languages/mod_python/Makefile diff --git a/src/mod/asr_tts/mod_unimrcp/Makefile b/src/mod/asr_tts/mod_unimrcp/Makefile deleted file mode 100644 index 949de8c720..0000000000 --- a/src/mod/asr_tts/mod_unimrcp/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -BASE=../../../../ - -UNIMRCP_DIR=$(switch_srcdir)/libs/unimrcp -UNIMRCPLA=$(UNIMRCP_DIR)/platforms/libunimrcp-client/libunimrcpclient.la -LOCAL_CFLAGS=-I. -LOCAL_CFLAGS+=-I$(switch_srcdir)/libs/apr/include -LOCAL_CFLAGS+=-I$(switch_srcdir)/libs/apr-util/include -LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/platforms/libunimrcp-client/include -LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/modules/mrcp-sofiasip/include -LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/modules/mrcp-unirtsp/include -LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcp-client/include -LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcp-signaling/include -LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcpv2-transport/include -LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcp/include -LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcp/message/include -LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcp/control/include -LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mrcp/resources/include -LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/mpf/include -LOCAL_CFLAGS+=-I$(UNIMRCP_DIR)/libs/apr-toolkit/include -LOCAL_LIBADD=$(UNIMRCPLA) - -include $(BASE)/build/modmake.rules - -$(UNIMRCPLA): $(UNIMRCP_DIR) $(UNIMRCP_DIR)/.update - cd $(UNIMRCP_DIR) && $(MAKE) - $(TOUCH_TARGET) - diff --git a/src/mod/asr_tts/mod_unimrcp/Makefile.am b/src/mod/asr_tts/mod_unimrcp/Makefile.am new file mode 100644 index 0000000000..42af94f531 --- /dev/null +++ b/src/mod/asr_tts/mod_unimrcp/Makefile.am @@ -0,0 +1,50 @@ +MODNAME=mod_unimrcp + +AM_CFLAGS = $(SWITCH_AM_CFLAGS) +AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) +#AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) +#we should set all these vars from configure, no reason to have these in each Makefile.am +LIBTOOL = echo "`link=\`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll\`;if test -n "$$link"; then echo Creating $@;fi`";`if test -z "$(VERBOSE)" ; \ +then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(SHELL) $(switch_builddir)/libtool; fi` +AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s` +# Dirty trick to override the link output +LIBS+=> $(MODNAME).log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat $(MODNAME).log;fi;if test "$$error" = "yes";then exit 1;fi + +moddir=@modinstdir@ + +UNIMRCP_DIR=$(switch_builddir)/libs/unimrcp +UNIMRCPLA=$(UNIMRCP_DIR)/platforms/libunimrcp-client/libunimrcpclient.la + +mod_LTLIBRARIES = mod_unimrcp.la +mod_unimrcp_la_SOURCES = mod_unimrcp.c +mod_unimrcp_la_CFLAGS = $(AM_CFLAGS) +mod_unimrcp_la_CFLAGS += -I. +mod_unimrcp_la_CFLAGS += -I$(switch_srcdir)/libs/apr/include +mod_unimrcp_la_CFLAGS += -I$(switch_srcdir)/libs/apr-util/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/platforms/libunimrcp-client/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/modules/mrcp-sofiasip/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/modules/mrcp-unirtsp/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp-client/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp-signaling/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcpv2-transport/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp/message/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp/control/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mrcp/resources/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/mpf/include +mod_unimrcp_la_CFLAGS += -I$(UNIMRCP_DIR)/libs/apr-toolkit/include + +mod_unimrcp_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(UNIMRCPLA) +mod_unimrcp_la_LDFLAGS = -avoid-version -module -no-undefined + +if ISMAC +mod_unimrcp_la_LDFLAGS += -framework CoreFoundation -framework SystemConfiguration +endif + +BUILT_SOURCES = $(UNIMRCPLA) + +$(UNIMRCPLA): $(UNIMRCP_DIR) $(UNIMRCP_DIR)/.update + cd $(UNIMRCP_DIR) && $(MAKE) + $(TOUCH_TARGET) + +$(mod_unimrcp_la_SOURCES) : $(BUILT_SOURCES)