From ea0d5be193ee7ba922e8317aeac6e329d9d74b65 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 18 Mar 2014 14:38:32 -0400 Subject: [PATCH] FS-6293: mod_dingaling srcdir build --- src/mod/endpoints/mod_dingaling/Makefile.am | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mod/endpoints/mod_dingaling/Makefile.am b/src/mod/endpoints/mod_dingaling/Makefile.am index dbfed5e34f..d19cf41bdf 100644 --- a/src/mod/endpoints/mod_dingaling/Makefile.am +++ b/src/mod/endpoints/mod_dingaling/Makefile.am @@ -4,18 +4,19 @@ IKS_DIR=$(switch_srcdir)/libs/iksemel IKS_BUILDDIR=$(switch_builddir)/libs/iksemel IKS_LA=$(IKS_BUILDDIR)/src/libiksemel.la DING_DIR=$(switch_srcdir)/libs/libdingaling +DING_BUILDDIR=$(switch_builddir)/libs/libdingaling mod_LTLIBRARIES = mod_dingaling.la mod_dingaling_la_SOURCES = mod_dingaling.c ../../../../libs/libdingaling/src/libdingaling.c ../../../../libs/libdingaling/src/sha1.c mod_dingaling_la_CFLAGS = $(AM_CFLAGS) -mod_dingaling_la_CFLAGS += `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes` -mod_dingaling_la_CFLAGS += `$(switch_srcdir)/libs/apr-util/apu-1-config --includes` -mod_dingaling_la_CFLAGS += -I$(DING_DIR)/src -I$(IKS_DIR)/include +mod_dingaling_la_CFLAGS += `$(switch_builddir)/libs/apr/apr-1-config --cflags --cppflags --includes` +mod_dingaling_la_CFLAGS += `$(switch_builddir)/libs/apr-util/apu-1-config --includes` +mod_dingaling_la_CFLAGS += -I$(DING_DIR)/src -I$(DING_BUILDDIR)/src -I$(IKS_DIR)/include mod_dingaling_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(IKS_LA) mod_dingaling_la_LDFLAGS = -avoid-version -module -no-undefined -shared BUILT_SOURCES=$(IKS_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)