move applications to use automake

configure.in

@@ -1219,25 +1219,161 @@ AC_CONFIG_FILES([Makefile
 		build/Makefile
 		src/Makefile
 		src/mod/Makefile
+		src/mod/applications/mod_abstraction/Makefile
+		src/mod/applications/mod_avmd/Makefile
+		src/mod/applications/mod_blacklist/Makefile
+		src/mod/applications/mod_callcenter/Makefile
+		src/mod/applications/mod_cidlookup/Makefile
+		src/mod/applications/mod_cluechoo/Makefile
+		src/mod/applications/mod_commands/Makefile
+		src/mod/applications/mod_conference/Makefile
+		src/mod/applications/mod_curl/Makefile
+		src/mod/applications/mod_db/Makefile
+		src/mod/applications/mod_directory/Makefile
+		src/mod/applications/mod_distributor/Makefile
+		src/mod/applications/mod_dptools/Makefile
+		src/mod/applications/mod_easyroute/Makefile
+		src/mod/applications/mod_enum/Makefile
+		src/mod/applications/mod_esf/Makefile
+		src/mod/applications/mod_esl/Makefile
 		src/mod/applications/mod_expr/Makefile
-		src/mod/applications/mod_spandsp/Makefile
+		src/mod/applications/mod_fifo/Makefile
+		src/mod/applications/mod_fsk/Makefile
+		src/mod/applications/mod_fsv/Makefile
+		src/mod/applications/mod_hash/Makefile
+		src/mod/applications/mod_httapi/Makefile
+		src/mod/applications/mod_http_cache/Makefile
+		src/mod/applications/mod_ladspa/Makefile
+		src/mod/applications/mod_lcr/Makefile
+		src/mod/applications/mod_limit/Makefile
+		src/mod/applications/mod_memcache/Makefile
+		src/mod/applications/mod_mongo/Makefile
+		src/mod/applications/mod_mp4/Makefile
+		src/mod/applications/mod_nibblebill/Makefile
+		src/mod/applications/mod_oreka/Makefile
 		src/mod/applications/mod_osp/Makefile
+		src/mod/applications/mod_rad_auth/Makefile
+		src/mod/applications/mod_random/Makefile
+		src/mod/applications/mod_redis/Makefile
+		src/mod/applications/mod_rss/Makefile
+		src/mod/applications/mod_skel/Makefile
+		src/mod/applications/mod_sms/Makefile
+		src/mod/applications/mod_snapshot/Makefile
+		src/mod/applications/mod_snipe_hunt/Makefile
+		src/mod/applications/mod_snom/Makefile
+		src/mod/applications/mod_sonar/Makefile
+		src/mod/applications/mod_soundtouch/Makefile
+		src/mod/applications/mod_spandsp/Makefile
+		src/mod/applications/mod_spy/Makefile
 		src/mod/applications/mod_stress/Makefile
-		src/mod/applications/mod_hash/Makefile
+		src/mod/applications/mod_translate/Makefile
+		src/mod/applications/mod_valet_parking/Makefile
+		src/mod/applications/mod_vmd/Makefile
+		src/mod/applications/mod_voicemail/Makefile
+		src/mod/applications/mod_voicemail_ivr/Makefile
+		src/mod/asr_tts/mod_cepstral/Makefile
+		src/mod/asr_tts/mod_flite/Makefile
+		src/mod/asr_tts/mod_pocketsphinx/Makefile
+		src/mod/asr_tts/mod_tts_commandline/Makefile
+		src/mod/asr_tts/mod_unimrcp/Makefile
+		src/mod/codecs/mod_amr/Makefile
+		src/mod/codecs/mod_amrwb/Makefile
+		src/mod/codecs/mod_b64/Makefile
+		src/mod/codecs/mod_bv/Makefile
+		src/mod/codecs/mod_celt/Makefile
+		src/mod/codecs/mod_codec2/Makefile
 		src/mod/codecs/mod_com_g729/Makefile
+		src/mod/codecs/mod_dahdi_codec/Makefile
+		src/mod/codecs/mod_g723_1/Makefile
+		src/mod/codecs/mod_g729/Makefile
+		src/mod/codecs/mod_h26x/Makefile
+		src/mod/codecs/mod_ilbc/Makefile
+		src/mod/codecs/mod_isac/Makefile
+		src/mod/codecs/mod_mp4v/Makefile
+		src/mod/codecs/mod_opus/Makefile
+		src/mod/codecs/mod_sangoma_codec/Makefile
+		src/mod/codecs/mod_silk/Makefile
+		src/mod/codecs/mod_siren/Makefile
+		src/mod/codecs/mod_skel_codec/Makefile
+		src/mod/codecs/mod_theora/Makefile
+		src/mod/codecs/mod_vp8/Makefile
+		src/mod/dialplans/mod_dialplan_asterisk/Makefile
+		src/mod/dialplans/mod_dialplan_directory/Makefile
+		src/mod/dialplans/mod_dialplan_xml/Makefile
+		src/mod/directories/mod_ldap/Makefile
+		src/mod/endpoints/mod_alsa/Makefile
+		src/mod/endpoints/mod_dingaling/Makefile
+		src/mod/endpoints/mod_h323/Makefile
+		src/mod/endpoints/mod_khomp/Makefile
+		src/mod/endpoints/mod_loopback/Makefile
+		src/mod/endpoints/mod_opal/Makefile
 		src/mod/endpoints/mod_portaudio/Makefile
+		src/mod/endpoints/mod_reference/Makefile
+		src/mod/endpoints/mod_rtmp/Makefile
 		src/mod/endpoints/mod_skinny/Makefile
 		src/mod/endpoints/mod_skypopen/Makefile
 		src/mod/endpoints/mod_sofia/Makefile
+		src/mod/endpoints/mod_unicall/Makefile
+		src/mod/event_handlers/mod_cdr_csv/Makefile
+		src/mod/event_handlers/mod_cdr_mongodb/Makefile
+		src/mod/event_handlers/mod_cdr_pg_csv/Makefile
+		src/mod/event_handlers/mod_cdr_sqlite/Makefile
+		src/mod/event_handlers/mod_erlang_event/Makefile
+		src/mod/event_handlers/mod_event_multicast/Makefile
+		src/mod/event_handlers/mod_event_socket/Makefile
+		src/mod/event_handlers/mod_event_test/Makefile
+		src/mod/event_handlers/mod_format_cdr/Makefile
+		src/mod/event_handlers/mod_json_cdr/Makefile
+		src/mod/event_handlers/mod_radius_cdr/Makefile
+		src/mod/event_handlers/mod_rayo/Makefile
+		src/mod/event_handlers/mod_snmp/Makefile
+		src/mod/event_handlers/mod_event_zmq
+		src/mod/formats/mod_local_stream/Makefile
+		src/mod/formats/mod_native_file/Makefile
+		src/mod/formats/mod_shell_stream/Makefile
+		src/mod/formats/mod_shout/Makefile
+		src/mod/formats/mod_sndfile/Makefile
+		src/mod/formats/mod_ssml/Makefile
+		src/mod/formats/mod_tone_stream/Makefile
+		src/mod/formats/mod_vlc/Makefile
 		src/mod/formats/mod_portaudio_stream/Makefile
-		src/mod/asr_tts/mod_unimrcp/Makefile
 		src/mod/languages/mod_java/Makefile
 		src/mod/languages/mod_lua/Makefile
-		src/mod/legacy/languages/mod_lua/Makefile
+		src/mod/languages/mod_managed/Makefile
+		src/mod/languages/mod_perl/Makefile
 		src/mod/languages/mod_python/Makefile
 		src/mod/languages/mod_spidermonkey/Makefile
 		src/mod/languages/mod_v8/Makefile
-		src/mod/event_handlers/mod_erlang_event/Makefile
+		src/mod/languages/mod_yaml/Makefile
+		src/mod/legacy/languages/mod_lua/Makefile
+		src/mod/loggers/mod_console/Makefile
+		src/mod/loggers/mod_logfile/Makefile
+		src/mod/loggers/mod_syslog/Makefile
+		src/mod/say/mod_say_de/Makefile
+		src/mod/say/mod_say_en/Makefile
+		src/mod/say/mod_say_es/Makefile
+		src/mod/say/mod_say_fa/Makefile
+		src/mod/say/mod_say_fr/Makefile
+		src/mod/say/mod_say_he/Makefile
+		src/mod/say/mod_say_hr/Makefile
+		src/mod/say/mod_say_hu/Makefile
+		src/mod/say/mod_say_it/Makefile
+		src/mod/say/mod_say_ja/Makefile
+		src/mod/say/mod_say_nl/Makefile
+		src/mod/say/mod_say_pl/Makefile
+		src/mod/say/mod_say_pt/Makefile
+		src/mod/say/mod_say_ru/Makefile
+		src/mod/say/mod_say_sv/Makefile
+		src/mod/say/mod_say_th/Makefile
+		src/mod/say/mod_say_zh/Makefile
+		src/mod/timers/mod_posix_timer/Makefile
+		src/mod/timers/mod_timerfd/Makefile
+		src/mod/xml_int/mod_xml_cdr/Makefile
+		src/mod/xml_int/mod_xml_curl/Makefile
+		src/mod/xml_int/mod_xml_ldap/Makefile
+		src/mod/xml_int/mod_xml_radius/Makefile
+		src/mod/xml_int/mod_xml_rpc/Makefile
+		src/mod/xml_int/mod_xml_scgi/Makefile
 		src/include/switch_am_config.h
 		build/getsounds.sh
 		build/getlib.sh
@@ -1256,6 +1392,11 @@ AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin])
 AM_CONDITIONAL(ISFREEBSD, [test `uname -s` = FreeBSD])
 AM_CONDITIONAL(IS64BITLINUX, [test `uname -m` = x86_64])
 
