From: Michael Jerris <mike@jerris.com>
Date: Tue, 18 Mar 2014 18:07:38 +0000 (-0400)
Subject: FS-6293: mod_esl srcdir build
X-Git-Tag: v1.5.12~442
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e077aa0db078166b307f9284437ed21db07f9d34;p=thirdparty%2Ffreeswitch.git

FS-6293: mod_esl srcdir build
---

diff --git a/src/mod/applications/mod_esl/Makefile.am b/src/mod/applications/mod_esl/Makefile.am
index dea233f1eb..7ac556bf48 100644
--- a/src/mod/applications/mod_esl/Makefile.am
+++ b/src/mod/applications/mod_esl/Makefile.am
@@ -3,11 +3,17 @@ include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_esl
 ESL_DIR = $(switch_srcdir)/libs/esl
 
+ESL_SRCS  =../../../../libs/esl/src/esl.c ../../../../libs/esl/src/esl_json.c
+ESL_SRCS +=../../../../libs/esl/src/esl_event.c ../../../../libs/esl/src/esl_threadmutex.c
+ESL_SRCS +=../../../../libs/esl/src/esl_config.c ../../../../libs/esl/src/esl_oop.cpp
+ESL_SRCS +=../../../../libs/esl/src/esl_buffer.c
+
 mod_LTLIBRARIES = mod_esl.la
-mod_esl_la_SOURCES  = mod_esl.c
-mod_esl_la_CFLAGS   = $(AM_CFLAGS) -I$(ESL_DIR)/src/include
-mod_esl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(ESL_DIR)/libesl.a
+mod_esl_la_SOURCES  = mod_esl.c $(ESL_SRCS)
+mod_esl_la_CFLAGS   = $(AM_CFLAGS)
+mod_esl_la_CPPFLAGS = -I$(ESL_DIR)/src/include
+mod_esl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la #$(ESL_DIR)/libesl.a
 mod_esl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-$(ESL_DIR)/libesl.a: $(ESL_DIR)/Makefile
-	cd $(ESL_DIR) && $(MAKE) -j1
+#$(ESL_DIR)/libesl.a: $(ESL_DIR)/Makefile
+#	cd $(ESL_DIR) && $(MAKE) -j1