kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch

This commit is contained in:
Chris Rienzo 2014-03-18 15:22:57 -04:00
parent 8d67246636 3a979c67ab
commit 843152b953
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/event_handlers/mod_cdr_mongodb/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_cdr_mongodb
MONGODB_DRIVER=./driver/src
MONGODB_DRIVER=$(switch_srcdir)/src/mod/event_handlers/mod_cdr_mongodb/driver/src
mod_LTLIBRARIES = mod_cdr_mongodb.la
mod_cdr_mongodb_la_SOURCES = mod_cdr_mongodb.c ./driver/src/encoding.c ./driver/src/env_posix.c ./driver/src/bson.c ./driver/src/md5.c ./driver/src/mongo.c ./driver/src/numbers.c
mod_cdr_mongodb_la_CFLAGS = $(AM_CFLAGS)

9
src/mod/languages/mod_managed/Makefile.am
View File

@ -1,5 +1,6 @@
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_managed
MANAGED_DIR=$(switch_srcdir)/src/mod/languages/mod_managed/managed
mod_LTLIBRARIES = mod_managed.la
mod_managed_la_SOURCES = mod_managed.cpp freeswitch_managed.cpp freeswitch_wrap.cpp
@ -18,18 +19,18 @@ freeswitch_wrap.cpp: freeswitch_wrap.cxx
reswig: swigclean freeswitch_wrap.cxx
local_depend:
cd managed && $(MAKE)
cd $(MANAGED_DIR) && $(MAKE)
install-data-local: $(DESTDIR)$(modulesdir)/mod_managed.$(LIBTOOL_LIB_EXTEN)
mkdir -p $(DESTDIR)$(modulesdir)/managed
cd managed && $(MAKE) INSTALL="$(LTINSTALL)" MODINSTDIR=$(modulesdir) DESTDIR=$(DESTDIR) install
cd $(MANAGED_DIR) && $(MAKE) INSTALL="$(LTINSTALL)" MODINSTDIR=$(modulesdir) DESTDIR=$(DESTDIR) install
uninstall:
rm -fr $(DESTDIR)$(modulesdir)/mod_managed.so
cd managed && $(MAKE) UNINSTALL="$(LTUNINSTALL)" MODINSTDIR=$(modulesdir) uninstall
cd $(MANAGED_DIR) && $(MAKE) UNINSTALL="$(LTUNINSTALL)" MODINSTDIR=$(modulesdir) uninstall
clean:
cd managed && $(MAKE) clean
cd $(MANAGED_DIR) && $(MAKE) clean
swigclean: clean
rm -f freeswitch_wrap.cxx freeswitch_wrap.cpp managed/swig.cs