+AM_CONDITIONAL(HAVE_AMR, [ test -d ${switch_srcdir}/libs/amr ])
+AM_CONDITIONAL(HAVE_AMRWB, [ test -d ${switch_srcdir}/libs/amrwb ])
+AM_CONDITIONAL(HAVE_G723_1, [ test -d ${switch_srcdir}/libs/libg723_1 ])
+AM_CONDITIONAL(HAVE_G729, [ test -d ${switch_srcdir}/libs/libg729 ])
+
 #some vars to sub into the Makefile.am's
 #LIBS+=> core.log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat core.log;fi;if test "$$error" = "yes";then exit 1;fi
 LIBTOOL='`if test -z "$(VERBOSE)" ; then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(switch_builddir)/libtool; fi;`'

libs/stfu/stfu.h

@@ -35,6 +35,10 @@ extern "C" {
 }
 #endif
 
+#if !defined(MACOSX) && !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__cplusplus)
+#define _XOPEN_SOURCE 600
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

libs/xmlrpc-c/src/Makefile

@@ -83,7 +83,7 @@ LIBXMLRPC_MODS = \
 	parse_datetime \
 	parse_value \
         resource \
-	trace \
+	xml_trace \
 	version \
 	xmlrpc_data \
 	xmlrpc_datetime \

src/mod/.gitignore

@@ -76,3 +76,6 @@
 /timers/mod_posix_timer/Makefile
 /timers/mod_timerfd/Makefile
 /endpoints/mod_unicall/Makefile
+*/*/Makefile.in
+*/*/Makefile
+*/*/mod_*.log

src/mod/applications/.gitignore

+*/Makefile.in
+*/Makefile
+*/mod_*.log

src/mod/applications/mod_abstraction/Makefile

-BASE=../../../..
-include $(BASE)/build/modmake.rules
\ No newline at end of file

src/mod/applications/mod_abstraction/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_abstraction
+
+mod_LTLIBRARIES = mod_abstraction.la
+mod_abstraction_la_SOURCES  = mod_abstraction.c
+mod_abstraction_la_CFLAGS   = $(AM_CFLAGS)
+mod_abstraction_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_abstraction_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_avmd/Makefile

-BASE=../../../..
-MOD_CFLAGS= -O2
-#MOD_CFLAGS= -march=core2 -g -O2 -malign-double -mtune=core2 -mmmx -msse -msse2 -msse3 -mssse3 -mfpmath=sse -ffast-math -funroll-loops -fprefetch-loop-arrays -funit-at-a-time -ftracer --save-temps
-#MOD_LDFLAGS= --save-temps
-LOCAL_SOURCES=amplitude.c buffer.c desa2.c goertzel.c fast_acosf.c
-LOCAL_OBJS=amplitude.o buffer.o desa2.o goertzel.o fast_acosf.o
-include $(BASE)/build/modmake.rules
-
-#compute_table: compute_table.o
-#	gcc -o compute_table compute_table.o -lm
-#
-#compute_table.o: compute_table.c
-#	gcc -c compute_table.c
-#
-

src/mod/applications/mod_avmd/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_avmd
+
+mod_LTLIBRARIES = mod_avmd.la
+mod_avmd_la_SOURCES  = mod_avmd.c amplitude.c buffer.c desa2.c goertzel.c fast_acosf.c
+mod_avmd_la_CFLAGS   = $(AM_CFLAGS)
+mod_avmd_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_avmd_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_blacklist/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_blacklist
+
+mod_LTLIBRARIES = mod_blacklist.la
+mod_blacklist_la_SOURCES  = mod_blacklist.c
+mod_blacklist_la_CFLAGS   = $(AM_CFLAGS)
+mod_blacklist_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_blacklist_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_callcenter/Makefile

-BASE=../../../..
-include $(BASE)/build/modmake.rules
\ No newline at end of file

src/mod/applications/mod_callcenter/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_callcenter
+
+mod_LTLIBRARIES = mod_callcenter.la
+mod_callcenter_la_SOURCES  = mod_callcenter.c
+mod_callcenter_la_CFLAGS   = $(AM_CFLAGS)
+mod_callcenter_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_callcenter_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_cidlookup/Makefile

-BASE=../../../..
-include $(BASE)/build/modmake.rules
-

src/mod/applications/mod_cidlookup/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_cidlookup
+
+mod_LTLIBRARIES = mod_cidlookup.la
+mod_cidlookup_la_SOURCES  = mod_cidlookup.c
+mod_cidlookup_la_CFLAGS   = $(AM_CFLAGS)
+mod_cidlookup_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_cidlookup_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_cluechoo/Makefile

-LOCAL_LDFLAGS=-lncurses
-BASE=../../../..
-include $(BASE)/build/modmake.rules

src/mod/applications/mod_cluechoo/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_cluechoo
+
+mod_LTLIBRARIES = mod_cluechoo.la
+mod_cluechoo_la_SOURCES  = mod_cluechoo.c
+mod_cluechoo_la_CFLAGS   = $(AM_CFLAGS)
+mod_cluechoo_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_cluechoo_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lncurses

src/mod/applications/mod_commands/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_commands
+
+mod_LTLIBRARIES = mod_commands.la
+mod_commands_la_SOURCES  = mod_commands.c
+mod_commands_la_CFLAGS   = $(AM_CFLAGS)
+mod_commands_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_commands_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_conference/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_conference
+
+mod_LTLIBRARIES = mod_conference.la
+mod_conference_la_SOURCES  = mod_conference.c
+mod_conference_la_CFLAGS   = $(AM_CFLAGS)
+mod_conference_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_conference_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_curl/Makefile → src/mod/applications/mod_curl/Makefile.am

-json-c=json-c-0.9
-BASE=../../../..
+include $(top_srcdir)/build/modmake.rulesam
 
-JSON_DIR=$(switch_srcdir)/libs/$(json-c)
-JSON_BUILDDIR=$(switch_builddir)/libs/$(json-c)
+AUTOMAKE_OPTIONS = foreign
+MODNAME=mod_curl
 
+JSON_C=json-c-0.9
+JSON_DIR=$(switch_srcdir)/libs/$(JSON_C)
+JSON_BUILDDIR=$(switch_builddir)/libs/$(JSON_C)
 JSONLA=$(JSON_BUILDDIR)/libjson.la
 
