From 63ae87c60f8e5ec1b30cc12b07449b16a8709e6b Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 18 Mar 2014 14:46:21 -0400 Subject: [PATCH] FS-6293: fix srcdir build of mod_rayo --- src/mod/event_handlers/mod_rayo/Makefile.am | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/mod/event_handlers/mod_rayo/Makefile.am b/src/mod/event_handlers/mod_rayo/Makefile.am index d46d2e0d3c..493e5c0835 100644 --- a/src/mod/event_handlers/mod_rayo/Makefile.am +++ b/src/mod/event_handlers/mod_rayo/Makefile.am @@ -2,23 +2,25 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_rayo IKS_DIR=$(switch_srcdir)/libs/iksemel +IKS_BUILDDIR=$(switch_builddir)/libs/iksemel PCRE_DIR=$(switch_srcdir)/libs/pcre -IKS_LA=$(IKS_DIR)/src/libiksemel.la -PCRE_LA=$(PCRE_DIR)/libpcre.la +PCRE_BUILDDIR=$(switch_builddir)/libs/pcre +IKS_LA=$(IKS_BUILDDIR)/src/libiksemel.la +PCRE_LA=$(PCRE_BUILDDIR)/libpcre.la mod_LTLIBRARIES = mod_rayo.la mod_rayo_la_SOURCES = mod_rayo.c iks_helpers.c nlsml.c rayo_components.c rayo_cpa_component.c rayo_cpa_detector.c rayo_elements.c rayo_fax_components.c mod_rayo_la_SOURCES += rayo_input_component.c rayo_output_component.c rayo_prompt_component.c rayo_record_component.c sasl.c srgs.c xmpp_streams.c -mod_rayo_la_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/iksemel/include -I$(switch_srcdir)/libs/pcre +mod_rayo_la_CFLAGS = $(AM_CFLAGS) -I$(IKS_DIR)/include -I$(switch_srcdir)/libs/pcre mod_rayo_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(IKS_LA) $(PCRE_LA) mod_rayo_la_LDFLAGS = -avoid-version -module -no-undefined -shared BUILT_SOURCES=$(IKS_LA) $(PCRE_LA) -$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update - @cd $(IKS_DIR) && $(MAKE) +$(IKS_LA): $(IKS_BUILDDIR) $(IKS_DIR) $(IKS_DIR)/.update + @cd $(IKS_BUILDDIR) && $(MAKE) @$(TOUCH_TARGET) -$(PCRE_LA): $(PCRE_DIR) $(PCRE_DIR)/.update - @cd $(PCRE_DIR) && $(MAKE) +$(PCRE_LA): $(PCRE_BUILDDIR) $(PCRE_DIR) $(PCRE_DIR)/.update + @cd $(PCRE_BUILDDIR) && $(MAKE) @$(TOUCH_TARGET)