-LOCAL_CFLAGS=-I$(JSON_DIR)
-LOCAL_LIBADD=$(JSONLA)
+mod_LTLIBRARIES = mod_curl.la
+mod_curl_la_SOURCES  = mod_curl.c
+mod_curl_la_CFLAGS   = $(AM_CFLAGS) -I$(JSON_DIR)
+mod_curl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(JSONLA)
+mod_curl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-include $(BASE)/build/modmake.rules
+BUILT_SOURCES=$(JSONLA)
 
 $(JSON_DIR):
-	$(GETLIB) $(json-c).tar.gz
+	$(GETLIB) $(JSON_C).tar.gz
 
 $(JSON_BUILDDIR)/Makefile: $(JSON_DIR)
 	mkdir -p $(JSON_BUILDDIR)
@@ -22,3 +27,6 @@ $(JSON_BUILDDIR)/Makefile: $(JSON_DIR)
 $(JSONLA): $(JSON_BUILDDIR)/Makefile
 	cd $(JSON_BUILDDIR) && $(MAKE)
 	$(TOUCH_TARGET)
+
+
+

src/mod/applications/mod_db/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_db
+
+mod_LTLIBRARIES = mod_db.la
+mod_db_la_SOURCES  = mod_db.c
+mod_db_la_CFLAGS   = $(AM_CFLAGS)
+mod_db_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_db_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_directory/Makefile

-BASE=../../../..
-include $(BASE)/build/modmake.rules
\ No newline at end of file

src/mod/applications/mod_directory/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_directory
+
+mod_LTLIBRARIES = mod_directory.la
+mod_directory_la_SOURCES  = mod_directory.c
+mod_directory_la_CFLAGS   = $(AM_CFLAGS)
+mod_directory_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_directory_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_distributor/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_distributor
+
+mod_LTLIBRARIES = mod_distributor.la
+mod_distributor_la_SOURCES  = mod_distributor.c
+mod_distributor_la_CFLAGS   = $(AM_CFLAGS)
+mod_distributor_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_distributor_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_dptools/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_dptools
+
+mod_LTLIBRARIES = mod_dptools.la
+mod_dptools_la_SOURCES  = mod_dptools.c
+mod_dptools_la_CFLAGS   = $(AM_CFLAGS)
+mod_dptools_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_dptools_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_easyroute/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_easyroute
+
+mod_LTLIBRARIES = mod_easyroute.la
+mod_easyroute_la_SOURCES  = mod_easyroute.c
+mod_easyroute_la_CFLAGS   = $(AM_CFLAGS)
+mod_easyroute_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_easyroute_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_enum/Makefile → src/mod/applications/mod_enum/Makefile.am

-BASE=../../../..
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_enum
 
 LDNS=ldns
-
 LDNS_DIR=$(switch_srcdir)/libs/$(LDNS)
 LDNS_BUILDDIR=$(switch_builddir)/libs/$(LDNS)
-LOCAL_CFLAGS=-I$(LDNS_DIR) -I$(LDNS_DIR)/include
 LDNS_LA=$(LDNS_BUILDDIR)/libldns.la
-LOCAL_LIBADD=$(LDNS_LA)
-include $(BASE)/build/modmake.rules
 
-$(LDNS_BUILDDIR)/Makefile: $(LDNS_DIR)/Makefile.in
+mod_LTLIBRARIES = mod_enum.la
+mod_enum_la_SOURCES  = mod_enum.c
+mod_enum_la_CFLAGS   = $(AM_CFLAGS) -I$(LDNS_DIR) -I$(LDNS_DIR)/include
+mod_enum_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LDNS_LA)
+mod_enum_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+BUILT_SOURCES=$(LDNS_BUILDDIR)/ldns/util.h
+
+$(LDNS_BUILDDIR)/ldns/util.h $(LDNS_BUILDDIR)/Makefile: $(LDNS_DIR)/Makefile.in
 	mkdir -p $(LDNS_BUILDDIR)
 	cd $(LDNS_BUILDDIR) && $(DEFAULT_VARS) $(LDNS_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDNS_DIR) --disable-gost --without-ssl --disable-sha2
 	$(TOUCH_TARGET)
@@ -17,5 +22,3 @@ $(LDNS_BUILDDIR)/Makefile: $(LDNS_DIR)/Makefile.in
 $(LDNS_LA): $(LDNS_BUILDDIR)/Makefile
 	cd $(LDNS_BUILDDIR) && $(MAKE)
 	$(TOUCH_TARGET)
-
-$(MODNAME).lo: $(LDNS_LA)

src/mod/applications/mod_esf/Makefile

-BASE=../../../..
-include $(BASE)/build/modmake.rules

src/mod/applications/mod_esf/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_esf
+
+mod_LTLIBRARIES = mod_esf.la
+mod_esf_la_SOURCES  = mod_esf.c
+mod_esf_la_CFLAGS   = $(AM_CFLAGS)
+mod_esf_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_esf_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_esl/Makefile

-BASE=../../../..
-
-ESL_DIR = $(switch_srcdir)/libs/esl
-
-LOCAL_OBJS=$(ESL_DIR)/libesl.a
-LOCAL_CFLAGS=-I$(ESL_DIR)/src/include
-
-include $(BASE)/build/modmake.rules
-
-$(ESL_DIR)/libesl.a: $(ESL_DIR)/Makefile
-	cd $(ESL_DIR) && $(MAKE) -j1

src/mod/applications/mod_esl/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+
+MODNAME=mod_esl
+ESL_DIR = $(switch_srcdir)/libs/esl
+
+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_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+$(ESL_DIR)/libesl.a: $(ESL_DIR)/Makefile
+	cd $(ESL_DIR) && $(MAKE) -j1

src/mod/applications/mod_fifo/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_fifo
+
+mod_LTLIBRARIES = mod_fifo.la
+mod_fifo_la_SOURCES  = mod_fifo.c
+mod_fifo_la_CFLAGS   = $(AM_CFLAGS)
+mod_fifo_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_fifo_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_fsk/Makefile

-BASE=../../../..
-
-LOCAL_SOURCES=fsk.c uart.c fsk_callerid.c
-LOCAL_OBJS=fsk.o uart.o fsk_callerid.o
-include $(BASE)/build/modmake.rules
-

src/mod/applications/mod_fsk/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_fsk
+
+mod_LTLIBRARIES = mod_fsk.la
+mod_fsk_la_SOURCES  = mod_fsk.c fsk.c uart.c fsk_callerid.c
+mod_fsk_la_CFLAGS   = $(AM_CFLAGS)
+mod_fsk_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_fsk_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_fsv/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_fsv
+
+mod_LTLIBRARIES = mod_fsv.la
+mod_fsv_la_SOURCES  = mod_fsv.c
+mod_fsv_la_CFLAGS   = $(AM_CFLAGS)
+mod_fsv_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_fsv_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_httapi/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_httapi
+
+mod_LTLIBRARIES = mod_httapi.la
+mod_httapi_la_SOURCES  = mod_httapi.c
+mod_httapi_la_CFLAGS   = $(AM_CFLAGS)
+mod_httapi_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_httapi_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_http_cache/Makefile

-BASE=../../../..
-
-LOCAL_OBJS= \
-	aws.o
-LOCAL_SOURCES=	\
-	aws.c
-
-include $(BASE)/build/modmake.rules
-

src/mod/applications/mod_http_cache/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_http_cache
+
+mod_LTLIBRARIES = mod_http_cache.la
+mod_http_cache_la_SOURCES  = mod_http_cache.c aws.c
+mod_http_cache_la_CFLAGS   = $(AM_CFLAGS)
+mod_http_cache_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_http_cache_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_ladspa/Makefile

-BASE=../../../..
-
-LOCAL_OBJS += load.o
-include $(BASE)/build/modmake.rules
-

src/mod/applications/mod_ladspa/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_ladspa
+
+mod_LTLIBRARIES = mod_ladspa.la
+mod_ladspa_la_SOURCES  = mod_ladspa.c load.c
+mod_ladspa_la_CFLAGS   = $(AM_CFLAGS)
+mod_ladspa_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_ladspa_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_ladspa/load.c

@@ -5,6 +5,7 @@
 
 /*****************************************************************************/
 
+#include "switch.h"
 #include <dlfcn.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -15,7 +16,6 @@
 #include "ladspa.h"
 #include "utils.h"
 #include "inttypes.h"
-#include "switch.h"
 /*****************************************************************************/
 
 /* This function provides a wrapping of dlopen(). When the filename is

src/mod/applications/mod_lcr/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_lcr
+
+mod_LTLIBRARIES = mod_lcr.la
+mod_lcr_la_SOURCES  = mod_lcr.c
+mod_lcr_la_CFLAGS   = $(AM_CFLAGS)
+mod_lcr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_lcr_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_limit/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_limit
+
+mod_LTLIBRARIES = mod_limit.la
+mod_limit_la_SOURCES  = mod_limit.c
+mod_limit_la_CFLAGS   = $(AM_CFLAGS)
+mod_limit_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_limit_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_memcache/Makefile → src/mod/applications/mod_memcache/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_memcache
 MEMCACHED=libmemcached-0.32
-BASE=../../../..
-
 MEMCACHED_DIR=$(switch_srcdir)/libs/$(MEMCACHED)
 MEMCACHED_BUILDDIR=$(switch_builddir)/libs/$(MEMCACHED)
 
 MEMCACHEDLA=$(MEMCACHED_BUILDDIR)/libmemcached/libmemcached.la
 
-LOCAL_CFLAGS=-I$(MEMCACHED_DIR) -I$(MEMCACHED_BUILDDIR)
-LOCAL_LIBADD=$(MEMCACHEDLA)
-
-include $(BASE)/build/modmake.rules
+mod_LTLIBRARIES = mod_memcache.la
+mod_memcache_la_SOURCES  = mod_memcache.c
+mod_memcache_la_CFLAGS   = $(AM_CFLAGS) -I$(MEMCACHED_DIR) -I$(MEMCACHED_BUILDDIR)
+mod_memcache_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(MEMCACHEDLA)
+mod_memcache_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-MY_DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target) \
-  --disable-shared --with-pic
+MY_DEFAULT_ARGS=--build=$(build) --host=$(host) --target=$(target) --disable-shared --with-pic
 
 $(MEMCACHED_DIR):
 	$(GETLIB) $(MEMCACHED).tar.gz
@@ -20,12 +20,9 @@ $(MEMCACHED_DIR):
 $(MEMCACHED_BUILDDIR)/Makefile: $(MEMCACHED_DIR)
 	mkdir -p $(MEMCACHED_BUILDDIR)
 	echo $(MY_DEFAULT_ARGS)
-	cd $(MEMCACHED_BUILDDIR) && $(DEFAULT_VARS) $(MEMCACHED_DIR)/configure $(MY_DEFAULT_ARGS) --with-memcached=no --srcdir=$(MEMCACHED_DIR)  CPPFLAGS= LDFLAGS=
+	cd $(MEMCACHED_BUILDDIR) && $(DEFAULT_VARS) $(MEMCACHED_DIR)/configure $(MY_DEFAULT_ARGS) --with-memcached=no --srcdir=$(MEMCACHED_DIR) CPPFLAGS= LDFLAGS=
 	$(TOUCH_TARGET)
 
 $(MEMCACHEDLA): $(MEMCACHED_BUILDDIR)/Makefile
 	cd $(MEMCACHED_BUILDDIR) && $(MAKE)
 	$(TOUCH_TARGET)
-
-
-

src/mod/applications/mod_mongo/Makefile → src/mod/applications/mod_mongo/Makefile.am

-BASE=../../../..
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_mongo
 
 MONGO_CXX_DRIVER_VERSION=v2.4
 MONGO_CXX_DRIVER_URL=http://downloads.mongodb.org/cxx-driver
 MONGO_CXX_DRIVER_TARBALL=mongodb-linux-x86_64-$(MONGO_CXX_DRIVER_VERSION)-latest.tgz
-MONGO_CXX_DRIVER_SRC=$(BASE)/libs/mongo-cxx-driver-$(MONGO_CXX_DRIVER_VERSION)
+MONGO_CXX_DRIVER_SRC=$(switch_builddir)/libs/mongo-cxx-driver-$(MONGO_CXX_DRIVER_VERSION)
 LIBMONGOCLIENT_A =$(MONGO_CXX_DRIVER_SRC)/libmongoclient.a
 
-LOCAL_SOURCES=
-LOCAL_OBJS=
+mod_LTLIBRARIES = mod_mongo.la
+mod_mongo_la_SOURCES  = mod_mongo.cpp
+mod_mongo_la_CFLAGS   = $(AM_CFLAGS)
+mod_mongo_la_CPPFLAGS = -I$(MONGO_CXX_DRIVER_SRC)/src  -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/                                   
+mod_mongo_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LIBMONGOCLIENT_A)
+mod_mongo_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lboost_thread -lboost_filesystem-mt -lboost_system-mt
 
-LOCAL_CFLAGS=-I$(MONGO_CXX_DRIVER_SRC)/src
-LOCAL_LIBADD=$(LIBMONGOCLIENT_A)
-LOCAL_LDFLAGS=-lboost_thread -lboost_filesystem-mt -lboost_system-mt
-#LOCAL_LDFLAGS=-lboost_thread-mt -lboost_filesystem-mt -lboost_system-mt
-MODDIR=$(shell pwd)
-
-
-include $(BASE)/build/modmake.rules
+BUILT_SOURCES=$(LIBMONGOCLIENT_A)
 
 $(MONGO_CXX_DRIVER_SRC):
 	$(GETLIB) $(MONGO_CXX_DRIVER_URL) $(MONGO_CXX_DRIVER_TARBALL)
-	cd $(MONGO_CXX_DRIVER_SRC) && patch -p0 -i $(MODDIR)/fpic_hack.diff
+	cd $(MONGO_CXX_DRIVER_SRC) && patch -p0 -i $(switch_srcdir)/src/mod/applications/mod_mongo/fpic_hack.diff
 	$(TOUCH_TARGET)
 
 
 $(LIBMONGOCLIENT_A): $(MONGO_CXX_DRIVER_SRC)
 	(cd $(MONGO_CXX_DRIVER_SRC) && \
-		sed -i SConstruct -e "s|Environment()|Environment(ENV = {'PATH' : os.environ.get('PATH','/bin:/usr/bin'),'CFLAGS' : os.environ.get('CFLAGS',''),'CXXFLAGS' : os.environ.get('CXXFLAGS','')})|" && \
+		sed -i'' SConstruct -e "s|Environment()|Environment(ENV = {'PATH' : os.environ.get('PATH','/bin:/usr/bin'),'CFLAGS' : os.environ.get('CFLAGS',''),'CXXFLAGS' : os.environ.get('CXXFLAGS','')})|" && \
 		echo "env.Append(PATH=os.environ.get('PATH','/bin:/usr/bin'))" >> SConstruct && \
 		scons)
 	$(TOUCH_TARGET)

src/mod/applications/mod_mp4/Makefile

-# LOCAL_CFLAGS=-I./mp4v2-2.0.0/include
-LOCAL_LDFLAGS=-lmp4v2
-LOCAL_SOURCES=mp4_helper.cpp
-LOCAL_OBJS=mp4_helper.o
-
-BASE=../../../..
-include $(BASE)/build/modmake.rules

src/mod/applications/mod_mp4/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_mp4
+
+mod_LTLIBRARIES = mod_mp4.la
+mod_mp4_la_SOURCES  = mod_mp4.cpp mp4_helper.cpp
+mod_mp4_la_CFLAGS   = $(AM_CFLAGS)
+mod_mp4_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_mp4_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lmp4v2

src/mod/applications/mod_nibblebill/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_nibblebill
+
+mod_LTLIBRARIES = mod_nibblebill.la
+mod_nibblebill_la_SOURCES  = mod_nibblebill.c
+mod_nibblebill_la_CFLAGS   = $(AM_CFLAGS)
+mod_nibblebill_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_nibblebill_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_oreka/Makefile

-BASE=../../../..
-include $(BASE)/build/modmake.rules

src/mod/applications/mod_oreka/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_oreka
+
+mod_LTLIBRARIES = mod_oreka.la
+mod_oreka_la_SOURCES  = mod_oreka.c
+mod_oreka_la_CFLAGS   = $(AM_CFLAGS)
+mod_oreka_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_oreka_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_rad_auth/Makefile → src/mod/applications/mod_rad_auth/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_rad_auth
+
 RADCLIENT_VERSION=1.1.6
 RADCLIENT=freeradius-client-$(RADCLIENT_VERSION)
 RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT)
@@ -5,11 +8,13 @@ RADCLIENT_BUILDDIR=$(switch_builddir)/libs/$(RADCLIENT)
 RADCLIENT_LIBDIR=$(RADCLIENT_BUILDDIR)/lib
 RADCLIENT_LA=${RADCLIENT_LIBDIR}/libfreeradius-client.la
 
-LOCAL_CFLAGS=-I$(RADCLIENT_DIR)/include
-LOCAL_LIBADD=$(RADCLIENT_LA)
+mod_LTLIBRARIES = mod_rad_auth.la
+mod_rad_auth_la_SOURCES  = mod_rad_auth.c
+mod_rad_auth_la_CFLAGS   = $(AM_CFLAGS) -I$(RADCLIENT_DIR)/include
+mod_rad_auth_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(RADCLIENT_LA)
+mod_rad_auth_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-BASE=../../../..
-include $(BASE)/build/modmake.rules
+BUILT_SOURCES=$(RADCLIENT_LA)
 
 $(RADCLIENT_DIR):
 	$(GETLIB) $(RADCLIENT).tar.gz
@@ -22,5 +27,3 @@ $(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR)
 $(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
 	cd $(RADCLIENT_BUILDDIR) && CFLAGS="$(CFLAGS)" $(MAKE)
 	$(TOUCH_TARGET)
-
-

src/mod/applications/mod_random/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_random
+
+mod_LTLIBRARIES = mod_random.la
+mod_random_la_SOURCES  = mod_random.c
+mod_random_la_CFLAGS   = $(AM_CFLAGS)
+mod_random_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_random_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_redis/Makefile

-BASE=../../../..
-LOCAL_OBJS=credis.o
-include $(BASE)/build/modmake.rules

src/mod/applications/mod_redis/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_redis
+
+mod_LTLIBRARIES = mod_redis.la
+mod_redis_la_SOURCES  = mod_redis.c credis.c
+mod_redis_la_CFLAGS   = $(AM_CFLAGS) -D_GNU_SOURCE
+mod_redis_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_redis_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_rss/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_rss
+
+mod_LTLIBRARIES = mod_rss.la
+mod_rss_la_SOURCES  = mod_rss.c
+mod_rss_la_CFLAGS   = $(AM_CFLAGS)
+mod_rss_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_rss_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_skel/Makefile

-BASE=../../../..
-include $(BASE)/build/modmake.rules
\ No newline at end of file

src/mod/applications/mod_skel/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_skel
+
+mod_LTLIBRARIES = mod_skel.la
+mod_skel_la_SOURCES  = mod_skel.c
+mod_skel_la_CFLAGS   = $(AM_CFLAGS)
+mod_skel_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_skel_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_sms/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_sms
+
+mod_LTLIBRARIES = mod_sms.la
+mod_sms_la_SOURCES  = mod_sms.c
+mod_sms_la_CFLAGS   = $(AM_CFLAGS)
+mod_sms_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_sms_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_snapshot/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_snapshot
+
+mod_LTLIBRARIES = mod_snapshot.la
+mod_snapshot_la_SOURCES  = mod_snapshot.c
+mod_snapshot_la_CFLAGS   = $(AM_CFLAGS)
+mod_snapshot_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_snapshot_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_snipe_hunt/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_snipe_hunt
+
+mod_LTLIBRARIES = mod_snipe_hunt.la
+mod_snipe_hunt_la_SOURCES  = mod_snipe_hunt.c
+mod_snipe_hunt_la_CFLAGS   = $(AM_CFLAGS)
+mod_snipe_hunt_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_snipe_hunt_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_snom/Makefile

-BASE=../../../..
-include $(BASE)/build/modmake.rules

src/mod/applications/mod_snom/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_snom
+
+mod_LTLIBRARIES = mod_snom.la
+mod_snom_la_SOURCES  = mod_snom.c
+mod_snom_la_CFLAGS   = $(AM_CFLAGS)
+mod_snom_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_snom_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_sonar/Makefile

-BASE=../../../..
-include $(BASE)/build/modmake.rules

src/mod/applications/mod_sonar/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_sonar
+
+mod_LTLIBRARIES = mod_sonar.la
+mod_sonar_la_SOURCES  = mod_sonar.c
+mod_sonar_la_CFLAGS   = $(AM_CFLAGS)
+mod_sonar_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_sonar_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_soundtouch/Makefile → src/mod/applications/mod_soundtouch/Makefile.am

-BASE=../../../..
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_soundtouch
 VERSION=soundtouch-1.7.1
 SNDT_SRC=$(switch_srcdir)/libs/soundtouch
 SNDT_BUILD=$(switch_builddir)/libs/soundtouch
-LA=$(SNDT_BUILD)/source/SoundTouch/.libs/libSoundTouch.a
+LA=$(SNDT_BUILD)/source/SoundTouch/libSoundTouch.la
 
-LOCAL_CFLAGS += -I$(SNDT_SRC)/include -DINTEGER_SAMPLES -I$(SNDT_BUILD)/include
-LOCAL_LIBADD=$(LA)
+mod_LTLIBRARIES = mod_soundtouch.la
+mod_soundtouch_la_SOURCES  = mod_soundtouch.cpp
+mod_soundtouch_la_CFLAGS   = $(AM_CFLAGS) -I$(SNDT_SRC)/include -DINTEGER_SAMPLES -I$(SNDT_BUILD)/include
+mod_soundtouch_la_CXXFLAGS = -I$(SNDT_SRC)/include -DINTEGER_SAMPLES -I$(SNDT_BUILD)/include
+mod_soundtouch_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LA)
+mod_soundtouch_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-include $(BASE)/build/modmake.rules
+BUILT_SOURCES=$(LA)
 
 $(SNDT_SRC):
 	$(GETLIB) $(VERSION).tar.gz
@@ -21,7 +26,6 @@ $(SNDT_BUILD)/Makefile: $(SNDT_SRC)
 	cd $(SNDT_SRC) && AUTOMAKE="automake --add-missing --foreign --copy" autoreconf -fisv 
 	cd ${SNDT_BUILD} && $(DEFAULT_VARS) $(SNDT_SRC)/configure $(DEFAULT_ARGS) --enable-integer-samples --srcdir=$(SNDT_SRC)
 	${TOUCH_TARGET}
-	
 
 $(LA): $(SNDT_BUILD)/Makefile 
 	cd $(SNDT_BUILD) && ${MAKE}

src/mod/applications/mod_spy/Makefile

-BASE=../../../..
-include $(BASE)/build/modmake.rules

src/mod/applications/mod_spy/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_spy
+
+mod_LTLIBRARIES = mod_spy.la
+mod_spy_la_SOURCES  = mod_spy.c
+mod_spy_la_CFLAGS   = $(AM_CFLAGS)
+mod_spy_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_spy_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_translate/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_translate
+
+mod_LTLIBRARIES = mod_translate.la
+mod_translate_la_SOURCES  = mod_translate.c
+mod_translate_la_CFLAGS   = $(AM_CFLAGS)
+mod_translate_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_translate_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_valet_parking/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_valet_parking
+
+mod_LTLIBRARIES = mod_valet_parking.la
+mod_valet_parking_la_SOURCES  = mod_valet_parking.c
+mod_valet_parking_la_CFLAGS   = $(AM_CFLAGS)
+mod_valet_parking_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_valet_parking_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_vmd/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_vmd
+
+mod_LTLIBRARIES = mod_vmd.la
+mod_vmd_la_SOURCES  = mod_vmd.c
+mod_vmd_la_CFLAGS   = $(AM_CFLAGS)
+mod_vmd_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_vmd_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_voicemail/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_voicemail
+
+mod_LTLIBRARIES = mod_voicemail.la
+mod_voicemail_la_SOURCES  = mod_voicemail.c
+mod_voicemail_la_CFLAGS   = $(AM_CFLAGS)
+mod_voicemail_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_voicemail_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/applications/mod_voicemail_ivr/Makefile

-BASE=../../../..
-LOCAL_OBJS=ivr.o utils.o config.o menu.o
-include $(BASE)/build/modmake.rules

src/mod/applications/mod_voicemail_ivr/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_voicemail_ivr
+
+mod_LTLIBRARIES = mod_voicemail_ivr.la
+mod_voicemail_ivr_la_SOURCES  = mod_voicemail_ivr.c ivr.c utils.c config.c menu.c
+mod_voicemail_ivr_la_CFLAGS   = $(AM_CFLAGS)
+mod_voicemail_ivr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_voicemail_ivr_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/asr_tts/mod_cepstral/Makefile

-LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L$(SWIFT_HOME)/lib -L/opt/swift/lib -lswift -lm" ; fi ;
-
-LOCAL_INSERT_CFLAGS=if test $$osarch = "Darwin" ; then echo "-I/Library/Frameworks/swift.framework/Versions/5/Headers/" ; else echo "-I$(SWIFT_HOME)/include -I/opt/swift/include"; fi ;
-LOCAL_CFLAGS=-w
-include ../../../../build/modmake.rules
-

src/mod/asr_tts/mod_cepstral/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_cepstral
+
+mod_LTLIBRARIES = mod_cepstral.la
+mod_cepstral_la_SOURCES  = mod_cepstral.c
+mod_cepstral_la_CFLAGS   = $(AM_CFLAGS) -w
+mod_cepstral_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_cepstral_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+if ISMAC
+mod_cepstral_la_LDFLAGS += -framework swift
+mod_cepstral_la_CFLAGS  += -I/Library/Frameworks/swift.framework/Versions/5/Headers/
+else
+mod_cepstral_la_LDFLAGS += -L$(SWIFT_HOME)/lib -L/opt/swift/lib -lswift -lm
+mod_cepstral_la_CFLAGS  += -I$(SWIFT_HOME)/include -I/opt/swift/include 
+endif
+

src/mod/asr_tts/mod_flite/Makefile → src/mod/asr_tts/mod_flite/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_flite
+
 FLITE=flite-1.5.4
 
 FLITE_DIR=$(switch_srcdir)/libs/$(FLITE)-current
@@ -11,13 +14,14 @@ FLITE_A=$(FLITE_LIBDIR)/libflite_cmu_us_awb.a \
 	$(FLITE_LIBDIR)/libflite_cmu_us_slt.a \
 	$(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm
 
-LOCAL_CFLAGS=-I$(FLITE_DIR)/include -I$(FLITE_BUILDDIR)/include
-LOCAL_LIBADD=$(FLITE_A)
+mod_LTLIBRARIES = mod_flite.la
+mod_flite_la_SOURCES  = mod_flite.c
+mod_flite_la_CFLAGS   = $(AM_CFLAGS) -I$(FLITE_DIR)/include -I$(FLITE_BUILDDIR)/include
+mod_flite_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(FLITE_A)
+mod_flite_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-BASE=../../../..
-include $(BASE)/build/modmake.rules
+BUILT_SOURCES= $(FLITE_A)
 
-$(MODNAME).lo: $(FLITE_A)
 $(FLITE_DIR):
 	$(GETLIB) $(FLITE)-current.tar.bz2
 

src/mod/asr_tts/mod_pocketsphinx/Makefile → src/mod/asr_tts/mod_pocketsphinx/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_pocketsphinx
+
 SPHINXBASE=sphinxbase-0.7
 SPHINXBASE_DIR=$(switch_srcdir)/libs/$(SPHINXBASE)
 SPHINXBASE_BUILDDIR=$(switch_builddir)/libs/$(SPHINXBASE)
@@ -11,12 +14,13 @@ POCKETSPHINX_LA=$(POCKETSPHINX_BUILDDIR)/src/libpocketsphinx/libpocketsphinx.la
 
 SPHINXMODEL=communicator_semi_6000_20080321
 
-LOCAL_CFLAGS=-I$(SPHINXBASE_DIR)/include -I$(POCKETSPHINX_DIR)/include
-LOCAL_LIBADD=$(POCKETSPHINX_LA) $(SPHINXBASE_LA) $(SPHINXBASE_LA2)
-BASE=../../../..
-include $(BASE)/build/modmake.rules
+mod_LTLIBRARIES = mod_pocketsphinx.la
+mod_pocketsphinx_la_SOURCES  = mod_pocketsphinx.c
+mod_pocketsphinx_la_CFLAGS   = $(AM_CFLAGS) -I$(SPHINXBASE_DIR)/include -I$(POCKETSPHINX_DIR)/include
+mod_pocketsphinx_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(POCKETSPHINX_LA) $(SPHINXBASE_LA) $(SPHINXBASE_LA2)
+mod_pocketsphinx_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-mod_pocketsphinx.lo: $(POCKETSPHINX_LA) $(SPHINXBASE_LA) $(SPHINXBASE_LA2)
+BUILT_SOURCES=$(POCKETSPHINX_LA) $(SPHINXBASE_LA) $(SPHINXBASE_LA2)
 
 $(SPHINXBASE_DIR):
 	$(GETLIB) $(SPHINXBASE).tar.gz
@@ -62,5 +66,5 @@ $(DESTDIR)$(grammardir)/model/communicator:
 dictionary:
 	@install -m0644 $(POCKETSPHINX_DIR)/model/lm/en_US/cmu07a.dic $(DESTDIR)$(grammardir)/default.dic
 
-local_install: $(DESTDIR)$(grammardir)/model $(DESTDIR)$(grammardir)/model/communicator dictionary
+install: $(DESTDIR)$(grammardir)/model $(DESTDIR)$(grammardir)/model/communicator dictionary
 

src/mod/asr_tts/mod_tts_commandline/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_tts_commandline
+
+mod_LTLIBRARIES = mod_tts_commandline.la
+mod_tts_commandline_la_SOURCES  = mod_tts_commandline.c
+mod_tts_commandline_la_CFLAGS   = $(AM_CFLAGS)
+mod_tts_commandline_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_tts_commandline_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c

@@ -29,8 +29,8 @@
  *
  */
 
-#include <unistd.h>
 #include <switch.h>
+#include <unistd.h>
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_tts_commandline_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_tts_commandline_shutdown);

src/mod/codecs/mod_amr/Makefile

-BASE=../../../..
-
-AMR_DIR=$(switch_srcdir)/libs/amr
-AMR_BUILDDIR=$(switch_builddir)/libs/amr
-AMR_A=$(AMR_BUILDDIR)/libamr.a
-
-LOCAL_INSERT_CFLAGS=if test -d $(AMR_DIR); then echo "-I$(AMR_DIR)" ; else echo "-DAMR_PASSTHROUGH" ; fi ;
-LOCAL_INSERT_LDFLAGS=test ! -d $(AMR_DIR) || echo "$(AMR_A)";
-
-
-include $(BASE)/build/modmake.rules

src/mod/codecs/mod_amr/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_amr
+
+AMR_DIR=$(switch_srcdir)/libs/amr
+AMR_BUILDDIR=$(switch_builddir)/libs/amr
+AMR_A=$(AMR_BUILDDIR)/libamr.a
+
+mod_LTLIBRARIES = mod_amr.la
+mod_amr_la_SOURCES  = mod_amr.c
+mod_amr_la_CFLAGS   = $(AM_CFLAGS)
+mod_amr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_amr_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+if HAVE_AMR
+BUILT_SOURCES= $(AMR_A)
+mod_amr_la_CFLAGS += -I$(AMR_DIR)
+mod_amr_la_LIBADD += $(AMR_A)
+else
+mod_amr_la_CFLAGS += -DAMR_PASSTHROUGH
+endif
+

src/mod/codecs/mod_amrwb/Makefile

-BASE=../../../..
-
-AMR_DIR=$(switch_srcdir)/libs/amrwb
-AMR_BUILDDIR=$(switch_builddir)/libs/amrwb
-AMR_A=$(AMR_BUILDDIR)/libamrwb.a
-
-LOCAL_INSERT_CFLAGS=if test -d $(AMR_DIR); then echo "-I$(AMR_DIR)" ; else echo "-DAMRWB_PASSTHROUGH" ; fi ;
-LOCAL_INSERT_LDFLAGS=test ! -d $(AMR_DIR) || echo "$(AMR_A)";
-
-
-include $(BASE)/build/modmake.rules

src/mod/codecs/mod_amrwb/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_amrwb
+
+AMRWB_DIR=$(switch_srcdir)/libs/amrwb
+AMRWB_BUILDDIR=$(switch_builddir)/libs/amrwb
+AMRWB_A=$(AMRWB_BUILDDIR)/libamrwb.a
+
+mod_LTLIBRARIES = mod_amrwb.la
+mod_amrwb_la_SOURCES  = mod_amrwb.c
+mod_amrwb_la_CFLAGS   = $(AM_CFLAGS)
+mod_amrwb_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_amrwb_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+if HAVE_AMRWB
+BUILT_SOURCES= $(AMRWB_A)
+mod_amrwb_la_CFLAGS += -I$(AMRWB_DIR)
+mod_amrwb_la_LIBADD += $(AMRWB_A)
+else
+mod_amrwb_la_CFLAGS += -DAMRWB_PASSTHROUGH
+endif
+

src/mod/codecs/mod_b64/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_b64
+
+mod_LTLIBRARIES = mod_b64.la
+mod_b64_la_SOURCES  = mod_b64.c
+mod_b64_la_CFLAGS   = $(AM_CFLAGS)
+mod_b64_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_b64_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/codecs/mod_bv/Makefile → src/mod/codecs/mod_bv/Makefile.am

-BASE=../../../..
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_bv
 
 BV_DIR=$(switch_srcdir)/libs/broadvoice
 BV_BUILDDIR=$(switch_builddir)/libs/broadvoice
-LOCAL_CFLAGS=-I$(BV_BUILDDIR)/src -I$(BV_DIR)/src 
 BV_LA=$(BV_BUILDDIR)/src/.libs/libbroadvoice.la
-LOCAL_LIBADD=$(BV_LA)
-include $(BASE)/build/modmake.rules
+BUILT_SOURCES=$(BV_LA)
+
+mod_LTLIBRARIES = mod_bv.la
+mod_bv_la_SOURCES  = mod_bv.c
+mod_bv_la_CFLAGS   = $(AM_CFLAGS) -I$(BV_BUILDDIR)/src -I$(BV_DIR)/src 
+mod_bv_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(BV_LA)
+mod_bv_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
 $(BV_LA): $(BV_DIR)/.update	
 	cd $(BV_BUILDDIR) && $(MAKE)
 	$(TOUCH_TARGET)
-

src/mod/codecs/mod_celt/Makefile → src/mod/codecs/mod_celt/Makefile.am

-BASE=../../../..
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_celt
 
 CELT=celt-0.10.0
 
 CELT_DIR=$(switch_srcdir)/libs/$(CELT)
 CELT_BUILDDIR=$(switch_builddir)/libs/$(CELT)
-LOCAL_CFLAGS=-I$(CELT_DIR)/libcelt
 CELT_LA=$(CELT_BUILDDIR)/libcelt/.libs/libcelt0.la
-LOCAL_LIBADD=$(CELT_LA)
-include $(BASE)/build/modmake.rules
 
+mod_LTLIBRARIES      = mod_celt.la
+mod_celt_la_SOURCES  = mod_celt.c
+mod_celt_la_CFLAGS   = $(AM_CFLAGS) -I$(CELT_DIR)/libcelt
+mod_celt_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(CELT_LA)
+mod_celt_la_LDFLAGS = -avoid-version -module -no-undefined -shared
+
+BUILT_SOURCES=$(CELT_LA)
 $(CELT_DIR):
 	$(GETLIB) $(CELT).tar.gz
 

src/mod/codecs/mod_codec2/Makefile → src/mod/codecs/mod_codec2/Makefile.am

-BASE=../../../..
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_codec2
 
 CODEC2_DIR=$(switch_srcdir)/libs/libcodec2
 CODEC2_BUILDDIR=$(switch_builddir)/libs/libcodec2
 CODEC2LA=$(CODEC2_BUILDDIR)/src/libcodec2.la
 
-LOCAL_CFLAGS=-I$(CODEC2_DIR)/include -I$(CODEC2_BUILDDIR)/src
-LOCAL_LIBADD=$(CODEC2LA)
-include $(BASE)/build/modmake.rules
+mod_LTLIBRARIES = mod_codec2.la
+mod_codec2_la_SOURCES  = mod_codec2.c
+mod_codec2_la_CFLAGS   = $(AM_CFLAGS) -I$(CODEC2_DIR)/include -I$(CODEC2_BUILDDIR)/src
+mod_codec2_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(CODEC2LA)
+mod_codec2_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+BUILT_SOURCES=$(CODEC2LA)
 
 $(CODEC2LA): $(CODEC2_DIR) $(CODEC2_DIR)/.update
 	cd $(CODEC2_BUILDDIR) && $(MAKE)

src/mod/codecs/mod_dahdi_codec/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_dahdi_codec
+
+mod_LTLIBRARIES = mod_dahdi_codec.la
+mod_dahdi_codec_la_SOURCES  = mod_dahdi_codec.c
+mod_dahdi_codec_la_CFLAGS   = $(AM_CFLAGS)
+mod_dahdi_codec_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_dahdi_codec_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/codecs/mod_g723_1/Makefile

-BASE=../../../..
-DIR=$(BASE)/libs/libg723_1
-BUILDDIR=$(BASE)/libs/libg723_1
-A=$(BUILDDIR)/.libs/libg723.a
-
-LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG723_PASSTHROUGH" ; fi ;
-LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) 
-
-include $(BASE)/build/modmake.rules

src/mod/codecs/mod_g723_1/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_g723_1
+
+DIR=$(switch_srcdir)/libs/libg723_1
+BUILDDIR=$(switch_builddir)/libs/libg723_1
+G723_1_A=$(BUILDDIR)/.libs/libg723.a
+
+mod_LTLIBRARIES = mod_g723_1.la
+mod_g723_1_la_SOURCES  = mod_g723_1.c
+mod_g723_1_la_CFLAGS   = $(AM_CFLAGS)
+mod_g723_1_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_g723_1_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+if HAVE_G723_1
+mod_g723_1_la_CFLAGS += -I$(DIR)/src/include
+mod_g723_1_la_LIBADD += $(G723_1_A)
+else
+mod_g723_1_la_CFLAGS += -DG723_PASSTHROUGH
+endif

src/mod/codecs/mod_g729/Makefile

-BASE=../../../..
-
-DIR=$(BASE)/libs/libg729
-BUILDDIR=$(BASE)/libs/libg729
-A=$(BUILDDIR)/.libs/libg729.a
-
-LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ;
-LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) 
-include $(BASE)/build/modmake.rules

src/mod/codecs/mod_g729/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_g729
+
+G729_DIR=$(switch_srcdir)/libs/libg729
+G729_BUILDDIR=$(switch_builddir)/libs/libg729
+G729_A=$(BUILDDIR)/.libs/libg729.a
+
+mod_LTLIBRARIES = mod_g729.la
+mod_g729_la_SOURCES  = mod_g729.c
+mod_g729_la_CFLAGS   = $(AM_CFLAGS)
+mod_g729_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_g729_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+if HAVE_G729
+mod_g729_la_CFLAGS += -I$(G729_DIR)/src/include
+mod_g729_la_LIBADD +- $(G729_A)
+else
+mod_g729_la_CFLAGS += -DG729_PASSTHROUGH
+endif

src/mod/codecs/mod_h26x/Makefile

-BASE=../../../..
-include $(BASE)/build/modmake.rules

src/mod/codecs/mod_h26x/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_h26x
+
+mod_LTLIBRARIES = mod_h26x.la
+mod_h26x_la_SOURCES  = mod_h26x.c
+mod_h26x_la_CFLAGS   = $(AM_CFLAGS)
+mod_h26x_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_h26x_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/codecs/mod_ilbc/Makefile → src/mod/codecs/mod_ilbc/Makefile.am

-BASE=../../../..
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_ilbc
+
 ILBC_DIR=$(switch_srcdir)/libs/ilbc
 ILBC_BUILDDIR=$(switch_builddir)/libs/ilbc
 ILBCLA=$(ILBC_BUILDDIR)/src/libilbc.la
-LOCAL_CFLAGS=-I$(ILBC_DIR)/src -I$(ILBC_BUILDDIR)/src
-LOCAL_LIBADD=$(ILBCLA)
 
-include $(BASE)/build/modmake.rules
+mod_LTLIBRARIES = mod_ilbc.la
+mod_ilbc_la_SOURCES  = mod_ilbc.c
+mod_ilbc_la_CFLAGS   = $(AM_CFLAGS) -I$(ILBC_DIR)/src -I$(ILBC_BUILDDIR)/src
+mod_ilbc_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(ILBCLA)
+mod_ilbc_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+BUILT_SOURCES=$(ILBCLA)
 
 $(ILBCLA): $(ILBC_DIR) $(ILBC_DIR)/.update
 	cd $(ILBC_BUILDDIR) && $(MAKE)

src/mod/codecs/mod_isac/Makefile

-BASE=../../../..
-
-LOCAL_SOURCES=arith_routines.c\
-arith_routines_hist.c\
-arith_routines_logist.c\
-auto_correlation.c\
-auto_corr_to_refl_coef.c\
-bandwidth_estimator.c\
-complex_bit_reverse.c\
-complex_fft.c\
-copy_set_operations.c\
-crc.c\
-cross_correlation.c\
-decode_bwe.c\
-decode.c\
-division_operations.c\
-dot_product_with_scale.c\
-downsample_fast.c\
-encode.c\
-encode_lpc_swb.c\
-energy.c\
-entropy_coding.c\
-fft.c\
-filter_ar.c\
-filter_ar_fast_q12.c\
-filterbanks.c\
-filterbank_tables.c\
-filter_functions.c\
-filter_ma_fast_q12.c\
-get_hanning_window.c\
-get_scaling_square.c\
-ilbc_specific_functions.c\
-intialize.c\
-isac.c\
-lattice.c\
-levinson_durbin.c\
-lpc_analysis.c\
-lpc_gain_swb_tables.c\
-lpc_shape_swb12_tables.c\
-lpc_shape_swb16_tables.c\
-lpc_tables.c\
-lpc_to_refl_coef.c\
-min_max_operations.c\
-min_max_operations_neon.c\
-pitch_estimator.c\
-pitch_filter.c\
-pitch_gain_tables.c\
-pitch_lag_tables.c\
-randomization_functions.c\
-refl_coef_to_lpc.c\
-resample_48khz.c\
-resample_by_2.c\
-resample_by_2_internal.c\
-resample.c\
-resample_fractional.c\
-spectrum_ar_model_tables.c\
-splitting_filter.c\
-spl_sqrt.c\
-spl_sqrt_floor.c\
-spl_version.c\
-sqrt_of_one_minus_x_squared.c\
-transform.c\
-vector_scaling_operations.c\
-webrtc_fft_t_1024_8.c\
-webrtc_fft_t_rad.c ""
-
-LOCAL_OBJS=$(shell echo $(LOCAL_SOURCES) | sed "s/.c /.o /g")
-LOCAL_CFLAGS=-w -I. 
-
-include $(BASE)/build/modmake.rules
-

src/mod/codecs/mod_isac/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_isac
+
+mod_LTLIBRARIES = mod_isac.la
+mod_isac_la_SOURCES  = mod_isac.c arith_routines.c arith_routines_hist.c arith_routines_logist.c auto_correlation.c auto_corr_to_refl_coef.c
+mod_isac_la_SOURCES += bandwidth_estimator.c complex_bit_reverse.c complex_fft.c copy_set_operations.c crc.c cross_correlation.c decode_bwe.c
+mod_isac_la_SOURCES += decode.c division_operations.c dot_product_with_scale.c downsample_fast.c encode.c encode_lpc_swb.c energy.c entropy_coding.c
+mod_isac_la_SOURCES += fft.c filter_ar.c filter_ar_fast_q12.c filterbanks.c filterbank_tables.c filter_functions.c filter_ma_fast_q12.c
+mod_isac_la_SOURCES += get_hanning_window.c get_scaling_square.c ilbc_specific_functions.c intialize.c isac.c lattice.c levinson_durbin.c
+mod_isac_la_SOURCES += lpc_analysis.c lpc_gain_swb_tables.c lpc_shape_swb12_tables.c lpc_shape_swb16_tables.c lpc_tables.c
+mod_isac_la_SOURCES += lpc_to_refl_coef.c min_max_operations.c min_max_operations_neon.c pitch_estimator.c pitch_filter.c pitch_gain_tables.c
+mod_isac_la_SOURCES += pitch_lag_tables.c randomization_functions.c refl_coef_to_lpc.c resample_48khz.c resample_by_2.c resample_by_2_internal.c
+mod_isac_la_SOURCES += resample.c resample_fractional.c spectrum_ar_model_tables.c splitting_filter.c spl_sqrt.c spl_sqrt_floor.c spl_version.c
+mod_isac_la_SOURCES += sqrt_of_one_minus_x_squared.c transform.c vector_scaling_operations.c webrtc_fft_t_1024_8.c webrtc_fft_t_rad.c
+mod_isac_la_CFLAGS   = $(AM_CFLAGS) -w -I.
+mod_isac_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_isac_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/codecs/mod_mp4v/Makefile

-BASE=../../../..
-include $(BASE)/build/modmake.rules

src/mod/codecs/mod_mp4v/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_mp4v
+
+mod_LTLIBRARIES = mod_mp4v.la
+mod_mp4v_la_SOURCES  = mod_mp4v.c
+mod_mp4v_la_CFLAGS   = $(AM_CFLAGS)
+mod_mp4v_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_mp4v_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/codecs/mod_opus/Makefile → src/mod/codecs/mod_opus/Makefile.am

-BASE=../../../..
-
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_opus
 OPUS=opus-1.1-p2
-
 OPUS_DIR=$(switch_srcdir)/libs/$(OPUS)
 OPUS_BUILDDIR=$(switch_builddir)/libs/$(OPUS)
-LOCAL_CFLAGS=-I$(OPUS_DIR)/include -g -O2
-LOCAL_LDFLAGS=-lm -lz
-
 OPUS_LA=$(OPUS_BUILDDIR)/.libs/libopus.la
 
-LOCAL_LIBADD=$(OPUS_LA)
-
-include $(BASE)/build/modmake.rules
+mod_LTLIBRARIES = mod_opus.la
+mod_opus_la_SOURCES  = mod_opus.c
+mod_opus_la_CFLAGS   = $(AM_CFLAGS) -I$(OPUS_DIR)/include
+mod_opus_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(OPUS_LA)
+mod_opus_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lm -lz
 
+BUILT_SOURCES=$(OPUS_LA)
 $(OPUS_DIR):
 	$(GETLIB) $(OPUS).tar.gz
 
@@ -23,7 +22,5 @@ $(OPUS_DIR)/Makefile: $(OPUS_DIR)
 $(OPUS_LA): $(OPUS_DIR)/Makefile
 	cd $(OPUS_BUILDDIR) && $(MAKE)
 
-
-
 $(MODNAME).lo: $(OPUS_LA)