]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
move applications to use automake
authorMichael Jerris <mike@jerris.com>
Thu, 27 Feb 2014 19:16:54 +0000 (14:16 -0500)
committerMichael Jerris <mike@jerris.com>
Fri, 7 Mar 2014 23:36:12 +0000 (18:36 -0500)
234 files changed:
configure.in
libs/stfu/stfu.h
libs/xmlrpc-c/src/Makefile
libs/xmlrpc-c/src/xml_trace.c [moved from libs/xmlrpc-c/src/trace.c with 100% similarity]
src/mod/.gitignore
src/mod/applications/.gitignore [new file with mode: 0644]
src/mod/applications/mod_abstraction/Makefile [deleted file]
src/mod/applications/mod_abstraction/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_avmd/Makefile [deleted file]
src/mod/applications/mod_avmd/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_blacklist/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_callcenter/Makefile [deleted file]
src/mod/applications/mod_callcenter/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_cidlookup/Makefile [deleted file]
src/mod/applications/mod_cidlookup/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_cluechoo/Makefile [deleted file]
src/mod/applications/mod_cluechoo/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_commands/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_conference/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_curl/Makefile [deleted file]
src/mod/applications/mod_curl/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_db/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_directory/Makefile [deleted file]
src/mod/applications/mod_directory/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_distributor/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_dptools/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_easyroute/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_enum/Makefile [deleted file]
src/mod/applications/mod_enum/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_esf/Makefile [deleted file]
src/mod/applications/mod_esf/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_esl/Makefile [deleted file]
src/mod/applications/mod_esl/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_fifo/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_fsk/Makefile [deleted file]
src/mod/applications/mod_fsk/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_fsv/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_httapi/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_http_cache/Makefile [deleted file]
src/mod/applications/mod_http_cache/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_ladspa/Makefile [deleted file]
src/mod/applications/mod_ladspa/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_ladspa/load.c
src/mod/applications/mod_lcr/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_limit/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_memcache/Makefile.am [moved from src/mod/applications/mod_memcache/Makefile with 54% similarity]
src/mod/applications/mod_mongo/Makefile [deleted file]
src/mod/applications/mod_mongo/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_mp4/Makefile [deleted file]
src/mod/applications/mod_mp4/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_nibblebill/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_oreka/Makefile [deleted file]
src/mod/applications/mod_oreka/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_rad_auth/Makefile.am [moved from src/mod/event_handlers/mod_radius_cdr/Makefile with 63% similarity]
src/mod/applications/mod_random/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_redis/Makefile [deleted file]
src/mod/applications/mod_redis/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_rss/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_skel/Makefile [deleted file]
src/mod/applications/mod_skel/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_sms/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_snapshot/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_snipe_hunt/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_snom/Makefile [deleted file]
src/mod/applications/mod_snom/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_sonar/Makefile [deleted file]
src/mod/applications/mod_sonar/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_soundtouch/Makefile.am [moved from src/mod/applications/mod_soundtouch/Makefile with 57% similarity]
src/mod/applications/mod_spy/Makefile [deleted file]
src/mod/applications/mod_spy/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_translate/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_valet_parking/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_vmd/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_voicemail/Makefile.am [new file with mode: 0644]
src/mod/applications/mod_voicemail_ivr/Makefile [deleted file]
src/mod/applications/mod_voicemail_ivr/Makefile.am [new file with mode: 0644]
src/mod/asr_tts/mod_cepstral/Makefile [deleted file]
src/mod/asr_tts/mod_cepstral/Makefile.am [new file with mode: 0644]
src/mod/asr_tts/mod_flite/Makefile.am [moved from src/mod/asr_tts/mod_flite/Makefile with 75% similarity]
src/mod/asr_tts/mod_pocketsphinx/Makefile.am [moved from src/mod/asr_tts/mod_pocketsphinx/Makefile with 77% similarity]
src/mod/asr_tts/mod_tts_commandline/Makefile.am [new file with mode: 0644]
src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c
src/mod/codecs/mod_amr/Makefile [deleted file]
src/mod/codecs/mod_amr/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_amrwb/Makefile [deleted file]
src/mod/codecs/mod_amrwb/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_b64/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_bv/Makefile [deleted file]
src/mod/codecs/mod_bv/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_celt/Makefile.am [moved from src/mod/codecs/mod_celt/Makefile with 58% similarity]
src/mod/codecs/mod_codec2/Makefile [deleted file]
src/mod/codecs/mod_codec2/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_dahdi_codec/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_g723_1/Makefile [deleted file]
src/mod/codecs/mod_g723_1/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_g729/Makefile [deleted file]
src/mod/codecs/mod_g729/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_h26x/Makefile [deleted file]
src/mod/codecs/mod_h26x/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_ilbc/Makefile [deleted file]
src/mod/codecs/mod_ilbc/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_isac/Makefile [deleted file]
src/mod/codecs/mod_isac/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_mp4v/Makefile [deleted file]
src/mod/codecs/mod_mp4v/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_opus/Makefile.am [moved from src/mod/codecs/mod_opus/Makefile with 55% similarity]
src/mod/codecs/mod_sangoma_codec/Makefile [deleted file]
src/mod/codecs/mod_sangoma_codec/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_silk/Makefile [deleted file]
src/mod/codecs/mod_silk/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_siren/Makefile [deleted file]
src/mod/codecs/mod_siren/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_skel_codec/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_theora/Makefile [deleted file]
src/mod/codecs/mod_theora/Makefile.am [new file with mode: 0644]
src/mod/codecs/mod_voipcodecs/Makefile [deleted file]
src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj [deleted file]
src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c [deleted file]
src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj [deleted file]
src/mod/codecs/mod_vp8/Makefile.am [new file with mode: 0644]
src/mod/dialplans/mod_dialplan_asterisk/Makefile.am [new file with mode: 0644]
src/mod/dialplans/mod_dialplan_directory/Makefile.am [new file with mode: 0644]
src/mod/dialplans/mod_dialplan_xml/Makefile.am [new file with mode: 0644]
src/mod/directories/mod_ldap/Makefile.am [moved from src/mod/directories/mod_ldap/Makefile with 54% similarity]
src/mod/endpoints/mod_alsa/Makefile [deleted file]
src/mod/endpoints/mod_alsa/Makefile.am [new file with mode: 0644]
src/mod/endpoints/mod_dingaling/Makefile [deleted file]
src/mod/endpoints/mod_dingaling/Makefile.am [new file with mode: 0644]
src/mod/endpoints/mod_h323/Makefile [deleted file]
src/mod/endpoints/mod_h323/Makefile.am [new file with mode: 0644]
src/mod/endpoints/mod_khomp/Makefile [deleted file]
src/mod/endpoints/mod_khomp/Makefile.am [new file with mode: 0644]
src/mod/endpoints/mod_loopback/Makefile [deleted file]
src/mod/endpoints/mod_loopback/Makefile.am [new file with mode: 0644]
src/mod/endpoints/mod_opal/Makefile [deleted file]
src/mod/endpoints/mod_opal/Makefile.am [new file with mode: 0644]
src/mod/endpoints/mod_reference/Makefile [deleted file]
src/mod/endpoints/mod_reference/Makefile.am [new file with mode: 0644]
src/mod/endpoints/mod_rtmp/Makefile [deleted file]
src/mod/endpoints/mod_rtmp/Makefile.am [new file with mode: 0644]
src/mod/endpoints/mod_rtmp/libamf/src/amf0.c
src/mod/endpoints/mod_rtmp/libamf/src/amf0.h
src/mod/endpoints/mod_rtmp/libamf/src/io.c
src/mod/endpoints/mod_unicall/Makefile.am [new file with mode: 0644]
src/mod/event_handlers/mod_cdr_csv/Makefile [deleted file]
src/mod/event_handlers/mod_cdr_csv/Makefile.am [new file with mode: 0644]
src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
src/mod/event_handlers/mod_cdr_mongodb/Makefile [deleted file]
src/mod/event_handlers/mod_cdr_mongodb/Makefile.am [new file with mode: 0644]
src/mod/event_handlers/mod_cdr_pg_csv/Makefile [deleted file]
src/mod/event_handlers/mod_cdr_pg_csv/Makefile.am [new file with mode: 0644]
src/mod/event_handlers/mod_cdr_pg_csv/mod_cdr_pg_csv.c
src/mod/event_handlers/mod_cdr_sqlite/Makefile [deleted file]
src/mod/event_handlers/mod_cdr_sqlite/Makefile.am [new file with mode: 0644]
src/mod/event_handlers/mod_erlang_event/Makefile.am [new file with mode: 0644]
src/mod/event_handlers/mod_erlang_event/Makefile.in [deleted file]
src/mod/event_handlers/mod_event_multicast/Makefile [deleted file]
src/mod/event_handlers/mod_event_multicast/Makefile.am [new file with mode: 0644]
src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
src/mod/event_handlers/mod_event_socket/Makefile.am [new file with mode: 0644]
src/mod/event_handlers/mod_event_test/Makefile.am [new file with mode: 0644]
src/mod/event_handlers/mod_event_zmq/Makefile.am [moved from src/mod/event_handlers/mod_event_zmq/Makefile with 60% similarity]
src/mod/event_handlers/mod_format_cdr/Makefile [deleted file]
src/mod/event_handlers/mod_format_cdr/Makefile.am [new file with mode: 0644]
src/mod/event_handlers/mod_format_cdr/mod_format_cdr.c
src/mod/event_handlers/mod_json_cdr/Makefile [deleted file]
src/mod/event_handlers/mod_json_cdr/Makefile.am [new file with mode: 0644]
src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c
src/mod/event_handlers/mod_radius_cdr/Makefile.am [moved from src/mod/applications/mod_rad_auth/Makefile with 62% similarity]
src/mod/event_handlers/mod_rayo/Makefile [deleted file]
src/mod/event_handlers/mod_rayo/Makefile.am [new file with mode: 0644]
src/mod/event_handlers/mod_rayo/test_iks/Makefile [deleted file]
src/mod/event_handlers/mod_rayo/test_nlsml/Makefile [deleted file]
src/mod/event_handlers/mod_rayo/test_srgs/Makefile [deleted file]
src/mod/event_handlers/mod_snmp/Makefile [deleted file]
src/mod/event_handlers/mod_snmp/Makefile.am [new file with mode: 0644]
src/mod/formats/mod_local_stream/Makefile [deleted file]
src/mod/formats/mod_local_stream/Makefile.am [new file with mode: 0644]
src/mod/formats/mod_native_file/Makefile.am [new file with mode: 0644]
src/mod/formats/mod_shell_stream/Makefile.am [new file with mode: 0644]
src/mod/formats/mod_shout/Makefile.am [moved from src/mod/formats/mod_shout/Makefile with 70% similarity]
src/mod/formats/mod_shout/mod_shout.c
src/mod/formats/mod_sndfile/Makefile [deleted file]
src/mod/formats/mod_sndfile/Makefile.am [new file with mode: 0644]
src/mod/formats/mod_ssml/Makefile [deleted file]
src/mod/formats/mod_ssml/Makefile.am [new file with mode: 0644]
src/mod/formats/mod_tone_stream/Makefile.am [new file with mode: 0644]
src/mod/formats/mod_vlc/Makefile [deleted file]
src/mod/formats/mod_vlc/Makefile.am [new file with mode: 0644]
src/mod/languages/mod_java/Makefile.am [moved from src/mod/languages/mod_java/Makefile.in with 57% similarity]
src/mod/languages/mod_managed/Makefile.am [moved from src/mod/languages/mod_managed/Makefile with 59% similarity]
src/mod/languages/mod_perl/Makefile.am [moved from src/mod/languages/mod_perl/Makefile with 57% similarity]
src/mod/languages/mod_python/Makefile.am [moved from src/mod/languages/mod_python/Makefile.in with 57% similarity]
src/mod/languages/mod_yaml/Makefile [deleted file]
src/mod/languages/mod_yaml/Makefile.am [new file with mode: 0644]
src/mod/loggers/mod_console/Makefile.am [new file with mode: 0644]
src/mod/loggers/mod_logfile/Makefile.am [new file with mode: 0644]
src/mod/loggers/mod_syslog/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_de/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_en/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_es/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_fa/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_fr/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_he/Makefile [deleted file]
src/mod/say/mod_say_he/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_hr/Makefile [deleted file]
src/mod/say/mod_say_hr/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_hu/Makefile [deleted file]
src/mod/say/mod_say_hu/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_it/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_ja/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_nl/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_pl/Makefile [deleted file]
src/mod/say/mod_say_pl/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_pt/Makefile [deleted file]
src/mod/say/mod_say_pt/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_ru/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_sv/Makefile [deleted file]
src/mod/say/mod_say_sv/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_th/Makefile.am [new file with mode: 0644]
src/mod/say/mod_say_zh/Makefile.am [new file with mode: 0644]
src/mod/timers/mod_posix_timer/Makefile.am [new file with mode: 0644]
src/mod/timers/mod_timerfd/Makefile.am [new file with mode: 0644]
src/mod/xml_int/mod_xml_cdr/Makefile [deleted file]
src/mod/xml_int/mod_xml_cdr/Makefile.am [new file with mode: 0644]
src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
src/mod/xml_int/mod_xml_curl/Makefile [deleted file]
src/mod/xml_int/mod_xml_curl/Makefile.am [new file with mode: 0644]
src/mod/xml_int/mod_xml_ldap/Makefile.am [moved from src/mod/xml_int/mod_xml_ldap/Makefile with 52% similarity]
src/mod/xml_int/mod_xml_radius/Makefile.am [moved from src/mod/xml_int/mod_xml_radius/Makefile with 62% similarity]
src/mod/xml_int/mod_xml_rpc/Makefile [deleted file]
src/mod/xml_int/mod_xml_rpc/Makefile.am [new file with mode: 0644]
src/mod/xml_int/mod_xml_scgi/Makefile [deleted file]
src/mod/xml_int/mod_xml_scgi/Makefile.am [new file with mode: 0644]

index ea589a3964562d3c9879def64dd5194e9396c567..3d6fe7d2f4ef45224534914dbe034b99aa3cd3c6 100644 (file)
@@ -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;`'
index 895c0911aa0b4f4a652467326285b96a9ff5f7b1..1434699522127850a6d62e6c5315ab710b51d45e 100644 (file)
@@ -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>
index 36300e91f02ddcccbf8607051fa47b950650086f..726abba90f0f191c43396211196e344258be0b10 100644 (file)
@@ -83,7 +83,7 @@ LIBXMLRPC_MODS = \
        parse_datetime \
        parse_value \
         resource \
-       trace \
+       xml_trace \
        version \
        xmlrpc_data \
        xmlrpc_datetime \
index d58ffe7245006f987894d4df5eb6ec11bcd30806..319e1e69914b44c92cc5653fe7b892b32ec30ee1 100644 (file)
@@ -76,3 +76,6 @@
 /timers/mod_posix_timer/Makefile
 /timers/mod_timerfd/Makefile
 /endpoints/mod_unicall/Makefile
+*/*/Makefile.in
+*/*/Makefile
+*/*/mod_*.log
diff --git a/src/mod/applications/.gitignore b/src/mod/applications/.gitignore
new file mode 100644 (file)
index 0000000..0913e98
--- /dev/null
@@ -0,0 +1,3 @@
+*/Makefile.in
+*/Makefile
+*/mod_*.log
diff --git a/src/mod/applications/mod_abstraction/Makefile b/src/mod/applications/mod_abstraction/Makefile
deleted file mode 100644 (file)
index 53a1f37..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
\ No newline at end of file
diff --git a/src/mod/applications/mod_abstraction/Makefile.am b/src/mod/applications/mod_abstraction/Makefile.am
new file mode 100644 (file)
index 0000000..8ab961e
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_avmd/Makefile b/src/mod/applications/mod_avmd/Makefile
deleted file mode 100644 (file)
index c4a62d4..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-#
-
diff --git a/src/mod/applications/mod_avmd/Makefile.am b/src/mod/applications/mod_avmd/Makefile.am
new file mode 100644 (file)
index 0000000..0387fee
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_blacklist/Makefile.am b/src/mod/applications/mod_blacklist/Makefile.am
new file mode 100644 (file)
index 0000000..9a3de4c
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_callcenter/Makefile b/src/mod/applications/mod_callcenter/Makefile
deleted file mode 100644 (file)
index 53a1f37..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
\ No newline at end of file
diff --git a/src/mod/applications/mod_callcenter/Makefile.am b/src/mod/applications/mod_callcenter/Makefile.am
new file mode 100644 (file)
index 0000000..313a440
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_cidlookup/Makefile b/src/mod/applications/mod_cidlookup/Makefile
deleted file mode 100644 (file)
index 24790d0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
-
diff --git a/src/mod/applications/mod_cidlookup/Makefile.am b/src/mod/applications/mod_cidlookup/Makefile.am
new file mode 100644 (file)
index 0000000..c908e27
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_cluechoo/Makefile b/src/mod/applications/mod_cluechoo/Makefile
deleted file mode 100644 (file)
index d96278f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-LOCAL_LDFLAGS=-lncurses
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/applications/mod_cluechoo/Makefile.am b/src/mod/applications/mod_cluechoo/Makefile.am
new file mode 100644 (file)
index 0000000..4c71aa5
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_commands/Makefile.am b/src/mod/applications/mod_commands/Makefile.am
new file mode 100644 (file)
index 0000000..82cfe69
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_conference/Makefile.am b/src/mod/applications/mod_conference/Makefile.am
new file mode 100644 (file)
index 0000000..b0ffced
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_curl/Makefile b/src/mod/applications/mod_curl/Makefile
deleted file mode 100644 (file)
index 6cae5a8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-json-c=json-c-0.9
-BASE=../../../..
-
-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)
-
-include $(BASE)/build/modmake.rules
-
-$(JSON_DIR):
-       $(GETLIB) $(json-c).tar.gz
-
-$(JSON_BUILDDIR)/Makefile: $(JSON_DIR)
-       mkdir -p $(JSON_BUILDDIR)
-       cd $(JSON_BUILDDIR) && $(DEFAULT_VARS) $(JSON_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(JSON_DIR) CPPFLAGS= LDFLAGS=
-       $(TOUCH_TARGET)
-
-$(JSONLA): $(JSON_BUILDDIR)/Makefile
-       cd $(JSON_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
diff --git a/src/mod/applications/mod_curl/Makefile.am b/src/mod/applications/mod_curl/Makefile.am
new file mode 100644 (file)
index 0000000..2671533
--- /dev/null
@@ -0,0 +1,32 @@
+include $(top_srcdir)/build/modmake.rulesam
+
+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
+
+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
+
+BUILT_SOURCES=$(JSONLA)
+
+$(JSON_DIR):
+       $(GETLIB) $(JSON_C).tar.gz
+
+$(JSON_BUILDDIR)/Makefile: $(JSON_DIR)
+       mkdir -p $(JSON_BUILDDIR)
+       cd $(JSON_BUILDDIR) && $(DEFAULT_VARS) $(JSON_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(JSON_DIR) CPPFLAGS= LDFLAGS=
+       $(TOUCH_TARGET)
+
+$(JSONLA): $(JSON_BUILDDIR)/Makefile
+       cd $(JSON_BUILDDIR) && $(MAKE)
+       $(TOUCH_TARGET)
+
+
+
diff --git a/src/mod/applications/mod_db/Makefile.am b/src/mod/applications/mod_db/Makefile.am
new file mode 100644 (file)
index 0000000..5cd653c
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_directory/Makefile b/src/mod/applications/mod_directory/Makefile
deleted file mode 100644 (file)
index 53a1f37..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
\ No newline at end of file
diff --git a/src/mod/applications/mod_directory/Makefile.am b/src/mod/applications/mod_directory/Makefile.am
new file mode 100644 (file)
index 0000000..81b61d9
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_distributor/Makefile.am b/src/mod/applications/mod_distributor/Makefile.am
new file mode 100644 (file)
index 0000000..338a24a
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_dptools/Makefile.am b/src/mod/applications/mod_dptools/Makefile.am
new file mode 100644 (file)
index 0000000..8729f8a
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_easyroute/Makefile.am b/src/mod/applications/mod_easyroute/Makefile.am
new file mode 100644 (file)
index 0000000..c82c696
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_enum/Makefile b/src/mod/applications/mod_enum/Makefile
deleted file mode 100644 (file)
index 6389906..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-BASE=../../../..
-
-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
-       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)
-
-$(LDNS_LA): $(LDNS_BUILDDIR)/Makefile
-       cd $(LDNS_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
-
-$(MODNAME).lo: $(LDNS_LA)
diff --git a/src/mod/applications/mod_enum/Makefile.am b/src/mod/applications/mod_enum/Makefile.am
new file mode 100644 (file)
index 0000000..7a6b10d
--- /dev/null
@@ -0,0 +1,24 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_enum
+
+LDNS=ldns
+LDNS_DIR=$(switch_srcdir)/libs/$(LDNS)
+LDNS_BUILDDIR=$(switch_builddir)/libs/$(LDNS)
+LDNS_LA=$(LDNS_BUILDDIR)/libldns.la
+
+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)
+
+$(LDNS_LA): $(LDNS_BUILDDIR)/Makefile
+       cd $(LDNS_BUILDDIR) && $(MAKE)
+       $(TOUCH_TARGET)
diff --git a/src/mod/applications/mod_esf/Makefile b/src/mod/applications/mod_esf/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/applications/mod_esf/Makefile.am b/src/mod/applications/mod_esf/Makefile.am
new file mode 100644 (file)
index 0000000..e1eb52d
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_esl/Makefile b/src/mod/applications/mod_esl/Makefile
deleted file mode 100644 (file)
index cbdd686..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/src/mod/applications/mod_esl/Makefile.am b/src/mod/applications/mod_esl/Makefile.am
new file mode 100644 (file)
index 0000000..dea233f
--- /dev/null
@@ -0,0 +1,13 @@
+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
diff --git a/src/mod/applications/mod_fifo/Makefile.am b/src/mod/applications/mod_fifo/Makefile.am
new file mode 100644 (file)
index 0000000..ef239c8
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_fsk/Makefile b/src/mod/applications/mod_fsk/Makefile
deleted file mode 100644 (file)
index 620f3f7..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-BASE=../../../..
-
-LOCAL_SOURCES=fsk.c uart.c fsk_callerid.c
-LOCAL_OBJS=fsk.o uart.o fsk_callerid.o
-include $(BASE)/build/modmake.rules
-
diff --git a/src/mod/applications/mod_fsk/Makefile.am b/src/mod/applications/mod_fsk/Makefile.am
new file mode 100644 (file)
index 0000000..d551b6f
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_fsv/Makefile.am b/src/mod/applications/mod_fsv/Makefile.am
new file mode 100644 (file)
index 0000000..dd75a2f
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_httapi/Makefile.am b/src/mod/applications/mod_httapi/Makefile.am
new file mode 100644 (file)
index 0000000..31452d6
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_http_cache/Makefile b/src/mod/applications/mod_http_cache/Makefile
deleted file mode 100644 (file)
index 9b61a41..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-BASE=../../../..
-
-LOCAL_OBJS= \
-       aws.o
-LOCAL_SOURCES= \
-       aws.c
-
-include $(BASE)/build/modmake.rules
-
diff --git a/src/mod/applications/mod_http_cache/Makefile.am b/src/mod/applications/mod_http_cache/Makefile.am
new file mode 100644 (file)
index 0000000..b03e43a
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_ladspa/Makefile b/src/mod/applications/mod_ladspa/Makefile
deleted file mode 100644 (file)
index 1a77c52..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-BASE=../../../..
-
-LOCAL_OBJS += load.o
-include $(BASE)/build/modmake.rules
-
diff --git a/src/mod/applications/mod_ladspa/Makefile.am b/src/mod/applications/mod_ladspa/Makefile.am
new file mode 100644 (file)
index 0000000..04dcfb6
--- /dev/null
@@ -0,0 +1,8 @@
+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
index 652ecfa0f2e199e08831ac6ccbd2bd5f5a781c67..e8976bfa648cadb4489ac05927c5eca347679b29 100644 (file)
@@ -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
diff --git a/src/mod/applications/mod_lcr/Makefile.am b/src/mod/applications/mod_lcr/Makefile.am
new file mode 100644 (file)
index 0000000..ddfbb63
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_limit/Makefile.am b/src/mod/applications/mod_limit/Makefile.am
new file mode 100644 (file)
index 0000000..c60208a
--- /dev/null
@@ -0,0 +1,8 @@
+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
similarity index 54%
rename from src/mod/applications/mod_memcache/Makefile
rename to src/mod/applications/mod_memcache/Makefile.am
index 0f469ff9e263c86d970636aaefec35a058b62b18..e003a4de3f277d65a9583fa8ba98c74fbedd9fc8 100644 (file)
@@ -1,18 +1,18 @@
+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)
-
-
-
diff --git a/src/mod/applications/mod_mongo/Makefile b/src/mod/applications/mod_mongo/Makefile
deleted file mode 100644 (file)
index aa696cb..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-BASE=../../../..
-
-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)
-LIBMONGOCLIENT_A =$(MONGO_CXX_DRIVER_SRC)/libmongoclient.a
-
-LOCAL_SOURCES=
-LOCAL_OBJS=
-
-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
-
-$(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
-       $(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','')})|" && \
-               echo "env.Append(PATH=os.environ.get('PATH','/bin:/usr/bin'))" >> SConstruct && \
-               scons)
-       $(TOUCH_TARGET)
-
diff --git a/src/mod/applications/mod_mongo/Makefile.am b/src/mod/applications/mod_mongo/Makefile.am
new file mode 100644 (file)
index 0000000..44f44d4
--- /dev/null
@@ -0,0 +1,31 @@
+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=$(switch_builddir)/libs/mongo-cxx-driver-$(MONGO_CXX_DRIVER_VERSION)
+LIBMONGOCLIENT_A =$(MONGO_CXX_DRIVER_SRC)/libmongoclient.a
+
+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
+
+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 $(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','')})|" && \
+               echo "env.Append(PATH=os.environ.get('PATH','/bin:/usr/bin'))" >> SConstruct && \
+               scons)
+       $(TOUCH_TARGET)
+
diff --git a/src/mod/applications/mod_mp4/Makefile b/src/mod/applications/mod_mp4/Makefile
deleted file mode 100644 (file)
index 99b0d47..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/src/mod/applications/mod_mp4/Makefile.am b/src/mod/applications/mod_mp4/Makefile.am
new file mode 100644 (file)
index 0000000..46d3f78
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_nibblebill/Makefile.am b/src/mod/applications/mod_nibblebill/Makefile.am
new file mode 100644 (file)
index 0000000..97c9099
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_oreka/Makefile b/src/mod/applications/mod_oreka/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/applications/mod_oreka/Makefile.am b/src/mod/applications/mod_oreka/Makefile.am
new file mode 100644 (file)
index 0000000..446f518
--- /dev/null
@@ -0,0 +1,8 @@
+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
similarity index 63%
rename from src/mod/event_handlers/mod_radius_cdr/Makefile
rename to src/mod/applications/mod_rad_auth/Makefile.am
index 63542dff476eb9c0d196b31c2e5ade818a32a411..f39269a6b25dbf573b2db9c4b1a03b2aade681ae 100644 (file)
@@ -1,3 +1,6 @@
+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)
-
-
diff --git a/src/mod/applications/mod_random/Makefile.am b/src/mod/applications/mod_random/Makefile.am
new file mode 100644 (file)
index 0000000..36c2d6d
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_redis/Makefile b/src/mod/applications/mod_redis/Makefile
deleted file mode 100644 (file)
index 9ff4816..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-BASE=../../../..
-LOCAL_OBJS=credis.o
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/applications/mod_redis/Makefile.am b/src/mod/applications/mod_redis/Makefile.am
new file mode 100644 (file)
index 0000000..2871bb6
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_rss/Makefile.am b/src/mod/applications/mod_rss/Makefile.am
new file mode 100644 (file)
index 0000000..718ea0d
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_skel/Makefile b/src/mod/applications/mod_skel/Makefile
deleted file mode 100644 (file)
index 53a1f37..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
\ No newline at end of file
diff --git a/src/mod/applications/mod_skel/Makefile.am b/src/mod/applications/mod_skel/Makefile.am
new file mode 100644 (file)
index 0000000..2860807
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_sms/Makefile.am b/src/mod/applications/mod_sms/Makefile.am
new file mode 100644 (file)
index 0000000..50d5cad
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_snapshot/Makefile.am b/src/mod/applications/mod_snapshot/Makefile.am
new file mode 100644 (file)
index 0000000..f20727b
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_snipe_hunt/Makefile.am b/src/mod/applications/mod_snipe_hunt/Makefile.am
new file mode 100644 (file)
index 0000000..22bcec0
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_snom/Makefile b/src/mod/applications/mod_snom/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/applications/mod_snom/Makefile.am b/src/mod/applications/mod_snom/Makefile.am
new file mode 100644 (file)
index 0000000..0551c85
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_sonar/Makefile b/src/mod/applications/mod_sonar/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/applications/mod_sonar/Makefile.am b/src/mod/applications/mod_sonar/Makefile.am
new file mode 100644 (file)
index 0000000..4398e3c
--- /dev/null
@@ -0,0 +1,8 @@
+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
similarity index 57%
rename from src/mod/applications/mod_soundtouch/Makefile
rename to src/mod/applications/mod_soundtouch/Makefile.am
index 0afa65ca691e2dbb755a1dae7b1a11224d040f00..183d71e09f3d4c205d20fa2e7117da1068d9c7c1 100644 (file)
@@ -1,13 +1,18 @@
-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}
diff --git a/src/mod/applications/mod_spy/Makefile b/src/mod/applications/mod_spy/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/applications/mod_spy/Makefile.am b/src/mod/applications/mod_spy/Makefile.am
new file mode 100644 (file)
index 0000000..619c2b1
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_translate/Makefile.am b/src/mod/applications/mod_translate/Makefile.am
new file mode 100644 (file)
index 0000000..1bc12aa
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_valet_parking/Makefile.am b/src/mod/applications/mod_valet_parking/Makefile.am
new file mode 100644 (file)
index 0000000..e45006a
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_vmd/Makefile.am b/src/mod/applications/mod_vmd/Makefile.am
new file mode 100644 (file)
index 0000000..32af585
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_voicemail/Makefile.am b/src/mod/applications/mod_voicemail/Makefile.am
new file mode 100644 (file)
index 0000000..c658468
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/applications/mod_voicemail_ivr/Makefile b/src/mod/applications/mod_voicemail_ivr/Makefile
deleted file mode 100644 (file)
index 38f5aae..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-BASE=../../../..
-LOCAL_OBJS=ivr.o utils.o config.o menu.o
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/applications/mod_voicemail_ivr/Makefile.am b/src/mod/applications/mod_voicemail_ivr/Makefile.am
new file mode 100644 (file)
index 0000000..bfd7075
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/asr_tts/mod_cepstral/Makefile b/src/mod/asr_tts/mod_cepstral/Makefile
deleted file mode 100644 (file)
index ef6abc8..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-
diff --git a/src/mod/asr_tts/mod_cepstral/Makefile.am b/src/mod/asr_tts/mod_cepstral/Makefile.am
new file mode 100644 (file)
index 0000000..45d23c6
--- /dev/null
@@ -0,0 +1,17 @@
+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
+
similarity index 75%
rename from src/mod/asr_tts/mod_flite/Makefile
rename to src/mod/asr_tts/mod_flite/Makefile.am
index 360eb611e142cba25bb25aee09e948bc99009010..d26f77436684cb70b6dcad04baac42d15fd6d8b8 100644 (file)
@@ -1,3 +1,6 @@
+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
 
similarity index 77%
rename from src/mod/asr_tts/mod_pocketsphinx/Makefile
rename to src/mod/asr_tts/mod_pocketsphinx/Makefile.am
index 6a5ab196c27e72f7d895959e0c2a92bd6fa9c150..352d916a155e983fd7469cf8f811d187628a3109 100644 (file)
@@ -1,3 +1,6 @@
+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
 
diff --git a/src/mod/asr_tts/mod_tts_commandline/Makefile.am b/src/mod/asr_tts/mod_tts_commandline/Makefile.am
new file mode 100644 (file)
index 0000000..10bc342
--- /dev/null
@@ -0,0 +1,8 @@
+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
index ab059f1f3a20b9299a614e35199305cadc62e496..6ff5bada847213e929658acf5e1f6de474b454cd 100644 (file)
@@ -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);
diff --git a/src/mod/codecs/mod_amr/Makefile b/src/mod/codecs/mod_amr/Makefile
deleted file mode 100644 (file)
index a0d8e51..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/src/mod/codecs/mod_amr/Makefile.am b/src/mod/codecs/mod_amr/Makefile.am
new file mode 100644 (file)
index 0000000..09502d8
--- /dev/null
@@ -0,0 +1,21 @@
+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
+
diff --git a/src/mod/codecs/mod_amrwb/Makefile b/src/mod/codecs/mod_amrwb/Makefile
deleted file mode 100644 (file)
index 13853ff..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/src/mod/codecs/mod_amrwb/Makefile.am b/src/mod/codecs/mod_amrwb/Makefile.am
new file mode 100644 (file)
index 0000000..ddb1a56
--- /dev/null
@@ -0,0 +1,21 @@
+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
+
diff --git a/src/mod/codecs/mod_b64/Makefile.am b/src/mod/codecs/mod_b64/Makefile.am
new file mode 100644 (file)
index 0000000..6769f8b
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/codecs/mod_bv/Makefile b/src/mod/codecs/mod_bv/Makefile
deleted file mode 100644 (file)
index b1de894..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-BASE=../../../..
-
-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
-
-$(BV_LA): $(BV_DIR)/.update    
-       cd $(BV_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
-
diff --git a/src/mod/codecs/mod_bv/Makefile.am b/src/mod/codecs/mod_bv/Makefile.am
new file mode 100644 (file)
index 0000000..db4b415
--- /dev/null
@@ -0,0 +1,17 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_bv
+
+BV_DIR=$(switch_srcdir)/libs/broadvoice
+BV_BUILDDIR=$(switch_builddir)/libs/broadvoice
+BV_LA=$(BV_BUILDDIR)/src/.libs/libbroadvoice.la
+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)
similarity index 58%
rename from src/mod/codecs/mod_celt/Makefile
rename to src/mod/codecs/mod_celt/Makefile.am
index a3cf7b36c55f3229b7e9f6f20c008531b687dc03..472b96032cdfefa3d2205dbc77052a875d3a7a92 100644 (file)
@@ -1,14 +1,19 @@
-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
 
diff --git a/src/mod/codecs/mod_codec2/Makefile b/src/mod/codecs/mod_codec2/Makefile
deleted file mode 100644 (file)
index 568df9c..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-BASE=../../../..
-
-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
-
-$(CODEC2LA): $(CODEC2_DIR) $(CODEC2_DIR)/.update
-       cd $(CODEC2_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
-
diff --git a/src/mod/codecs/mod_codec2/Makefile.am b/src/mod/codecs/mod_codec2/Makefile.am
new file mode 100644 (file)
index 0000000..9c6bb6a
--- /dev/null
@@ -0,0 +1,19 @@
+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
+
+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)
+       $(TOUCH_TARGET)
+
diff --git a/src/mod/codecs/mod_dahdi_codec/Makefile.am b/src/mod/codecs/mod_dahdi_codec/Makefile.am
new file mode 100644 (file)
index 0000000..d4e3287
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/codecs/mod_g723_1/Makefile b/src/mod/codecs/mod_g723_1/Makefile
deleted file mode 100644 (file)
index 9914e1b..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/src/mod/codecs/mod_g723_1/Makefile.am b/src/mod/codecs/mod_g723_1/Makefile.am
new file mode 100644 (file)
index 0000000..cf93b83
--- /dev/null
@@ -0,0 +1,19 @@
+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
diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
deleted file mode 100644 (file)
index ff8d767..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/src/mod/codecs/mod_g729/Makefile.am b/src/mod/codecs/mod_g729/Makefile.am
new file mode 100644 (file)
index 0000000..4c5ef90
--- /dev/null
@@ -0,0 +1,19 @@
+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
diff --git a/src/mod/codecs/mod_h26x/Makefile b/src/mod/codecs/mod_h26x/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/codecs/mod_h26x/Makefile.am b/src/mod/codecs/mod_h26x/Makefile.am
new file mode 100644 (file)
index 0000000..93dd847
--- /dev/null
@@ -0,0 +1,8 @@
+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
diff --git a/src/mod/codecs/mod_ilbc/Makefile b/src/mod/codecs/mod_ilbc/Makefile
deleted file mode 100644 (file)
index 864cbf7..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-BASE=../../../..
-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
-
-$(ILBCLA): $(ILBC_DIR) $(ILBC_DIR)/.update
-       cd $(ILBC_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
diff --git a/src/mod/codecs/mod_ilbc/Makefile.am b/src/mod/codecs/mod_ilbc/Makefile.am
new file mode 100644 (file)
index 0000000..b2ddde3
--- /dev/null
@@ -0,0 +1,18 @@
+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
+
+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)
+       $(TOUCH_TARGET)
diff --git a/src/mod/codecs/mod_isac/Makefile b/src/mod/codecs/mod_isac/Makefile
deleted file mode 100644 (file)
index d89cf0c..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-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
-
diff --git a/src/mod/codecs/mod_isac/Makefile.am b/src/mod/codecs/mod_isac/Makefile.am
new file mode 100644 (file)
index 0000000..fc726f3
--- /dev/null
@@ -0,0 +1,17 @@
+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
diff --git a/src/mod/codecs/mod_mp4v/Makefile b/src/mod/codecs/mod_mp4v/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/codecs/mod_mp4v/Makefile.am b/src/mod/codecs/mod_mp4v/Makefile.am
new file mode 100644 (file)
index 0000000..59f9fa4
--- /dev/null
@@ -0,0 +1,8 @@
+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
similarity index 55%
rename from src/mod/codecs/mod_opus/Makefile
rename to src/mod/codecs/mod_opus/Makefile.am
index 39284c1f8e3ca2a3ef6662460c02f6ca0d27f25e..0ce58aa3474accbf2f9f93f2f6325c9f797f17b6 100644 (file)
@@ -1,18 +1,17 @@
-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)
 
diff --git a/src/mod/codecs/mod_sangoma_codec/Makefile b/src/mod/codecs/mod_sangoma_codec/Makefile
deleted file mode 100644 (file)
index 7d2f85e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-BASE=../../../..
-LOCAL_LDFLAGS += -lsngtc_node
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/codecs/mod_sangoma_codec/Makefile.am b/src/mod/codecs/mod_sangoma_codec/Makefile.am
new file mode 100644 (file)
index 0000000..eff90fe
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_sangoma_codec
+
+mod_LTLIBRARIES = mod_sangoma_codec.la
+mod_sangoma_codec_la_SOURCES  = mod_sangoma_codec.c
+mod_sangoma_codec_la_CFLAGS   = $(AM_CFLAGS)
+mod_sangoma_codec_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_sangoma_codec_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lsngtc_node
diff --git a/src/mod/codecs/mod_silk/Makefile b/src/mod/codecs/mod_silk/Makefile
deleted file mode 100644 (file)
index 23d7811..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-BASE=../../../..
-SILK_DIR=$(switch_srcdir)/libs/silk
-SILK_BUILDDIR=$(switch_builddir)/libs/silk
-LOCAL_CFLAGS=-I$(SILK_DIR)/src  -I$(SILK_DIR)/interface
-SILK_LA=$(SILK_BUILDDIR)/.libs/libSKP_SILK_SDK.la
-LOCAL_LIBADD=$(SILK_LA)
-LOCAL_OBJS=$(BASE)/libs/stfu/stfu.o
-include $(BASE)/build/modmake.rules
-
-$(SILK_LA): $(SILK_DIR)/.update        
-       cd $(SILK_BUILDDIR) && ./configure --disable-shared && make clean && $(MAKE)
-       $(TOUCH_TARGET)
diff --git a/src/mod/codecs/mod_silk/Makefile.am b/src/mod/codecs/mod_silk/Makefile.am
new file mode 100644 (file)
index 0000000..b73a8d1
--- /dev/null
@@ -0,0 +1,18 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_silk
+
+SILK_DIR=$(switch_srcdir)/libs/silk
+SILK_BUILDDIR=$(switch_builddir)/libs/silk
+SILK_LA=$(SILK_BUILDDIR)/.libs/libSKP_SILK_SDK.la
+
+mod_LTLIBRARIES = mod_silk.la
+mod_silk_la_SOURCES  = mod_silk.c $(switch_srcdir)/libs/stfu/stfu.c
+mod_silk_la_CFLAGS   = $(AM_CFLAGS) -I$(SILK_DIR)/src  -I$(SILK_DIR)/interface
+mod_silk_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SILK_LA)
+mod_silk_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+BUILT_SOURCES=$(SILK_LA)
+
+$(SILK_LA): $(SILK_DIR)/.update        
+       cd $(SILK_BUILDDIR) && ./configure --disable-shared && make clean && $(MAKE)
+       $(TOUCH_TARGET)
diff --git a/src/mod/codecs/mod_siren/Makefile b/src/mod/codecs/mod_siren/Makefile
deleted file mode 100644 (file)
index 5d1e5de..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-BASE=../../../..
-G722_1_DIR=$(switch_srcdir)/libs/libg722_1
-G722_1_BUILDDIR=$(switch_builddir)/libs/libg722_1
-LOCAL_CFLAGS=-I$(G722_1_DIR)/src  -I$(G722_1_BUILDDIR)/src
-G722_1_LA=$(G722_1_BUILDDIR)/src/.libs/libg722_1.la
-LOCAL_LIBADD=$(G722_1_LA)
-include $(BASE)/build/modmake.rules
-
-$(G722_1_LA): $(G722_1_DIR)/.update    
-       cd $(G722_1_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
diff --git a/src/mod/codecs/mod_siren/Makefile.am b/src/mod/codecs/mod_siren/Makefile.am
new file mode 100644 (file)
index 0000000..bc3fd2d
--- /dev/null
@@ -0,0 +1,16 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_siren
+G722_1_DIR=$(switch_srcdir)/libs/libg722_1
+G722_1_BUILDDIR=$(switch_builddir)/libs/libg722_1
+G722_1_LA=$(G722_1_BUILDDIR)/src/.libs/libg722_1.la
+mod_LTLIBRARIES = mod_siren.la
+mod_siren_la_SOURCES  = mod_siren.c
+mod_siren_la_CFLAGS   = $(AM_CFLAGS) -I$(G722_1_DIR)/src  -I$(G722_1_BUILDDIR)/src
+mod_siren_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(G722_1_LA)
+mod_siren_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+BUILT_SOURCES=$(G722_1_LA)
+
+$(G722_1_LA): $(G722_1_DIR)/.update    
+       cd $(G722_1_BUILDDIR) && $(MAKE)
+       $(TOUCH_TARGET)
diff --git a/src/mod/codecs/mod_skel_codec/Makefile.am b/src/mod/codecs/mod_skel_codec/Makefile.am
new file mode 100644 (file)
index 0000000..c39aad9
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_skel_codec
+
+mod_LTLIBRARIES = mod_skel_codec.la
+mod_skel_codec_la_SOURCES  = mod_skel_codec.c
+mod_skel_codec_la_CFLAGS   = $(AM_CFLAGS)
+mod_skel_codec_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_skel_codec_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/codecs/mod_theora/Makefile b/src/mod/codecs/mod_theora/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/codecs/mod_theora/Makefile.am b/src/mod/codecs/mod_theora/Makefile.am
new file mode 100644 (file)
index 0000000..1226a05
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_theora
+
+mod_LTLIBRARIES = mod_theora.la
+mod_theora_la_SOURCES  = mod_theora.c
+mod_theora_la_CFLAGS   = $(AM_CFLAGS)
+mod_theora_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_theora_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/codecs/mod_voipcodecs/Makefile b/src/mod/codecs/mod_voipcodecs/Makefile
deleted file mode 100644 (file)
index 113d5ab..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-BASE=../../../..
-
-TIFF_DIR=$(switch_srcdir)/libs/tiff-4.0.2
-TIFF_BUILDDIR=$(switch_builddir)/libs/tiff-4.0.2
-TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la
-
-SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
-SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
-SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
-
-LOCAL_CFLAGS=-I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff
-LOCAL_LIBADD=$(SPANDSP_LA)
-
-include $(BASE)/build/modmake.rules
-$(MODNAME).lo: $(SPANDSP_LA) $(TIFF_LA)
-
-$(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
-       cd $(SPANDSP_BUILDDIR) && $(MAKE) -j1
-       $(TOUCH_TARGET)
-
-$(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
-       cd $(TIFF_BUILDDIR) && $(MAKE) -j1
-       $(TOUCH_TARGET)
diff --git a/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj b/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj
deleted file mode 100644 (file)
index 94dab69..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9.00"\r
-       Name="mod_voipcodecs"\r
-       ProjectGUID="{42B6C2E3-7D5F-4204-A1F6-C0376B86C315}"\r
-       RootNamespace="mod_voipcodecs"\r
-       Keyword="Win32Proj"\r
-       TargetFrameworkVersion="131072"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-               <Platform\r
-                       Name="x64"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\spandsp\src\msvc&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src&quot;;&quot;$(InputDir)..\..\..\..\libs\tiff-4.0.2\libtiff&quot;"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|x64"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\spandsp\src\msvc&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src&quot;;&quot;$(InputDir)..\..\..\..\libs\tiff-4.0.2\libtiff&quot;"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\spandsp\src\msvc&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src&quot;;&quot;$(InputDir)..\..\..\..\libs\tiff-4.0.2\libtiff&quot;"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\spandsp\src\msvc&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src&quot;;&quot;$(InputDir)..\..\..\..\libs\tiff-4.0.2\libtiff&quot;"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <File\r
-                       RelativePath=".\mod_voipcodecs.c"\r
-                       >\r
-               </File>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c b/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c
deleted file mode 100644 (file)
index 48a8a14..0000000
+++ /dev/null
@@ -1,969 +0,0 @@
-/* 
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / G722 codec module
- *
- * The Initial Developer of the Original Code is
- * Brian K. West <brian@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Brian K. West <brian@freeswitch.org>
- * Anthony Minessale II <anthm@freeswitch.org>
- * Michael Jerris <mike@jerris.com>
- *
- * mod_voipcodecs.c -- VoIP Codecs (G.711, G.722, G.726, GSM-FR, IMA_ADPCM, LPC10)
- *
- * This module wouldn't be possible without generous contributions from Steve Underwood.  Thanks!
- *
- */
-
-#include <switch.h>
-#include "spandsp.h"
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_voipcodecs_load);
-SWITCH_MODULE_DEFINITION(mod_voipcodecs, mod_voipcodecs_load, NULL, NULL);
-
-/*  LPC10     - START */
-
-struct lpc10_context {
-       lpc10_encode_state_t *encoder_object;
-       lpc10_decode_state_t *decoder_object;
-};
-
-static switch_status_t switch_lpc10_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-       uint32_t encoding, decoding;
-       struct lpc10_context *context = NULL;
-
-       encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-       decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-       if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct lpc10_context))))) {
-               return SWITCH_STATUS_FALSE;
-       } else {
-
-               if (encoding) {
-                       context->encoder_object = lpc10_encode_init(context->encoder_object, TRUE);
-               }
-
-               if (decoding) {
-                       context->decoder_object = lpc10_decode_init(context->decoder_object, TRUE);
-               }
-
-               codec->private_info = context;
-
-               return SWITCH_STATUS_SUCCESS;
-       }
-}
-
-static switch_status_t switch_lpc10_destroy(switch_codec_t *codec)
-{
-       struct lpc10_context *context = codec->private_info;
-       codec->private_info = NULL;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if (context->encoder_object)
-               lpc10_encode_free(context->encoder_object);
-       context->encoder_object = NULL;
-       if (context->decoder_object)
-               lpc10_decode_free(context->decoder_object);
-       context->decoder_object = NULL;
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_lpc10_encode(switch_codec_t *codec,
-                                                                                  switch_codec_t *other_codec,
-                                                                                  void *decoded_data,
-                                                                                  uint32_t decoded_data_len,
-                                                                                  uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate,
-                                                                                  unsigned int *flag)
-{
-       struct lpc10_context *context = codec->private_info;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       *encoded_data_len = lpc10_encode(context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2);
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_lpc10_decode(switch_codec_t *codec,
-                                                                                  switch_codec_t *other_codec,
-                                                                                  void *encoded_data,
-                                                                                  uint32_t encoded_data_len,
-                                                                                  uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate,
-                                                                                  unsigned int *flag)
-{
-       struct lpc10_context *context = codec->private_info;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       *decoded_data_len = (2 * lpc10_decode(context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len));
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-/*  LPC10     - END */
-
-
-/*  GSM       - START */
-struct gsm_context {
-       gsm0610_state_t *decoder_object;
-       gsm0610_state_t *encoder_object;
-};
-
-static switch_status_t switch_gsm_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-       uint32_t encoding, decoding;
-       struct gsm_context *context = NULL;
-
-       encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-       decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-       if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) {
-               return SWITCH_STATUS_FALSE;
-       } else {
-               if (encoding) {
-                       context->encoder_object = gsm0610_init(context->encoder_object, GSM0610_PACKING_VOIP);
-               }
-               if (decoding) {
-                       context->decoder_object = gsm0610_init(context->decoder_object, GSM0610_PACKING_VOIP);
-               }
-
-               codec->private_info = context;
-               return SWITCH_STATUS_SUCCESS;
-       }
-}
-
-static switch_status_t switch_gsm_encode(switch_codec_t *codec,
-                                                                                switch_codec_t *other_codec,
-                                                                                void *decoded_data,
-                                                                                uint32_t decoded_data_len,
-                                                                                uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate,
-                                                                                unsigned int *flag)
-{
-       struct gsm_context *context = codec->private_info;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       *encoded_data_len = gsm0610_encode(context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2);
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_gsm_decode(switch_codec_t *codec,
-                                                                                switch_codec_t *other_codec,
-                                                                                void *encoded_data,
-                                                                                uint32_t encoded_data_len,
-                                                                                uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate,
-                                                                                unsigned int *flag)
-{
-       struct gsm_context *context = codec->private_info;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       *decoded_data_len = (2 * gsm0610_decode(context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len));
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_gsm_destroy(switch_codec_t *codec)
-{
-       struct gsm_context *context = codec->private_info;
-
-       codec->private_info = NULL;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if (context->decoder_object)
-               gsm0610_free(context->decoder_object);
-       context->decoder_object = NULL;
-       if (context->encoder_object)
-               gsm0610_free(context->encoder_object);
-       context->encoder_object = NULL;
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-/*  GSM       - END */
-
-#ifdef ENABLE_G711
-/*  G711      - START */
-static switch_status_t switch_g711u_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-       uint32_t encoding, decoding;
-
-       encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-       decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-       if (!(encoding || decoding)) {
-               return SWITCH_STATUS_FALSE;
-       } else {
-               return SWITCH_STATUS_SUCCESS;
-       }
-}
-
-static switch_status_t switch_g711u_encode(switch_codec_t *codec,
-                                                                                  switch_codec_t *other_codec,
-                                                                                  void *decoded_data,
-                                                                                  uint32_t decoded_data_len,
-                                                                                  uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate,
-                                                                                  unsigned int *flag)
-{
-       short *dbuf;
-       unsigned char *ebuf;
-       uint32_t i;
-
-       dbuf = decoded_data;
-       ebuf = encoded_data;
-
-       for (i = 0; i < decoded_data_len / sizeof(short); i++) {
-               ebuf[i] = linear_to_ulaw(dbuf[i]);
-       }
-
-       *encoded_data_len = i;
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_g711u_decode(switch_codec_t *codec,
-                                                                                  switch_codec_t *other_codec,
-                                                                                  void *encoded_data,
-                                                                                  uint32_t encoded_data_len,
-                                                                                  uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate,
-                                                                                  unsigned int *flag)
-{
-       short *dbuf;
-       unsigned char *ebuf;
-       uint32_t i;
-
-       dbuf = decoded_data;
-       ebuf = encoded_data;
-
-       if (*flag & SWITCH_CODEC_FLAG_SILENCE) {
-               memset(dbuf, 0, codec->implementation->decoded_bytes_per_packet);
-               *decoded_data_len = codec->implementation->decoded_bytes_per_packet;
-       } else {
-               for (i = 0; i < encoded_data_len; i++) {
-                       dbuf[i] = ulaw_to_linear(ebuf[i]);
-               }
-
-               *decoded_data_len = i * 2;
-       }
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_g711u_destroy(switch_codec_t *codec)
-{
-       return SWITCH_STATUS_SUCCESS;
-}
-
-
-static switch_status_t switch_g711a_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-       uint32_t encoding, decoding;
-
-       encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-       decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-       if (!(encoding || decoding)) {
-               return SWITCH_STATUS_FALSE;
-       } else {
-               return SWITCH_STATUS_SUCCESS;
-       }
-}
-
-static switch_status_t switch_g711a_encode(switch_codec_t *codec,
-                                                                                  switch_codec_t *other_codec,
-                                                                                  void *decoded_data,
-                                                                                  uint32_t decoded_data_len,
-                                                                                  uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate,
-                                                                                  unsigned int *flag)
-{
-       short *dbuf;
-       unsigned char *ebuf;
-       uint32_t i;
-
-       dbuf = decoded_data;
-       ebuf = encoded_data;
-
-       for (i = 0; i < decoded_data_len / sizeof(short); i++) {
-               ebuf[i] = linear_to_alaw(dbuf[i]);
-       }
-
-       *encoded_data_len = i;
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_g711a_decode(switch_codec_t *codec,
-                                                                                  switch_codec_t *other_codec,
-                                                                                  void *encoded_data,
-                                                                                  uint32_t encoded_data_len,
-                                                                                  uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate,
-                                                                                  unsigned int *flag)
-{
-       short *dbuf;
-       unsigned char *ebuf;
-       uint32_t i;
-
-       dbuf = decoded_data;
-       ebuf = encoded_data;
-
-       if (*flag & SWITCH_CODEC_FLAG_SILENCE) {
-               memset(dbuf, 0, codec->implementation->decoded_bytes_per_packet);
-               *decoded_data_len = codec->implementation->decoded_bytes_per_packet;
-       } else {
-               for (i = 0; i < encoded_data_len; i++) {
-                       dbuf[i] = alaw_to_linear(ebuf[i]);
-               }
-
-               *decoded_data_len = i * 2;
-       }
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_g711a_destroy(switch_codec_t *codec)
-{
-       return SWITCH_STATUS_SUCCESS;
-}
-
-/*  G711      - END */
-#endif
-
-
-/*  G722      - START */
-
-struct g722_context {
-       g722_decode_state_t *decoder_object;
-       g722_encode_state_t *encoder_object;
-};
-
-static switch_status_t switch_g722_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-       uint32_t encoding, decoding;
-       struct g722_context *context = NULL;
-
-       encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-       decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-       if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct g722_context))))) {
-               return SWITCH_STATUS_FALSE;
-       } else {
-               if (encoding) {
-                       context->encoder_object = g722_encode_init(context->encoder_object, 64000, G722_PACKED);
-               }
-               if (decoding) {
-                       context->decoder_object = g722_decode_init(context->decoder_object, 64000, G722_PACKED);
-               }
-       }
-
-       codec->private_info = context;
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_g722_encode(switch_codec_t *codec,
-                                                                                 switch_codec_t *other_codec,
-                                                                                 void *decoded_data,
-                                                                                 uint32_t decoded_data_len,
-                                                                                 uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate,
-                                                                                 unsigned int *flag)
-{
-       struct g722_context *context = codec->private_info;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       *encoded_data_len = g722_encode(context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2);
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_g722_decode(switch_codec_t *codec,
-                                                                                 switch_codec_t *other_codec,
-                                                                                 void *encoded_data,
-                                                                                 uint32_t encoded_data_len,
-                                                                                 uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate,
-                                                                                 unsigned int *flag)
-{
-       struct g722_context *context = codec->private_info;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       *decoded_data_len = (2 * g722_decode(context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len));
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_g722_destroy(switch_codec_t *codec)
-{
-       struct g722_context *context = codec->private_info;
-
-       codec->private_info = NULL;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if (context->decoder_object)
-               g722_decode_free(context->decoder_object);
-       context->decoder_object = NULL;
-       if (context->encoder_object)
-               g722_encode_free(context->encoder_object);
-       context->encoder_object = NULL;
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-/*  G722      - END */
-
-/*  G726      - START */
-
-static switch_status_t switch_g726_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-       uint32_t encoding, decoding;
-       int packing = G726_PACKING_RIGHT;
-       g726_state_t *context = NULL;
-
-       encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-       decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-       if (!(encoding || decoding)) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if ((flags & SWITCH_CODEC_FLAG_AAL2 || strstr(codec->implementation->iananame, "AAL2"))) {
-               packing = G726_PACKING_LEFT;
-       }
-
-       context = g726_init(context, codec->implementation->bits_per_second, G726_ENCODING_LINEAR, packing);
-
-       codec->private_info = context;
-       return SWITCH_STATUS_SUCCESS;
-
-}
-
-static switch_status_t switch_g726_destroy(switch_codec_t *codec)
-{
-       g726_state_t *context = codec->private_info;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       g726_free(context);
-
-       codec->private_info = NULL;
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_g726_encode(switch_codec_t *codec,
-                                                                                 switch_codec_t *other_codec,
-                                                                                 void *decoded_data,
-                                                                                 uint32_t decoded_data_len,
-                                                                                 uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate,
-                                                                                 unsigned int *flag)
-{
-       g726_state_t *context = codec->private_info;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       *encoded_data_len = g726_encode(context, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2);
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_g726_decode(switch_codec_t *codec,
-                                                                                 switch_codec_t *other_codec,
-                                                                                 void *encoded_data,
-                                                                                 uint32_t encoded_data_len,
-                                                                                 uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate,
-                                                                                 unsigned int *flag)
-{
-       g726_state_t *context = codec->private_info;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       *decoded_data_len = (2 * g726_decode(context, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len));
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-/*  G726      - START */
-
-/*  IMA_ADPCM - START */
-
-struct ima_adpcm_context {
-       ima_adpcm_state_t *decoder_object;
-       ima_adpcm_state_t *encoder_object;
-};
-
-static switch_status_t switch_adpcm_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
-{
-       uint32_t encoding, decoding;
-       struct ima_adpcm_context *context = NULL;
-
-       encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
-       decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
-
-       if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) {
-               return SWITCH_STATUS_FALSE;
-       } else {
-               if (encoding) {
-                       context->encoder_object = ima_adpcm_init(context->encoder_object, IMA_ADPCM_DVI4, 0);
-               }
-               if (decoding) {
-                       context->decoder_object = ima_adpcm_init(context->decoder_object, IMA_ADPCM_DVI4, 0);
-               }
-
-               codec->private_info = context;
-               return SWITCH_STATUS_SUCCESS;
-       }
-}
-
-static switch_status_t switch_adpcm_encode(switch_codec_t *codec,
-                                                                                  switch_codec_t *other_codec,
-                                                                                  void *decoded_data,
-                                                                                  uint32_t decoded_data_len,
-                                                                                  uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate,
-                                                                                  unsigned int *flag)
-{
-       struct ima_adpcm_context *context = codec->private_info;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       *encoded_data_len = ima_adpcm_encode(context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2);
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_adpcm_decode(switch_codec_t *codec,
-                                                                                  switch_codec_t *other_codec,
-                                                                                  void *encoded_data,
-                                                                                  uint32_t encoded_data_len,
-                                                                                  uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate,
-                                                                                  unsigned int *flag)
-{
-       struct ima_adpcm_context *context = codec->private_info;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       *decoded_data_len = (2 * ima_adpcm_decode(context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len));
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t switch_adpcm_destroy(switch_codec_t *codec)
-{
-       struct ima_adpcm_context *context = codec->private_info;
-
-       codec->private_info = NULL;
-
-       if (!context) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if (context->decoder_object)
-               ima_adpcm_free(context->decoder_object);
-       context->decoder_object = NULL;
-       if (context->encoder_object)
-               ima_adpcm_free(context->encoder_object);
-       context->encoder_object = NULL;
-
-       return SWITCH_STATUS_SUCCESS;
-}
-
-/*  IMA_ADPCM - END */
-
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_voipcodecs_load)
-{
-       switch_codec_interface_t *codec_interface;
-       int mpf, spf, bpf, ebpf, count;
-
-       /* connect my internal structure to the blank pointer passed to me */
-       *module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
-       /* IMA_ADPCM */
-       mpf = 10000, spf = 80, bpf = 160, ebpf = 80;
-       SWITCH_ADD_CODEC(codec_interface, "ADPCM (IMA)");
-       for (count = 12; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        5,     /* the IANA code number */
-                                                                                        "DVI4",        /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        8000,  /* actual samples transferred per second */
-                                                                                        32000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        (ebpf * count) + 4,    /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        spf * count,   /* number of frames per network packet */
-                                                                                        switch_adpcm_init,     /* function to initialize a codec handle using this implementation */
-                                                                                        switch_adpcm_encode,   /* function to encode raw data into encoded data */
-                                                                                        switch_adpcm_decode,   /* function to decode encoded data into raw data */
-                                                                                        switch_adpcm_destroy); /* deinitalize a codec handle using this implementation */
-       }
-       mpf = 10000, spf = 160, bpf = 320, ebpf = 160;
-       for (count = 6; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        6,     /* the IANA code number */
-                                                                                        "DVI4",        /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        16000, /* samples transferred per second */
-                                                                                        16000, /* actual samples transferred per second */
-                                                                                        64000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        (ebpf * count) + 4,    /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        spf * count,   /* number of frames per network packet */
-                                                                                        switch_adpcm_init,     /* function to initialize a codec handle using this implementation */
-                                                                                        switch_adpcm_encode,   /* function to encode raw data into encoded data */
-                                                                                        switch_adpcm_decode,   /* function to decode encoded data into raw data */
-                                                                                        switch_adpcm_destroy); /* deinitalize a codec handle using this implementation */
-       }
-
-       /* G726 */
-       mpf = 10000, spf = 80, bpf = 160, ebpf = 20;
-       SWITCH_ADD_CODEC(codec_interface, "G.726 16k (AAL2)");
-       for (count = 12; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        124,   /* the IANA code number */
-                                                                                        "AAL2-G726-16",        /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        8000,  /* actual samples transferred per second */
-                                                                                        16000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        ebpf * count,  /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        count * 10,    /* number of frames per network packet */
-                                                                                        switch_g726_init,      /* function to initialize a codec handle using this implementation */
-                                                                                        switch_g726_encode,    /* function to encode raw data into encoded data */
-                                                                                        switch_g726_decode,    /* function to decode encoded data into raw data */
-                                                                                        switch_g726_destroy);  /* deinitalize a codec handle using this implementation */
-       }
-       SWITCH_ADD_CODEC(codec_interface, "G.726 16k");
-       for (count = 12; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        124,   /* the IANA code number */
-                                                                                        "G726-16",     /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        8000,  /* actual samples transferred per second */
-                                                                                        16000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        ebpf * count,  /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        count * 10,    /* number of frames per network packet */
-                                                                                        switch_g726_init,      /* function to initialize a codec handle using this implementation */
-                                                                                        switch_g726_encode,    /* function to encode raw data into encoded data */
-                                                                                        switch_g726_decode,    /* function to decode encoded data into raw data */
-                                                                                        switch_g726_destroy);  /* deinitalize a codec handle using this implementation */
-       }
-       /* Increase encoded bytes per frame by 10 */
-       ebpf = ebpf + 10;
-
-       SWITCH_ADD_CODEC(codec_interface, "G.726 24k (AAL2)");
-       for (count = 12; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        123,   /* the IANA code number */
-                                                                                        "AAL2-G726-24",        /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        8000,  /* actual samples transferred per second */
-                                                                                        24000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        ebpf * count,  /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        count * 10,    /* number of frames per network packet */
-                                                                                        switch_g726_init,      /* function to initialize a codec handle using this implementation */
-                                                                                        switch_g726_encode,    /* function to encode raw data into encoded data */
-                                                                                        switch_g726_decode,    /* function to decode encoded data into raw data */
-                                                                                        switch_g726_destroy);  /* deinitalize a codec handle using this implementation */
-       }
-
-       SWITCH_ADD_CODEC(codec_interface, "G.726 24k");
-       for (count = 12; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        123,   /* the IANA code number */
-                                                                                        "G726-24",     /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        8000,  /* actual samples transferred per second */
-                                                                                        24000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        ebpf * count,  /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        count * 10,    /* number of frames per network packet */
-                                                                                        switch_g726_init,      /* function to initialize a codec handle using this implementation */
-                                                                                        switch_g726_encode,    /* function to encode raw data into encoded data */
-                                                                                        switch_g726_decode,    /* function to decode encoded data into raw data */
-                                                                                        switch_g726_destroy);  /* deinitalize a codec handle using this implementation */
-       }
-       /* Increase encoded bytes per frame by 10 */
-       ebpf = ebpf + 10;
-
-       SWITCH_ADD_CODEC(codec_interface, "G.726 32k (AAL2)");
-       for (count = 12; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        122,   /* the IANA code number */
-                                                                                        "AAL2-G726-32",        /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        8000,  /* actual samples transferred per second */
-                                                                                        32000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        ebpf * count,  /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        count * 10,    /* number of frames per network packet */
-                                                                                        switch_g726_init,      /* function to initialize a codec handle using this implementation */
-                                                                                        switch_g726_encode,    /* function to encode raw data into encoded data */
-                                                                                        switch_g726_decode,    /* function to decode encoded data into raw data */
-                                                                                        switch_g726_destroy);  /* deinitalize a codec handle using this implementation */
-       }
-       SWITCH_ADD_CODEC(codec_interface, "G.726 32k");
-       for (count = 12; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        122,   /* the IANA code number */
-                                                                                        "G726-32",     /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        8000,  /* actual samples transferred per second */
-                                                                                        32000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        ebpf * count,  /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        count * 10,    /* number of frames per network packet */
-                                                                                        switch_g726_init,      /* function to initialize a codec handle using this implementation */
-                                                                                        switch_g726_encode,    /* function to encode raw data into encoded data */
-                                                                                        switch_g726_decode,    /* function to decode encoded data into raw data */
-                                                                                        switch_g726_destroy);  /* deinitalize a codec handle using this implementation */
-       }
-       /* Increase encoded bytes per frame by 10 */
-       ebpf = ebpf + 10;
-
-       SWITCH_ADD_CODEC(codec_interface, "G.726 40k (AAL2)");
-       for (count = 12; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        121,   /* the IANA code number */
-                                                                                        "AAL2-G726-40",        /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        8000,  /* actual samples transferred per second */
-                                                                                        40000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        ebpf * count,  /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        count * 10,    /* number of frames per network packet */
-                                                                                        switch_g726_init,      /* function to initialize a codec handle using this implementation */
-                                                                                        switch_g726_encode,    /* function to encode raw data into encoded data */
-                                                                                        switch_g726_decode,    /* function to decode encoded data into raw data */
-                                                                                        switch_g726_destroy);  /* deinitalize a codec handle using this implementation */
-       }
-       SWITCH_ADD_CODEC(codec_interface, "G.726 40k");
-       for (count = 12; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        121,   /* the IANA code number */
-                                                                                        "G726-40",     /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        8000,  /* actual samples transferred per second */
-                                                                                        40000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        ebpf * count,  /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        count * 10,    /* number of frames per network packet */
-                                                                                        switch_g726_init,      /* function to initialize a codec handle using this implementation */
-                                                                                        switch_g726_encode,    /* function to encode raw data into encoded data */
-                                                                                        switch_g726_decode,    /* function to decode encoded data into raw data */
-                                                                                        switch_g726_destroy);  /* deinitalize a codec handle using this implementation */
-       }
-       /* G722 */
-       mpf = 10000, spf = 80, bpf = 320, ebpf = 80;
-       SWITCH_ADD_CODEC(codec_interface, "G.722");
-       for (count = 6; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        9,     /* the IANA code number */
-                                                                                        "G722",        /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        16000, /* actual samples transferred per second */
-                                                                                        64000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        ebpf * count,  /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        spf * count,   /* number of frames per network packet */
-                                                                                        switch_g722_init,      /* function to initialize a codec handle using this implementation */
-                                                                                        switch_g722_encode,    /* function to encode raw data into encoded data */
-                                                                                        switch_g722_decode,    /* function to decode encoded data into raw data */
-                                                                                        switch_g722_destroy);  /* deinitalize a codec handle using this implementation */
-       }
-
-#ifdef ENABLE_G711
-       /* G711 */
-       mpf = 10000, spf = 80, bpf = 160, ebpf = 80;
-       SWITCH_ADD_CODEC(codec_interface, "G.711 ulaw");
-       for (count = 12; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        0,     /* the IANA code number */
-                                                                                        "PCMU",        /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        8000,  /* actual samples transferred per second */
-                                                                                        64000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        ebpf * count,  /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        spf * count,   /* number of frames per network packet */
-                                                                                        switch_g711u_init,     /* function to initialize a codec handle using this implementation */
-                                                                                        switch_g711u_encode,   /* function to encode raw data into encoded data */
-                                                                                        switch_g711u_decode,   /* function to decode encoded data into raw data */
-                                                                                        switch_g711u_destroy); /* deinitalize a codec handle using this implementation */
-       }
-
-       SWITCH_ADD_CODEC(codec_interface, "G.711 alaw");
-       for (count = 12; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        8,     /* the IANA code number */
-                                                                                        "PCMA",        /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        8000,  /* actual samples transferred per second */
-                                                                                        64000, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        ebpf * count,  /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        spf * count,   /* number of frames per network packet */
-                                                                                        switch_g711a_init,     /* function to initialize a codec handle using this implementation */
-                                                                                        switch_g711a_encode,   /* function to encode raw data into encoded data */
-                                                                                        switch_g711a_decode,   /* function to decode encoded data into raw data */
-                                                                                        switch_g711a_destroy); /* deinitalize a codec handle using this implementation */
-       }
-#endif
-
-       /* GSM */
-       mpf = 20000, spf = 160, bpf = 320, ebpf = 33;
-       SWITCH_ADD_CODEC(codec_interface, "GSM");
-       for (count = 6; count > 0; count--) {
-               switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                        3,     /* the IANA code number */
-                                                                                        "GSM", /* the IANA code name */
-                                                                                        NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                        8000,  /* samples transferred per second */
-                                                                                        8000,  /* actual samples transferred per second */
-                                                                                        13200, /* bits transferred per second */
-                                                                                        mpf * count,   /* number of microseconds per frame */
-                                                                                        spf * count,   /* number of samples per frame */
-                                                                                        bpf * count,   /* number of bytes per frame decompressed */
-                                                                                        ebpf * count,  /* number of bytes per frame compressed */
-                                                                                        1,     /* number of channels represented */
-                                                                                        count, /* number of frames per network packet */
-                                                                                        switch_gsm_init,       /* function to initialize a codec handle using this implementation */
-                                                                                        switch_gsm_encode,     /* function to encode raw data into encoded data */
-                                                                                        switch_gsm_decode,     /* function to decode encoded data into raw data */
-                                                                                        switch_gsm_destroy);   /* deinitalize a codec handle using this implementation */
-       }
-       /* LPC10 */
-#if SWITCH_MAX_INTERVAL >= 90
-       SWITCH_ADD_CODEC(codec_interface, "LPC-10");
-       switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO,    /* enumeration defining the type of the codec */
-                                                                                7,     /* the IANA code number */
-                                                                                "LPC", /* the IANA code name */
-                                                                                NULL,  /* default fmtp to send (can be overridden by the init function) */
-                                                                                8000,  /* samples transferred per second */
-                                                                                8000,  /* actual samples transferred per second */
-                                                                                2400,  /* bits transferred per second */
-                                                                                90000, /* number of microseconds per frame */
-                                                                                720,   /* number of samples per frame */
-                                                                                1440,  /* number of bytes per frame decompressed */
-                                                                                28,    /* number of bytes per frame compressed */
-                                                                                1,     /* number of channels represented */
-                                                                                4,     /* number of frames per network packet */
-                                                                                switch_lpc10_init,     /* function to initialize a codec handle using this implementation */
-                                                                                switch_lpc10_encode,   /* function to encode raw data into encoded data */
-                                                                                switch_lpc10_decode,   /* function to decode encoded data into raw data */
-                                                                                switch_lpc10_destroy); /* deinitalize a codec handle using this implementation */
-#endif
-       /* indicate that the module should continue to be loaded */
-       return SWITCH_STATUS_SUCCESS;
-}
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
diff --git a/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj b/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj
deleted file mode 100644 (file)
index ac524dc..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="mod_voipcodecs"\r
-       ProjectGUID="{9EED03C8-8315-4214-8D13-8FF5FA46D93C}"\r
-       RootNamespace="mod_voipcodecs"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\spandsp\src\msvc&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src&quot;;&quot;$(InputDir)..\..\..\..\libs\tiff-4.0.2\libtiff&quot;"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       ConfigurationType="2"\r
-                       InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\spandsp\src\msvc&quot;;&quot;$(InputDir)..\..\..\..\libs\spandsp\src&quot;;&quot;$(InputDir)..\..\..\..\libs\tiff-4.0.2\libtiff&quot;"\r
-                               UsePrecompiledHeader="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <File\r
-                       RelativePath=".\mod_voipcodecs.c"\r
-                       >\r
-               </File>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/src/mod/codecs/mod_vp8/Makefile.am b/src/mod/codecs/mod_vp8/Makefile.am
new file mode 100644 (file)
index 0000000..bd0bd7a
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_vp8
+
+mod_LTLIBRARIES = mod_vp8.la
+mod_vp8_la_SOURCES  = mod_vp8.c
+mod_vp8_la_CFLAGS   = $(AM_CFLAGS)
+mod_vp8_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_vp8_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/dialplans/mod_dialplan_asterisk/Makefile.am b/src/mod/dialplans/mod_dialplan_asterisk/Makefile.am
new file mode 100644 (file)
index 0000000..ef956d7
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_dialplan_asterisk
+
+mod_LTLIBRARIES = mod_dialplan_asterisk.la
+mod_dialplan_asterisk_la_SOURCES  = mod_dialplan_asterisk.c
+mod_dialplan_asterisk_la_CFLAGS   = $(AM_CFLAGS)
+mod_dialplan_asterisk_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_dialplan_asterisk_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/dialplans/mod_dialplan_directory/Makefile.am b/src/mod/dialplans/mod_dialplan_directory/Makefile.am
new file mode 100644 (file)
index 0000000..3498d1d
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_dialplan_directory
+
+mod_LTLIBRARIES = mod_dialplan_directory.la
+mod_dialplan_directory_la_SOURCES  = mod_dialplan_directory.c
+mod_dialplan_directory_la_CFLAGS   = $(AM_CFLAGS)
+mod_dialplan_directory_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_dialplan_directory_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/dialplans/mod_dialplan_xml/Makefile.am b/src/mod/dialplans/mod_dialplan_xml/Makefile.am
new file mode 100644 (file)
index 0000000..de46ce6
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_dialplan_xml
+
+mod_LTLIBRARIES = mod_dialplan_xml.la
+mod_dialplan_xml_la_SOURCES  = mod_dialplan_xml.c
+mod_dialplan_xml_la_CFLAGS   = $(AM_CFLAGS)
+mod_dialplan_xml_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_dialplan_xml_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
similarity index 54%
rename from src/mod/directories/mod_ldap/Makefile
rename to src/mod/directories/mod_ldap/Makefile.am
index 237f199f998384476a9c58c0a92c41793cea47e8..399cac5c9c37074876511c1115598a0b2ff90bfe 100644 (file)
@@ -1,20 +1,20 @@
-BASE=../../../..
-
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_ldap
 LDAP=openldap-2.4.19
 LDAP_DIR=$(switch_srcdir)/libs/$(LDAP)
 LDAP_BUILDDIR=$(switch_builddir)/libs/$(LDAP)
-
 LDAPLA=$(LDAP_BUILDDIR)/libraries/libldap_r/libldap_r.la
 LIBLBERLA=$(LDAP_BUILDDIR)/libraries/liblber/liblber.la
 
+mod_LTLIBRARIES = mod_ldap.la
+mod_ldap_la_SOURCES  = mod_ldap.c
+mod_ldap_la_CFLAGS   = $(AM_CFLAGS) -DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
+mod_ldap_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LDAPLA) $(LIBLBERLA)
+mod_ldap_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
-
-LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA)
-
-include $(BASE)/build/modmake.rules
+DEFAULT_ARGS= --disable-slapd --disable-bdb --disable-hdb
 
-DEFAULT_ARGS+= --disable-slapd --disable-bdb --disable-hdb
+$(MODNAME).lo: $(LDAPLA) $(LIBLBERLA)
 
 $(LDAP_DIR):
        $(GETLIB) $(LDAP).tar.gz
diff --git a/src/mod/endpoints/mod_alsa/Makefile b/src/mod/endpoints/mod_alsa/Makefile
deleted file mode 100644 (file)
index b57f550..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-BASE=../../../..
-
-LOCAL_CFLAGS=-I. -I$(PA_DIR)/include -D__EXTENSION__=1
-LOCAL_LDFLAGS=-lasound
-
-include $(BASE)/build/modmake.rules
-
-
diff --git a/src/mod/endpoints/mod_alsa/Makefile.am b/src/mod/endpoints/mod_alsa/Makefile.am
new file mode 100644 (file)
index 0000000..82e8a67
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_alsa
+
+mod_LTLIBRARIES = mod_alsa.la
+mod_alsa_la_SOURCES  = mod_alsa.c
+mod_alsa_la_CFLAGS   = $(AM_CFLAGS) -I. -D__EXTENSION__=1
+mod_alsa_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_alsa_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lasound 
diff --git a/src/mod/endpoints/mod_dingaling/Makefile b/src/mod/endpoints/mod_dingaling/Makefile
deleted file mode 100644 (file)
index c56dc22..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-BASE=../../../..
-
-LOCAL_CFLAGS     = `$(BASE)/libs/apr/apr-1-config --cflags --cppflags --includes`
-LOCAL_CFLAGS    += `$(BASE)/libs/apr-util/apu-1-config --includes`
-#LOCAL_CFLAGS += -w
-
-IKS_DIR=$(BASE)/libs/iksemel
-IKS_LA=$(IKS_DIR)/src/libiksemel.la
-DING_DIR=$(BASE)/libs/libdingaling
-LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include
-LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA)
-LOCAL_SOURCES=$(DING_DIR)/src/libdingaling.c $(DING_DIR)/src/sha1.c $(DING_DIR)/src/libdingaling.h
-LOCAL_LDFLAGS=$(LIBGNUTLS_LIBS)
-include $(BASE)/build/modmake.rules
-
-
-$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update
-       @cd $(IKS_DIR) && $(MAKE)
-       @$(TOUCH_TARGET)
-
-
-
-
diff --git a/src/mod/endpoints/mod_dingaling/Makefile.am b/src/mod/endpoints/mod_dingaling/Makefile.am
new file mode 100644 (file)
index 0000000..32dc19d
--- /dev/null
@@ -0,0 +1,21 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_dingaling
+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
+
+mod_LTLIBRARIES = mod_dingaling.la
+mod_dingaling_la_SOURCES  = mod_dingaling.c $(DING_DIR)/src/libdingaling.c $(DING_DIR)/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_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)
+       @$(TOUCH_TARGET)
diff --git a/src/mod/endpoints/mod_h323/Makefile b/src/mod/endpoints/mod_h323/Makefile
deleted file mode 100644 (file)
index 57668ee..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-BASE=../../../..
-
-export PTLIBDIR = $(shell /usr/bin/ptlib-config --ptlibdir)
-LOCAL_CFLAGS+=-g -I$PTLIBDIR -I/usr/include/openh323  -I. -DPTRACING=1 -D_REENTRANT -fno-exceptions
-LOCAL_LDFLAGS= -L/usr/lib -lopenh323 -lpt -lrt 
-
-ifeq ($(shell uname -m),x86_64)
-LOCAL_CFLAGS+=-DP_64BIT
-endif
-
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/endpoints/mod_h323/Makefile.am b/src/mod/endpoints/mod_h323/Makefile.am
new file mode 100644 (file)
index 0000000..f0cd535
--- /dev/null
@@ -0,0 +1,14 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_h323
+
+PTLIBDIR = `/usr/bin/ptlib-config --ptlibdir`
+
+mod_LTLIBRARIES = mod_h323.la
+mod_h323_la_SOURCES  = mod_h323.c
+mod_h323_la_CFLAGS   = $(AM_CFLAGS) -I$(PTLIBDIR) -I/usr/include/openh323  -I. -DPTRACING=1 -D_REENTRANT -fno-exceptions
+mod_h323_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_h323_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -L/usr/lib -lopenh323 -lpt -lrt 
+
+if IS64BITLINUX
+mod_h323_la_CFLAGS += -DP_64BIT
+endif
diff --git a/src/mod/endpoints/mod_khomp/Makefile b/src/mod/endpoints/mod_khomp/Makefile
deleted file mode 100644 (file)
index db1a6fe..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-MODNAME := mod_khomp
-VERBOSE := 1
-
-#FreeSWITCH source PATH is needed: 
-# Set FREESWITCH_PATH
-
-ifeq ($(strip $(FREESWITCH_PATH)),)
-       BASE := ../../../../
-else
-       BASE := $(FREESWITCH_PATH)
-endif
-
-curr_dir := $(shell pwd)
-
-versions := -DFS_VERSION_MAJOR=$(shell bash $(curr_dir)/tools/getversion.sh "SWITCH_VERSION_MAJOR" $(BASE)) -DFS_VERSION_MINOR=$(shell bash $(curr_dir)/tools/getversion.sh "SWITCH_VERSION_MINOR" $(BASE)) -DFS_VERSION_MICRO=$(shell bash $(curr_dir)/tools/getversion.sh "SWITCH_VERSION_MICRO" $(BASE))
-
-LOCAL_CFLAGS = -I./ -I./include -I./commons -I./commons/base -I./support -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DCOMMONS_LIBRARY_USING_FREESWITCH -g -ggdb #-DDEBUG_FLAGS
-LOCAL_CFLAGS += $(versions)
-
-LOCAL_LDFLAGS = -lk3l
-
-LOCAL_OBJS = ./commons/base/k3lapi.o ./commons/base/k3lutil.o ./commons/base/config_options.o ./commons/base/format.o ./commons/base/strings.o ./commons/base/ringbuffer.o ./commons/base/verbose.o ./commons/base/saved_condition.o ./commons/base/regex.o ./commons/base/timer.o ./commons/base/configurator/configfile.o ./commons/base/configurator/option.o ./commons/base/configurator/section.o ./commons/base/configurator/restriction.o ./commons/base/verbose_traits.o 
-LOCAL_OBJS += ./support/klog-config.o ./support/klog-options.o ./support/config_defaults.o
-LOCAL_OBJS += ./src/globals.o ./src/opt.o ./src/frame.o ./src/utils.o ./src/lock.o ./src/spec.o ./src/applications.o ./src/khomp_pvt_fxo.o ./src/khomp_pvt_gsm.o ./src/khomp_pvt_kxe1.o ./src/khomp_pvt_passive.o ./src/khomp_pvt.o ./src/logger.o ./src/cli.o
-
-conf_file_name := khomp.conf.xml
-conf_file_dir := $(curr_dir)/Install/files
-conf_file_dir_alt := $(curr_dir)/conf
-conf_file_install = $(sysconfdir)/autoload_configs
-
-include $(BASE)/build/modmake.rules
-
-local_depend:
-       @if test ! -f $(curr_dir)/commons/base/verbose_traits.hpp || test ! -f $(curr_dir)/commons/base/verbose_traits.cpp ; then \
-               echo "Generating verbose_traits" ;\
-               bash $(curr_dir)/commons/tools/generate-verbose-headers.sh commons/base/ include/k3l.h ;\
-       fi;
-
-depend_install:
-       @if test "w`kserver --version 2>/dev/null | grep 2.1`" == "w" ; then \
-               echo "###############################################################################" ;\
-               echo "Install k3l from KHOMP." ;\
-               echo "Run: $(curr_dir)/tools/getk3l.sh" ;\
-               echo "###############################################################################" ;\
-               exit 1;\
-       fi;
-       @echo "Copy $(conf_file_name)"
-       @if test -d  $(conf_file_install) ; then \
-               if test -f $(conf_file_dir)/$(conf_file_name) ; then \
-                       cp $(conf_file_dir)/$(conf_file_name) $(conf_file_install)/$(conf_file_name).new ;\
-               else \
-                       cp $(conf_file_dir_alt)/$(conf_file_name) $(conf_file_install)/$(conf_file_name).new ;\
-               fi; \
-               if test ! -f "$(conf_file_install)/$(conf_file_name)" ; then \
-                       mv $(conf_file_install)/$(conf_file_name).new $(conf_file_install)/$(conf_file_name) ;\
-               fi; \
-       fi;
diff --git a/src/mod/endpoints/mod_khomp/Makefile.am b/src/mod/endpoints/mod_khomp/Makefile.am
new file mode 100644 (file)
index 0000000..c3f56dc
--- /dev/null
@@ -0,0 +1,50 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_khomp
+mod_LTLIBRARIES = mod_khomp.la
+mod_khomp_la_SOURCES  = mod_khomp.c
+mod_khomp_la_CFLAGS   = $(AM_CFLAGS)
+mod_khomp_la_CFLAGS  += -I./ -I./include -I./commons -I./commons/base -I./support 
+mod_khomp_la_CFLAGS  += -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DCOMMONS_LIBRARY_USING_FREESWITCH
+mod_khomp_la_CFLAGS  += -DFS_VERSION_MAJOR=`./tools/getversion.sh "SWITCH_VERSION_MAJOR" $(switch_srcdir)`
+mod_khomp_la_CFLAGS  += -DFS_VERSION_MINOR=`./tools/getversion.sh "SWITCH_VERSION_MINOR" $(switch_srcdir)`
+mod_khomp_la_CFLAGS  += -DFS_VERSION_MICRO=`./tools/getversion.sh "SWITCH_VERSION_MICRO" $(switch_srcdir)` 
+mod_khomp_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_khomp_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lk3l
+
+
+mod_khomp_la_SOURCES += ./commons/base/k3lapi.cpp ./commons/base/k3lutil.cpp ./commons/base/config_options.cpp ./commons/base/format.cpp ./commons/base/strings.cpp ./commons/base/ringbuffer.cpp ./commons/base/verbose.cpp ./commons/base/saved_condition.cpp ./commons/base/regex.cpp ./commons/base/timer.cpp ./commons/base/configurator/configfile.cpp ./commons/base/configurator/option.cpp ./commons/base/configurator/section.cpp ./commons/base/configurator/restriction.cpp ./commons/base/verbose_traits.cpp 
+mod_khomp_la_SOURCES += ./support/klog-config.cpp ./support/klog-options.cpp ./support/config_defaults.cpp
+mod_khomp_la_SOURCES += ./src/globals.cpp ./src/opt.cpp ./src/frame.cpp ./src/utils.cpp ./src/lock.cpp ./src/spec.cpp ./src/applications.cpp ./src/khomp_pvt_fxo.cpp ./src/khomp_pvt_gsm.cpp ./src/khomp_pvt_kxe1.cpp ./src/khomp_pvt_passive.cpp ./src/khomp_pvt.cpp ./src/logger.cpp ./src/cli.cpp
+
+conf_file_name = khomp.conf.xml
+conf_file_dir = ./Install/files
+conf_file_dir_alt = ./conf
+conf_file_install = $(sysconfdir)/autoload_configs
+
+BUILT_SOURCES=verbose_traits.hpp verbose_traits.cpp
+
+verbose_traits.hpp verbose_traits.cpp:
+       @if test ! -f ./commons/base/verbose_traits.hpp || test ! -f ./commons/base/verbose_traits.cpp ; then \
+               echo "Generating verbose_traits" ;\
+               bash ./commons/tools/generate-verbose-headers.sh commons/base/ include/k3l.h ;\
+       fi;
+
+install:
+       @if test "w`kserver --version 2>/dev/null | grep 2.1`" == "w" ; then \
+               echo "###############################################################################" ;\
+               echo "Install k3l from KHOMP." ;\
+               echo "Run: ./tools/getk3l.sh" ;\
+               echo "###############################################################################" ;\
+               exit 1;\
+       fi;
+       @echo "Copy $(conf_file_name)"
+       @if test -d  $(conf_file_install) ; then \
+               if test -f $(conf_file_dir)/$(conf_file_name) ; then \
+                       cp $(conf_file_dir)/$(conf_file_name) $(conf_file_install)/$(conf_file_name).new ;\
+               else \
+                       cp $(conf_file_dir_alt)/$(conf_file_name) $(conf_file_install)/$(conf_file_name).new ;\
+               fi; \
+               if test ! -f "$(conf_file_install)/$(conf_file_name)" ; then \
+                       mv $(conf_file_install)/$(conf_file_name).new $(conf_file_install)/$(conf_file_name) ;\
+               fi; \
+       fi;
diff --git a/src/mod/endpoints/mod_loopback/Makefile b/src/mod/endpoints/mod_loopback/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/endpoints/mod_loopback/Makefile.am b/src/mod/endpoints/mod_loopback/Makefile.am
new file mode 100644 (file)
index 0000000..c66fafb
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_loopback
+
+mod_LTLIBRARIES = mod_loopback.la
+mod_loopback_la_SOURCES  = mod_loopback.c
+mod_loopback_la_CFLAGS   = $(AM_CFLAGS)
+mod_loopback_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_loopback_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/endpoints/mod_opal/Makefile b/src/mod/endpoints/mod_opal/Makefile
deleted file mode 100644 (file)
index d80ba64..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-BASE=../../../..
-
-PKG_DIR:=/usr/local/lib/pkgconfig
-ifeq ($(PKG_CONFIG_PATH),)
-  export PKG_CONFIG_PATH:=$(PKG_DIR)
-else
-  ifeq ($(findstring $(PKG_DIR),$(PKG_CONFIG_PATH)),)
-    export PKG_CONFIG_PATH:=$(PKG_CONFIG_PATH):$(PKG_DIR)
-  endif
-endif
-
-#DEBUG_SUFFIX:=--define-variable=suffix=_d
-
-LOCAL_INSERT_CFLAGS= pkg-config opal $(DEBUG_SUFFIX) --cflags 
-LOCAL_CFLAGS+=-g -ggdb
-LOCAL_INSERT_LDFLAGS= pkg-config opal $(DEBUG_SUFFIX) --libs
-
-include $(BASE)/build/modmake.rules
-
-
diff --git a/src/mod/endpoints/mod_opal/Makefile.am b/src/mod/endpoints/mod_opal/Makefile.am
new file mode 100644 (file)
index 0000000..1a82c75
--- /dev/null
@@ -0,0 +1,11 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_opal
+
+PKG_DIR=/usr/local/lib/pkgconfig
+
+#DEBUG_SUFFIX:=--define-variable=suffix=_d
+mod_LTLIBRARIES = mod_opal.la
+mod_opal_la_SOURCES  = mod_opal.c
+mod_opal_la_CFLAGS   = $(AM_CFLAGS) `PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(PKG_DIR) pkg-config opal $(DEBUG_SUFFIX) --cflags`
+mod_opal_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_opal_la_LDFLAGS  = -avoid-version -module -no-undefined -shared `pkg-config opal $(DEBUG_SUFFIX) --libs`
diff --git a/src/mod/endpoints/mod_reference/Makefile b/src/mod/endpoints/mod_reference/Makefile
deleted file mode 100644 (file)
index bdace9d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-MODNAME=mod_conference
-include ../../../../build/modmake.rules
diff --git a/src/mod/endpoints/mod_reference/Makefile.am b/src/mod/endpoints/mod_reference/Makefile.am
new file mode 100644 (file)
index 0000000..47dd3ed
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_reference
+
+mod_LTLIBRARIES = mod_reference.la
+mod_reference_la_SOURCES  = mod_reference.c
+mod_reference_la_CFLAGS   = $(AM_CFLAGS)
+mod_reference_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_reference_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/endpoints/mod_rtmp/Makefile b/src/mod/endpoints/mod_rtmp/Makefile
deleted file mode 100644 (file)
index c2a7e25..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-BASE=../../../..
-
-LIBAMF_OBJS=libamf/src/amf0.o libamf/src/hash.o libamf/src/io.o libamf/src/ptrarray.o libamf/src/types.o
-LOCAL_OBJS=rtmp_sig.o rtmp.o rtmp_tcp.o $(LIBAMF_OBJS)
-LOCAL_CFLAGS=-Ilibamf/src
-
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/endpoints/mod_rtmp/Makefile.am b/src/mod/endpoints/mod_rtmp/Makefile.am
new file mode 100644 (file)
index 0000000..eec6a5d
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_rtmp
+mod_LTLIBRARIES = mod_rtmp.la
+mod_rtmp_la_SOURCES  = mod_rtmp.c rtmp_sig.c rtmp.c rtmp_tcp.c
+mod_rtmp_la_SOURCES += libamf/src/amf0.c libamf/src/hash.c libamf/src/io.c libamf/src/ptrarray.c libamf/src/types.c 
+mod_rtmp_la_CFLAGS   = $(AM_CFLAGS) -Ilibamf/src
+mod_rtmp_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_rtmp_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
index f5c0a225266e0f705fa80773f75f495c20f29c74..887cfec26ce63dd47981edc3c4369a3f2fca347d 100644 (file)
@@ -1,6 +1,7 @@
+#include "amf0.h"
+
 #include <string.h>
 
-#include "amf0.h"
 #include "io.h"
 #include "types.h"
 
index 9cb5b7f1c6e2c60559de7c0d0410176f1f9541e8..2fa6bb99c3fc2278767f24c3430914c08b908b99 100644 (file)
@@ -1,11 +1,11 @@
 #ifndef __AMF0_H__
 #define __AMF0_H__
 
+#include "amf.h"
+
 #include <stdio.h>
 #include <time.h>
 
-#include "amf.h"
-
 /* AMF data types */
 #define AMF0_TYPE_NUMBER                0x00
 #define AMF0_TYPE_BOOLEAN               0x01
index 9b046314299915ed4d4e0914dfbf9f25e56d7df6..be65e8208059993bf799f7988664a5a6c503b1da 100644 (file)
@@ -1,8 +1,8 @@
+#include "io.h"
+
 #include <stdio.h>
 #include <string.h>
 
-#include "io.h"
-
 /* callback function to mimic fread using a memory buffer */
 size_t buffer_read(void * out_buffer, size_t size, void * user_data) {
     buffer_context * ctxt = (buffer_context *)user_data;
diff --git a/src/mod/endpoints/mod_unicall/Makefile.am b/src/mod/endpoints/mod_unicall/Makefile.am
new file mode 100644 (file)
index 0000000..1fcfc78
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_unicall
+
+mod_LTLIBRARIES = mod_unicall.la
+mod_unicall_la_SOURCES  = mod_unicall.c
+mod_unicall_la_CFLAGS   = $(AM_CFLAGS)
+mod_unicall_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_unicall_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/event_handlers/mod_cdr_csv/Makefile b/src/mod/event_handlers/mod_cdr_csv/Makefile
deleted file mode 100644 (file)
index c2baec8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include ../../../../build/modmake.rules
diff --git a/src/mod/event_handlers/mod_cdr_csv/Makefile.am b/src/mod/event_handlers/mod_cdr_csv/Makefile.am
new file mode 100644 (file)
index 0000000..1e24bd1
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_cdr_csv
+
+mod_LTLIBRARIES = mod_cdr_csv.la
+mod_cdr_csv_la_SOURCES  = mod_cdr_csv.c
+mod_cdr_csv_la_CFLAGS   = $(AM_CFLAGS)
+mod_cdr_csv_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_cdr_csv_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
index 700fb4a9be02ed3eba4e6945117f691d6911a9e5..b6e08cf8fc97cdf3baebd5045132a38ba0b7ba09 100644 (file)
@@ -26,8 +26,8 @@
  * mod_cdr_csv.c -- Asterisk Compatible CDR Module
  *
  */
-#include <sys/stat.h>
 #include <switch.h>
+#include <sys/stat.h>
 
 typedef enum {
        CDR_LEG_A = (1 << 0),
diff --git a/src/mod/event_handlers/mod_cdr_mongodb/Makefile b/src/mod/event_handlers/mod_cdr_mongodb/Makefile
deleted file mode 100644 (file)
index 6a412a0..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-include ../../../../build/modmake.rules
-
-MONGODB_DRIVER=./driver/src
-LOCAL_CFLAGS=-I$(MONGODB_DRIVER)
-LOCAL_OBJS=$(MONGODB_DRIVER)/encoding.o $(MONGODB_DRIVER)/env_posix.o \
-          $(MONGODB_DRIVER)/bson.o $(MONGODB_DRIVER)/md5.o \
-          $(MONGODB_DRIVER)/mongo.o $(MONGODB_DRIVER)/numbers.o
-
-local_depend: $(LOCAL_OBJS)
diff --git a/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am b/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am
new file mode 100644 (file)
index 0000000..87cb8d4
--- /dev/null
@@ -0,0 +1,9 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_cdr_mongodb
+MONGODB_DRIVER=./driver/src
+mod_LTLIBRARIES = mod_cdr_mongodb.la
+mod_cdr_mongodb_la_SOURCES  = mod_cdr_mongodb.c $(MONGODB_DRIVER)/encoding.c $(MONGODB_DRIVER)/env_posix.c $(MONGODB_DRIVER)/bson.c $(MONGODB_DRIVER)/md5.c $(MONGODB_DRIVER)/mongo.c $(MONGODB_DRIVER)/numbers.c
+mod_cdr_mongodb_la_CFLAGS   = $(AM_CFLAGS)
+mod_cdr_mongodb_la_CPPFLAGS = -I$(MONGODB_DRIVER) -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ -D_GNU_SOURCE                          
+mod_cdr_mongodb_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_cdr_mongodb_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/event_handlers/mod_cdr_pg_csv/Makefile b/src/mod/event_handlers/mod_cdr_pg_csv/Makefile
deleted file mode 100644 (file)
index 91c48be..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-UNAME := $(shell uname -s)
-ifeq ($(UNAME),SunOS)
-ISA64 := $(shell isainfo -n)
-LOCAL_CFLAGS=-I/usr/postgres/8.3/include
-ifneq (,$(findstring m64,$(CFLAGS)))
-LOCAL_LDFLAGS=-L/usr/postgres/8.3/lib/$(ISA64) -R/usr/postgres/8.3/lib/$(ISA64) -lpq -static
-else 
-LOCAL_LDFLAGS=-L/usr/postgres/8.3/lib -R/usr/postgres/8.3/lib -lpq -static
-endif
-else
-LOCAL_CFLAGS=-I/usr/include/postgresql
-LOCAL_LDFLAGS=-lpq -static
-endif
-include ../../../../build/modmake.rules
diff --git a/src/mod/event_handlers/mod_cdr_pg_csv/Makefile.am b/src/mod/event_handlers/mod_cdr_pg_csv/Makefile.am
new file mode 100644 (file)
index 0000000..bcbfada
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_cdr_pg_csv
+
+mod_LTLIBRARIES = mod_cdr_pg_csv.la
+mod_cdr_pg_csv_la_SOURCES  = mod_cdr_pg_csv.c
+mod_cdr_pg_csv_la_CFLAGS   = $(AM_CFLAGS) $(SWITCH_AM_CXXFLAGS)
+mod_cdr_pg_csv_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_cdr_pg_csv_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lpq $(SWITCH_AM_LDFLAGS)
index c80826000e70083a904193cc8520e07a784970d1..c0c9bf58e1098e159396f2d96256146b8d8a4ec3 100644 (file)
@@ -35,8 +35,8 @@
  *
  */
 
-#include <sys/stat.h>
 #include <switch.h>
+#include <sys/stat.h>
 #include <libpq-fe.h>
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_cdr_pg_csv_load);
diff --git a/src/mod/event_handlers/mod_cdr_sqlite/Makefile b/src/mod/event_handlers/mod_cdr_sqlite/Makefile
deleted file mode 100644 (file)
index c2baec8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include ../../../../build/modmake.rules
diff --git a/src/mod/event_handlers/mod_cdr_sqlite/Makefile.am b/src/mod/event_handlers/mod_cdr_sqlite/Makefile.am
new file mode 100644 (file)
index 0000000..4832331
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_cdr_sqlite
+
+mod_LTLIBRARIES = mod_cdr_sqlite.la
+mod_cdr_sqlite_la_SOURCES  = mod_cdr_sqlite.c
+mod_cdr_sqlite_la_CFLAGS   = $(AM_CFLAGS)
+mod_cdr_sqlite_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_cdr_sqlite_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/event_handlers/mod_erlang_event/Makefile.am b/src/mod/event_handlers/mod_erlang_event/Makefile.am
new file mode 100644 (file)
index 0000000..1ecda6b
--- /dev/null
@@ -0,0 +1,7 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_erlang_event
+mod_LTLIBRARIES = mod_erlang_event.la
+mod_erlang_event_la_SOURCES  = mod_erlang_event.c handle_msg.c ei_helpers.c
+mod_erlang_event_la_CFLAGS   = $(AM_CFLAGS) @ERLANG_CFLAGS@ -D_REENTRANT
+mod_erlang_event_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_erlang_event_la_LDFLAGS  = -avoid-version -module -no-undefined -shared @ERLANG_LDFLAGS@
diff --git a/src/mod/event_handlers/mod_erlang_event/Makefile.in b/src/mod/event_handlers/mod_erlang_event/Makefile.in
deleted file mode 100644 (file)
index 3a55175..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_SOURCES=handle_msg.c ei_helpers.c
-LOCAL_OBJS=handle_msg.o ei_helpers.o
-LOCAL_CFLAGS= @ERLANG_CFLAGS@ -D_REENTRANT
-LOCAL_LDFLAGS= @ERLANG_LDFLAGS@
-
-include ../../../../build/modmake.rules
-
-
-
diff --git a/src/mod/event_handlers/mod_event_multicast/Makefile b/src/mod/event_handlers/mod_event_multicast/Makefile
deleted file mode 100644 (file)
index 407528d..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-
-LOCAL_CFLAGS= $(OPENSSL_CFLAGS)
-LOCAL_LDLAGS= $(OPENSSL_LIBS)
-
-include ../../../../build/modmake.rules
diff --git a/src/mod/event_handlers/mod_event_multicast/Makefile.am b/src/mod/event_handlers/mod_event_multicast/Makefile.am
new file mode 100644 (file)
index 0000000..814e1c2
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_event_multicast
+
+mod_LTLIBRARIES = mod_event_multicast.la
+mod_event_multicast_la_SOURCES  = mod_event_multicast.c
+mod_event_multicast_la_CFLAGS   = $(AM_CFLAGS) $(OPENSSL_CFLAGS)
+mod_event_multicast_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_event_multicast_la_LDFLAGS  = -avoid-version -module -no-undefined -shared $(OPENSSL_LIBS)
index d3b0d61aadb379d4faca1a96a3dfa45666455ea1..3c352b1942826530d73d4e3af574a7e623ce397a 100644 (file)
  * mod_event_multicast.c -- Multicast Events
  *
  */
+#include <switch.h>
 #ifdef HAVE_OPENSSL
 #include <openssl/evp.h>
 #endif
-#include <switch.h>
 
 #define MULTICAST_BUFFSIZE 65536
 
diff --git a/src/mod/event_handlers/mod_event_socket/Makefile.am b/src/mod/event_handlers/mod_event_socket/Makefile.am
new file mode 100644 (file)
index 0000000..813f0dd
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_event_socket
+
+mod_LTLIBRARIES = mod_event_socket.la
+mod_event_socket_la_SOURCES  = mod_event_socket.c
+mod_event_socket_la_CFLAGS   = $(AM_CFLAGS)
+mod_event_socket_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_event_socket_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/event_handlers/mod_event_test/Makefile.am b/src/mod/event_handlers/mod_event_test/Makefile.am
new file mode 100644 (file)
index 0000000..7bcad06
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_event_test
+
+mod_LTLIBRARIES = mod_event_test.la
+mod_event_test_la_SOURCES  = mod_event_test.c
+mod_event_test_la_CFLAGS   = $(AM_CFLAGS)
+mod_event_test_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_event_test_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
similarity index 60%
rename from src/mod/event_handlers/mod_event_zmq/Makefile
rename to src/mod/event_handlers/mod_event_zmq/Makefile.am
index d660d375c82f47c3804ccc39fbee49c860adbcdc..4cd857685d80292a57a6c2d253cf54d8ebd4e71e 100644 (file)
@@ -1,5 +1,5 @@
-BASE=../../../..
-
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_event_zmq
 ZMQ=zeromq-2.1.9
 
 ZMQ_BASEURL=http://download.zeromq.org
@@ -7,11 +7,16 @@ ZMQ_BASEURL_ALT=http://download.zeromq.org/historic
 
 ZMQ_DIR=$(switch_srcdir)/libs/$(ZMQ)
 ZMQ_BUILDDIR=$(switch_builddir)/libs/$(ZMQ)
-LOCAL_CFLAGS=-I$(ZMQ_DIR)/include
 ZMQ_LA=$(ZMQ_BUILDDIR)/src/libzmq.la
-LOCAL_LIBADD=$(ZMQ_LA)
 
-include $(BASE)/build/modmake.rules
+mod_LTLIBRARIES = mod_event_zmq.la
+mod_event_zmq_la_SOURCES  = mod_event_zmq.cpp
+mod_event_zmq_la_CFLAGS   = $(AM_CFLAGS)
+mod_event_zmq_la_CPPFLAGS = -I$(ZMQ_DIR)/include -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/                                         
+mod_event_zmq_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(ZMQ_LA)
+mod_event_zmq_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+BUILT_SOURCES=$(ZMQ_LA)
 
 $(ZMQ_DIR):
        $(GETLIB) $(ZMQ_BASEURL) $(ZMQ).tar.gz || $(GETLIB) $(ZMQ_BASEURL_ALT) $(ZMQ).tar.gz
diff --git a/src/mod/event_handlers/mod_format_cdr/Makefile b/src/mod/event_handlers/mod_format_cdr/Makefile
deleted file mode 100644 (file)
index c2baec8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include ../../../../build/modmake.rules
diff --git a/src/mod/event_handlers/mod_format_cdr/Makefile.am b/src/mod/event_handlers/mod_format_cdr/Makefile.am
new file mode 100644 (file)
index 0000000..1867de1
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_format_cdr
+
+mod_LTLIBRARIES = mod_format_cdr.la
+mod_format_cdr_la_SOURCES  = mod_format_cdr.c
+mod_format_cdr_la_CFLAGS   = $(AM_CFLAGS)
+mod_format_cdr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_format_cdr_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
index b59720a934e0704b02ab50fd1f071a9a81a256ae..df9688ee545d6878c7c6f81a5b162bfbf2e4ef61 100644 (file)
@@ -30,8 +30,8 @@
  * mod_format_cdr.c -- XML CDR Module to files or curl
  *
  */
-#include <sys/stat.h>
 #include <switch.h>
+#include <sys/stat.h>
 #include <switch_curl.h>
 #define MAX_URLS 20
 #define MAX_ERR_DIRS 20
diff --git a/src/mod/event_handlers/mod_json_cdr/Makefile b/src/mod/event_handlers/mod_json_cdr/Makefile
deleted file mode 100644 (file)
index c9dfa53..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-BASE=../../../..
-
-include $(BASE)/build/modmake.rules
-
diff --git a/src/mod/event_handlers/mod_json_cdr/Makefile.am b/src/mod/event_handlers/mod_json_cdr/Makefile.am
new file mode 100644 (file)
index 0000000..a814629
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_json_cdr
+
+mod_LTLIBRARIES = mod_json_cdr.la
+mod_json_cdr_la_SOURCES  = mod_json_cdr.c
+mod_json_cdr_la_CFLAGS   = $(AM_CFLAGS)
+mod_json_cdr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_json_cdr_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
index df9336f302f24fb4387a14e85e203aeb721a251f..5fc4064ee00bf66a6b940b8e3901b1765dc170bb 100644 (file)
@@ -30,8 +30,8 @@
  * mod_json_cdr.c -- JSON CDR Module to files or curl
  *
  */
-#include <sys/stat.h>
 #include <switch.h>
+#include <sys/stat.h>
 #include <switch_curl.h>
 
 #define MAX_URLS 20
similarity index 62%
rename from src/mod/applications/mod_rad_auth/Makefile
rename to src/mod/event_handlers/mod_radius_cdr/Makefile.am
index 63542dff476eb9c0d196b31c2e5ade818a32a411..9c0532b179dc93eaa80e91f675e5d7ec7ea2164c 100644 (file)
@@ -1,3 +1,6 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_radius_cdr
+
 RADCLIENT_VERSION=1.1.6
 RADCLIENT=freeradius-client-$(RADCLIENT_VERSION)
 RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT)
@@ -5,11 +8,12 @@ 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)
-
-BASE=../../../..
-include $(BASE)/build/modmake.rules
+mod_LTLIBRARIES = mod_radius_cdr.la
+mod_radius_cdr_la_SOURCES  = mod_radius_cdr.c
+mod_radius_cdr_la_CFLAGS   = $(AM_CFLAGS) -I$(RADCLIENT_DIR)/include
+mod_radius_cdr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(RADCLIENT_LA)
+mod_radius_cdr_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+BUILT_SOURCES=$(RADCLIENT_LA)
 
 $(RADCLIENT_DIR):
        $(GETLIB) $(RADCLIENT).tar.gz
diff --git a/src/mod/event_handlers/mod_rayo/Makefile b/src/mod/event_handlers/mod_rayo/Makefile
deleted file mode 100644 (file)
index 070f41f..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-BASE=../../../..
-
-IKS_DIR=$(BASE)/libs/iksemel
-PCRE_DIR=$(BASE)/libs/pcre
-IKS_LA=$(IKS_DIR)/src/libiksemel.la
-PCRE_LA=$(PCRE_DIR)/libpcre.la
-LOCAL_CFLAGS += -I$(BASE)/libs/iksemel/include -I$(BASE)/libs/pcre
-LOCAL_OBJS= $(IKS_LA) \
-       $(PCRE_LA) \
-       iks_helpers.o \
-       nlsml.o \
-       rayo_components.o \
-       rayo_cpa_component.o \
-       rayo_cpa_detector.o \
-       rayo_elements.o \
-       rayo_fax_components.o \
-       rayo_input_component.o \
-       rayo_output_component.o \
-       rayo_prompt_component.o \
-       rayo_record_component.o \
-       sasl.o \
-       srgs.o \
-       xmpp_streams.o
-LOCAL_SOURCES= \
-       iks_helpers.c \
-       nlsml.c \
-       rayo_components.c \
-       rayo_cpa_component.c \
-       rayo_cpa_detector.c \
-       rayo_elements.c \
-       rayo_fax_components.c \
-       rayo_input_component.c \
-       rayo_output_component.c \
-       rayo_prompt_component.c \
-       rayo_record_component.c \
-       sasl.c \
-       srgs.c \
-       xmpp_streams.c
-include $(BASE)/build/modmake.rules
-
-$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update
-       @cd $(IKS_DIR) && $(MAKE)
-       @$(TOUCH_TARGET)
-
-$(PCRE_LA): $(PCRE_DIR) $(PCRE_DIR)/.update
-       @cd $(PCRE_DIR) && $(MAKE)
-       @$(TOUCH_TARGET)
diff --git a/src/mod/event_handlers/mod_rayo/Makefile.am b/src/mod/event_handlers/mod_rayo/Makefile.am
new file mode 100644 (file)
index 0000000..d46d2e0
--- /dev/null
@@ -0,0 +1,24 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_rayo
+
+IKS_DIR=$(switch_srcdir)/libs/iksemel
+PCRE_DIR=$(switch_srcdir)/libs/pcre
+IKS_LA=$(IKS_DIR)/src/libiksemel.la
+PCRE_LA=$(PCRE_DIR)/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_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)
+       @$(TOUCH_TARGET)
+
+$(PCRE_LA): $(PCRE_DIR) $(PCRE_DIR)/.update
+       @cd $(PCRE_DIR) && $(MAKE)
+       @$(TOUCH_TARGET)
diff --git a/src/mod/event_handlers/mod_rayo/test_iks/Makefile b/src/mod/event_handlers/mod_rayo/test_iks/Makefile
deleted file mode 100644 (file)
index d75a967..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-BASE=../../../../..
-
-IKS_DIR=$(BASE)/libs/iksemel
-IKS_LA=$(IKS_DIR)/src/libiksemel.la
-LOCAL_CFLAGS += -I../ -I$(BASE)/libs/iksemel/include 
-LOCAL_OBJS= $(PCRE_LA) $(IKS_LA) main.o ../iks_helpers.o
-LOCAL_SOURCES= main.c 
-include $(BASE)/build/modmake.rules
-
-$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update
-       @cd $(IKS_DIR) && $(MAKE)
-       @$(TOUCH_TARGET)
-
-local_all:
-       libtool --mode=link gcc main.o ../iks_helpers.o -o test test_iks.la
-
-local_clean:
-       -rm test
diff --git a/src/mod/event_handlers/mod_rayo/test_nlsml/Makefile b/src/mod/event_handlers/mod_rayo/test_nlsml/Makefile
deleted file mode 100644 (file)
index f363f55..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-BASE=../../../../..
-
-IKS_DIR=$(BASE)/libs/iksemel
-IKS_LA=$(IKS_DIR)/src/libiksemel.la
-LOCAL_CFLAGS += -I../ -I$(BASE)/libs/iksemel/include
-LOCAL_OBJS= $(PCRE_LA) $(IKS_LA) main.o ../nlsml.o
-LOCAL_SOURCES= main.c
-include $(BASE)/build/modmake.rules
-
-$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update
-       @cd $(IKS_DIR) && $(MAKE)
-       @$(TOUCH_TARGET)
-
-local_all:
-       libtool --mode=link gcc main.o ../nlsml.o -o test test_nlsml.la
-
-local_clean:
-       -rm test
diff --git a/src/mod/event_handlers/mod_rayo/test_srgs/Makefile b/src/mod/event_handlers/mod_rayo/test_srgs/Makefile
deleted file mode 100644 (file)
index d35ddb5..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-BASE=../../../../..
-
-IKS_DIR=$(BASE)/libs/iksemel
-PCRE_DIR=$(BASE)/libs/pcre
-IKS_LA=$(IKS_DIR)/src/libiksemel.la
-PCRE_LA=$(PCRE_DIR)/libpcre.la
-LOCAL_CFLAGS += -I../ -I$(BASE)/libs/iksemel/include -I$(BASE)/libs/pcre/include
-LOCAL_OBJS= $(PCRE_LA) $(IKS_LA) main.o ../srgs.o
-LOCAL_SOURCES= main.c
-include $(BASE)/build/modmake.rules
-
-$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update
-       @cd $(IKS_DIR) && $(MAKE)
-       @$(TOUCH_TARGET)
-
-$(PCRE_LA): $(PCRE_DIR) $(PCRE_DIR)/.update
-       @cd $(PCRE_DIR) && $(MAKE)
-       @$(TOUCH_TARGET)
-
-local_all:
-       libtool --mode=link gcc main.o ../srgs.o -o test test_srgs.la
-
-local_clean:
-       -rm test
diff --git a/src/mod/event_handlers/mod_snmp/Makefile b/src/mod/event_handlers/mod_snmp/Makefile
deleted file mode 100644 (file)
index f95227b..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-include ../../../../build/modmake.rules
-
-LOCAL_CFLAGS=`net-snmp-config --cflags`
-LOCAL_LDFLAGS=`net-snmp-config --agent-libs`
-LOCAL_OBJS=subagent.o
-
-local_depend: $(LOCAL_OBJS)
diff --git a/src/mod/event_handlers/mod_snmp/Makefile.am b/src/mod/event_handlers/mod_snmp/Makefile.am
new file mode 100644 (file)
index 0000000..7c84fdd
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_snmp
+
+mod_LTLIBRARIES = mod_snmp.la
+mod_snmp_la_SOURCES  = mod_snmp.c subagent.c
+mod_snmp_la_CFLAGS   = $(AM_CFLAGS) `net-snmp-config --cflags`
+mod_snmp_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_snmp_la_LDFLAGS  = -avoid-version -module -no-undefined -shared `net-snmp-config --agent-libs`
diff --git a/src/mod/formats/mod_local_stream/Makefile b/src/mod/formats/mod_local_stream/Makefile
deleted file mode 100644 (file)
index d61a011..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-MODNAME=mod_local_stream
-include ../../../../build/modmake.rules
diff --git a/src/mod/formats/mod_local_stream/Makefile.am b/src/mod/formats/mod_local_stream/Makefile.am
new file mode 100644 (file)
index 0000000..c34977d
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_local_stream
+
+mod_LTLIBRARIES = mod_local_stream.la
+mod_local_stream_la_SOURCES  = mod_local_stream.c
+mod_local_stream_la_CFLAGS   = $(AM_CFLAGS)
+mod_local_stream_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_local_stream_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/formats/mod_native_file/Makefile.am b/src/mod/formats/mod_native_file/Makefile.am
new file mode 100644 (file)
index 0000000..c15a95a
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_native_file
+
+mod_LTLIBRARIES = mod_native_file.la
+mod_native_file_la_SOURCES  = mod_native_file.c
+mod_native_file_la_CFLAGS   = $(AM_CFLAGS)
+mod_native_file_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_native_file_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/formats/mod_shell_stream/Makefile.am b/src/mod/formats/mod_shell_stream/Makefile.am
new file mode 100644 (file)
index 0000000..3a780b7
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_shell_stream
+
+mod_LTLIBRARIES = mod_shell_stream.la
+mod_shell_stream_la_SOURCES  = mod_shell_stream.c
+mod_shell_stream_la_CFLAGS   = $(AM_CFLAGS)
+mod_shell_stream_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_shell_stream_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
similarity index 70%
rename from src/mod/formats/mod_shout/Makefile
rename to src/mod/formats/mod_shout/Makefile.am
index f059677e7ef8beeafacfd03b4468a5545eea86c5..fe1bcdece5ca8623bb870da3a743ac3fd620c06d 100644 (file)
@@ -1,7 +1,9 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_shout
+
 LAME=lame-3.98.4
 SHOUT=libshout-2.2.2
 MPG123=mpg123-1.13.2
-BASE=../../../..
 
 LAME_DIR=$(switch_srcdir)/libs/$(LAME)
 SHOUT_DIR=$(switch_srcdir)/libs/$(SHOUT)
@@ -15,13 +17,14 @@ LAMELA=$(LAME_BUILDDIR)/libmp3lame/libmp3lame.la
 SHOUTLA=$(SHOUT_BUILDDIR)/src/libshout.la
 MPG123LA=$(MPG123_BUILDDIR)/src/libmpg123/libmpg123.la
 
-LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src  -I$(MPG123_BUILDDIR)/src -I$(SHOUT_BUILDDIR)/include 
-LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) $(MPG123LA)
-LOCAL_LDFLAGS=`cat $(SHOUT_BUILDDIR)/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'`  `cat $(SHOUTLA) | grep dependency_libs  | sed -e 's|^dependency_libs=||' | sed -e "s|'||g"`
-
-include $(BASE)/build/modmake.rules
+mod_LTLIBRARIES = mod_shout.la
+mod_shout_la_SOURCES  = mod_shout.c
+mod_shout_la_CFLAGS   = $(AM_CFLAGS)
+mod_shout_la_CFLAGS  += -I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src  -I$(MPG123_BUILDDIR)/src -I$(SHOUT_BUILDDIR)/include
+mod_shout_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LAMELA) $(SHOUTLA) $(MPG123LA)
+mod_shout_la_LDFLAGS  = -avoid-version -module -no-undefined -shared `cat $(SHOUT_BUILDDIR)/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'`  `cat $(SHOUTLA) | grep dependency_libs  | sed -e 's|^dependency_libs=||' | sed -e "s|'||g"`
 
-$(MODNAME).lo: $(LOCAL_LIBADD)
+BUILT_SOURCES=$(LAMELA) $(SHOUTLA) $(MPG123LA)
 
 $(MPG123_DIR):
        $(GETLIB) $(MPG123).tar.gz
@@ -60,5 +63,3 @@ $(SHOUTLA): $(SHOUT_BUILDDIR)/Makefile
        cd $(SHOUT_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)
 
-
-
index b05e4b393eaf187e5a013d7429e40b42417975f5..662de882c3ab559fb016f51f3847189883a798d3 100644 (file)
@@ -32,8 +32,8 @@
  * example filename: shout://user:pass@host.com/mount.mp3
  *
  */
-#include "libmpg123/mpg123.h"
 #include <switch.h>
+#include "libmpg123/mpg123.h"
 #include <shout/shout.h>
 #include <lame.h>
 #include <switch_curl.h>
diff --git a/src/mod/formats/mod_sndfile/Makefile b/src/mod/formats/mod_sndfile/Makefile
deleted file mode 100644 (file)
index 1f27f2a..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-BASE=../../../..
-
-SNDFILE_DIR=$(switch_srcdir)/libs/libsndfile
-SNDFILE_BUILDDIR=$(switch_builddir)/libs/libsndfile
-SNDFILELA=$(SNDFILE_BUILDDIR)/src/libsndfile.la
-
-LOCAL_CFLAGS=-I$(SNDFILE_DIR)/src -I$(SNDFILE_BUILDDIR)/src
-LOCAL_LIBADD=$(SNDFILELA)
-
-include $(BASE)/build/modmake.rules
-
-$(SNDFILELA): $(SNDFILE_DIR) $(SNDFILE_DIR)/.update
-       cd $(SNDFILE_BUILDDIR) && $(MAKE)
-       $(TOUCH_TARGET)
diff --git a/src/mod/formats/mod_sndfile/Makefile.am b/src/mod/formats/mod_sndfile/Makefile.am
new file mode 100644 (file)
index 0000000..a633525
--- /dev/null
@@ -0,0 +1,18 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_sndfile
+
+SNDFILE_DIR=$(switch_srcdir)/libs/libsndfile
+SNDFILE_BUILDDIR=$(switch_builddir)/libs/libsndfile
+SNDFILELA=$(SNDFILE_BUILDDIR)/src/libsndfile.la
+
+mod_LTLIBRARIES = mod_sndfile.la
+mod_sndfile_la_SOURCES  = mod_sndfile.c
+mod_sndfile_la_CFLAGS   = $(AM_CFLAGS) -I$(SNDFILE_DIR)/src -I$(SNDFILE_BUILDDIR)/src
+mod_sndfile_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SNDFILELA)
+mod_sndfile_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+BUILT_SOURCES=$(SNDFILELA)
+
+$(SNDFILELA): $(SNDFILE_DIR) $(SNDFILE_DIR)/.update
+       cd $(SNDFILE_BUILDDIR) && $(MAKE)
+       $(TOUCH_TARGET)
diff --git a/src/mod/formats/mod_ssml/Makefile b/src/mod/formats/mod_ssml/Makefile
deleted file mode 100644 (file)
index c18e12f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-BASE=../../../..
-
-IKS_DIR=$(BASE)/libs/iksemel
-IKS_LA=$(IKS_DIR)/src/libiksemel.la
-LOCAL_CFLAGS += -I$(BASE)/libs/iksemel/include
-LOCAL_OBJS= $(IKS_LA)
-include $(BASE)/build/modmake.rules
-
-$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update
-       @cd $(IKS_DIR) && $(MAKE)
-       @$(TOUCH_TARGET)
diff --git a/src/mod/formats/mod_ssml/Makefile.am b/src/mod/formats/mod_ssml/Makefile.am
new file mode 100644 (file)
index 0000000..ad91a27
--- /dev/null
@@ -0,0 +1,18 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_ssml
+
+IKS_DIR=$(switch_srcdir)/libs/iksemel
+IKS_BUILDDIR=$(switch_builddir)/libs/iksemel
+IKS_LA=$(IKS_BUILDDIR)/src/libiksemel.la
+
+mod_LTLIBRARIES = mod_ssml.la
+mod_ssml_la_SOURCES  = mod_ssml.c
+mod_ssml_la_CFLAGS   = $(AM_CFLAGS) -I$(IKS_DIR)/include
+mod_ssml_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(IKS_LA)
+mod_ssml_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+BUILT_SOURCES=$(IKS_LA)
+
+$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update
+       @cd $(IKS_DIR) && $(MAKE)
+       @$(TOUCH_TARGET)
diff --git a/src/mod/formats/mod_tone_stream/Makefile.am b/src/mod/formats/mod_tone_stream/Makefile.am
new file mode 100644 (file)
index 0000000..217dd9f
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_tone_stream
+
+mod_LTLIBRARIES = mod_tone_stream.la
+mod_tone_stream_la_SOURCES  = mod_tone_stream.c
+mod_tone_stream_la_CFLAGS   = $(AM_CFLAGS)
+mod_tone_stream_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_tone_stream_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/formats/mod_vlc/Makefile b/src/mod/formats/mod_vlc/Makefile
deleted file mode 100644 (file)
index a41d9b3..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
-
-LOCAL_LDFLAGS= -lvlc
diff --git a/src/mod/formats/mod_vlc/Makefile.am b/src/mod/formats/mod_vlc/Makefile.am
new file mode 100644 (file)
index 0000000..65720ab
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_vlc
+
+mod_LTLIBRARIES = mod_vlc.la
+mod_vlc_la_SOURCES  = mod_vlc.c
+mod_vlc_la_CFLAGS   = $(AM_CFLAGS)
+mod_vlc_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_vlc_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lvlc
similarity index 57%
rename from src/mod/languages/mod_java/Makefile.in
rename to src/mod/languages/mod_java/Makefile.am
index 4a1c173682f04961dd4569514967ed0e88b7020c..34ac2923e68c6bbddc5c537fa7abeb49ca834be1 100644 (file)
@@ -1,22 +1,25 @@
-# define these targets in your makefile if you wish
-# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_java
 
-# and define these variables to impact your build
+mod_LTLIBRARIES = mod_java.la
+mod_java_la_SOURCES  = mod_java.cpp freeswitch_java.cpp switch_swig_wrap.cpp modjava.c
+mod_java_la_CFLAGS   = $(AM_CFLAGS)
+mod_java_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_java_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-JAVA_FLAGS=@JAVA_FLAGS@
 # Without -fno-strict-aliasing, g++ generates invalid code for Java_org_freeswitch_freeswitchJNI_SWIGJavaSessionUpcast, which segfaults
-LOCAL_CFLAGS=$(JAVA_FLAGS) -fno-strict-aliasing -I/usr/lib/jvm/java-gcj/include -I/usr/lib/jvm/java-gcj/include/linux
-LOCAL_OBJS=freeswitch_java.o switch_swig_wrap.o modjava.o
+mod_java_la_CFLAGS  += $(JAVA_FLAGS) -fno-strict-aliasing -I/usr/lib/jvm/java-gcj/include -I/usr/lib/jvm/java-gcj/include/linux
+
 CLASSES=src/org/freeswitch/Launcher.java \
        src/org/freeswitch/HangupHook.java \
        src/org/freeswitch/DTMFCallback.java \
        src/org/freeswitch/FreeswitchScript.java \
        src/org/freeswitch/Event.java \
        src/org/freeswitch/swig/*
-include ../../../../build/modmake.rules
 
+BUILT_SOURCES=classes
 
-local_depend:
+classes:
        mkdir -p classes
        javac -sourcepath src -d classes $(CLASSES)
        jar cf freeswitch.jar -C classes org
@@ -25,6 +28,6 @@ reswig:
        rm -f switch_swig_wrap.cpp
        swig -java -c++ -I../../../include -package org.freeswitch.swig -outdir src/org/freeswitch/swig -o switch_swig_wrap.cpp mod_java.i
 
-local_install:
+install:
        cp freeswitch.jar $(DESTDIR)@scriptdir@
 
similarity index 59%
rename from src/mod/languages/mod_managed/Makefile
rename to src/mod/languages/mod_managed/Makefile.am
index 4a34afbc8f67cc5eaf56780fa54f629c576fe140..2880f4037bf857ae3424b4fc4d7f2c2ce26cde7d 100644 (file)
@@ -1,43 +1,41 @@
-LOCAL_INSERT_CFLAGS= /usr/bin/pkg-config mono-2 --cflags\r
-LOCAL_INSERT_LDFLAGS= /usr/bin/pkg-config mono-2 --libs\r
-#MOD_CFLAGS=-D_REENTRANT -pthread -I/usr/lib/mono -lmono\r
-BASE=../../../..\r
-VERBOSE=1\r
-include $(BASE)/build/modmake.rules\r
-LOCAL_OBJS=freeswitch_managed.o freeswitch_wrap.o\r
-\r
-local_depend: $(LOCAL_OBJS)\r
-\r
-freeswitch_managed.o: freeswitch_managed.h freeswitch_managed.cpp\r
-\r
-freeswitch_wrap.o: freeswitch_wrap.cpp\r
-\r
-freeswitch_wrap.cpp: freeswitch_wrap.cxx\r
-       cp freeswitch_wrap.cxx freeswitch_wrap.cpp\r
-\r
-reswig: swigclean freeswitch_wrap.cxx\r
-\r
-local_depend:\r
-       cd managed && $(MAKE)\r
-\r
-local_install: $(DESTDIR)$(modulesdir)/mod_managed.$(LIBTOOL_LIB_EXTEN)\r
-       cd managed && $(MAKE) INSTALL="$(LTINSTALL)" MODINSTDIR=$(modulesdir) DESTDIR=$(DESTDIR) install\r
-\r
-local_uninstall:\r
-       rm -fr $(DESTDIR)$(modulesdir)/mod_managed.so\r
-       cd managed && $(MAKE) UNINSTALL="$(LTUNINSTALL)" MODINSTDIR=$(modulesdir) uninstall\r
-\r
-local_clean:\r
-       cd managed && $(MAKE) clean\r
-\r
-swigclean: clean\r
-       rm -f freeswitch_wrap.cxx freeswitch_wrap.cpp managed/swig.cs\r
-\r
-freeswitch_wrap.cxx:\r
-       swig2.0 -I../../../include -v -O -c++ -csharp -namespace FreeSWITCH.Native -dllimport mod_managed -DSWIG_CSHARP_NO_STRING_HELPER freeswitch.i\r
-       rm -f ./managed/swig.cs\r
-       cat *.cs > ./managed/swig.cs\r
-       rm -f *.cs\r
-\r
-depend_install:\r
-       mkdir -p $(DESTDIR)$(modulesdir)/managed\r
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_managed
+
+mod_LTLIBRARIES = mod_managed.la
+mod_managed_la_SOURCES  = mod_managed.cpp freeswitch_managed.cpp freeswitch_wrap.cpp
+mod_managed_la_CFLAGS   = $(AM_CFLAGS)
+mod_managed_la_CPPFLAGS = `/usr/bin/pkg-config mono-2 --cflags` -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ 
+mod_managed_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_managed_la_LDFLAGS  = -avoid-version -module -no-undefined -shared `/usr/bin/pkg-config mono-2 --libs`
+
+freeswitch_managed.o: freeswitch_managed.h freeswitch_managed.cpp
+
+freeswitch_wrap.o: freeswitch_wrap.cpp
+
+freeswitch_wrap.cpp: freeswitch_wrap.cxx
+       cp freeswitch_wrap.cxx freeswitch_wrap.cpp
+
+reswig: swigclean freeswitch_wrap.cxx
+
+local_depend:
+       cd managed && $(MAKE)
+
+install: $(DESTDIR)$(modulesdir)/mod_managed.$(LIBTOOL_LIB_EXTEN)
+       mkdir -p $(DESTDIR)$(modulesdir)/managed
+       cd managed && $(MAKE) INSTALL="$(LTINSTALL)" MODINSTDIR=$(modulesdir) DESTDIR=$(DESTDIR) install
+
+uninstall:
+       rm -fr $(DESTDIR)$(modulesdir)/mod_managed.so
+       cd managed && $(MAKE) UNINSTALL="$(LTUNINSTALL)" MODINSTDIR=$(modulesdir) uninstall
+
+clean:
+       cd managed && $(MAKE) clean
+
+swigclean: clean
+       rm -f freeswitch_wrap.cxx freeswitch_wrap.cpp managed/swig.cs
+
+freeswitch_wrap.cxx:
+       swig2.0 -I../../../include -v -O -c++ -csharp -namespace FreeSWITCH.Native -dllimport mod_managed -DSWIG_CSHARP_NO_STRING_HELPER freeswitch.i
+       rm -f ./managed/swig.cs
+       cat *.cs > ./managed/swig.cs
+       rm -f *.cs
similarity index 57%
rename from src/mod/languages/mod_perl/Makefile
rename to src/mod/languages/mod_perl/Makefile.am
index 9aa4629adec25174d11f178614841878a403920e..97db131d85f85e5b1c9751619e3fcebd6a076588 100644 (file)
@@ -1,14 +1,15 @@
-BASE=../../../..
-PERL        = `which perl`
-PERL_LIBDIR =-L$(shell perl -MConfig -e 'print $$Config{archlib}')/CORE
-PERL_LIBS   =$(shell perl -MConfig -e 'print $$Config{libs}')
-LOCAL_CFLAGS= -w -DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL
-LOCAL_LDFLAGS=$(shell $(PERL) -MExtUtils::Embed -e ldopts) $(shell $(PERL) -MConfig -e 'print $$Config{libs}')
-LOCAL_OBJS=freeswitch_perl.o mod_perl_wrap.o perlxsi.o
-VERBOSE=1
-
-include $(BASE)/build/modmake.rules
-
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_perl
+PERL        = perl
+PERL_LIBDIR =-L`perl -MConfig -e 'print $$Config{archlib}'`/CORE
+PERL_LIBS   =`perl -MConfig -e 'print $$Config{libs}'`
+
+mod_LTLIBRARIES = mod_perl.la
+mod_perl_la_SOURCES  = mod_perl.c freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
+mod_perl_la_CFLAGS   = $(AM_CFLAGS) -w
+mod_perl_la_CPPFLAGS = -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ 
+mod_perl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_perl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'`
 
 reswig:        swigclean mod_perl_wrap.cpp
 
@@ -26,17 +27,17 @@ orig: mod_perl_wrap.cpp
 freeswitch.$(LIBTOOL_LIB_EXTEN): $(LOCAL_OBJS) $(LOCAL_LIBADD)
        $(CXXLINK) $(SOLINK) -o freeswitch.$(LIBTOOL_LIB_EXTEN) $(LOCAL_OBJS) $(LOCAL_LIBADD) $(LDFLAGS)
 
-local_all: freeswitch.$(LIBTOOL_LIB_EXTEN)
+BUILT_SOURCE=freeswitch.$(LIBTOOL_LIB_EXTEN)
 
 .perlok:
        @(${PERL} -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
        || ((echo Sorry, you need to compile perl with threads and multiplicity.&& exit 1))
        @touch .perlok
 
-local_clean:
+clean:
        rm -fr *~ .perlok .libs freeswitch.$(LIBTOOL_LIB_EXTEN) 2>/dev/null
 
-depend_install:
+install:
        mkdir -p $(DESTDIR)$(prefix)/perl
        $(LTINSTALL) freeswitch.$(LIBTOOL_LIB_EXTEN) freeswitch.pm $(DESTDIR)$(prefix)/perl
        if [ ! -f $(DESTDIR)$(prefix)/perl/freeswitch.pm ] ; then $(LTINSTALL) freeswitch.pm $(DESTDIR)$(prefix)/perl ; fi
similarity index 57%
rename from src/mod/languages/mod_python/Makefile.in
rename to src/mod/languages/mod_python/Makefile.am
index 559af05cfd4e9511fbb735343abdf74a6097a474..42ee2d9121d87c264ced831cfdfd8af265628eef 100644 (file)
@@ -1,14 +1,5 @@
-# define these targets in your makefile if you wish
-# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-
-# and define these variables to impact your build
-
-LOCAL_CFLAGS = @PYTHON_CFLAGS@
-LOCAL_LDFLAGS= @PYTHON_LDFLAGS@
-LOCAL_OBJS=freeswitch_python.o mod_python_wrap.o
-include ../../../../build/modmake.rules
-
-LINK=$(CXXLINK)
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_python
 
 PYMOD=freeswitch
 PYTHON_SITE_DIR=@PYTHON_SITE_DIR@
@@ -16,6 +7,13 @@ PYTHON_SITE_DIR=@PYTHON_SITE_DIR@
 SWIGCFILE=../../../switch_swig.c
 SWIGIFILE=../../../switch_swig.i
 
+mod_LTLIBRARIES = mod_python.la
+mod_python_la_SOURCES  = mod_python.c freeswitch_python.cpp mod_python_wrap.cpp
+mod_python_la_CFLAGS   = $(AM_CFLAGS)
+mod_python_la_CPPFLAGS = @PYTHON_CFLAGS@ -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ 
+mod_python_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_python_la_LDFLAGS  = -avoid-version -module -no-undefined -shared @PYTHON_LDFLAGS@
+
 reswig: swigclean mod_python_wrap.cpp
 
 swigclean: clean
@@ -26,7 +24,7 @@ mod_python_wrap.cpp: mod_python_extra.c hack.diff
        which swig 2>&1 >>/dev/null && echo "#include \"mod_python_extra.c\"" >> mod_python_wrap.cpp
        which swig 2>&1 >>/dev/null && patch -s -p0 -i hack.diff
 
-local_install:
+install:
        mkdir -m755 -p $(DESTDIR)$(PYTHON_SITE_DIR)
        cp -f freeswitch.py $(DESTDIR)$(PYTHON_SITE_DIR)
 
diff --git a/src/mod/languages/mod_yaml/Makefile b/src/mod/languages/mod_yaml/Makefile
deleted file mode 100644 (file)
index 57a594a..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-BASE=../../../..
-
-YAMLLIB=$(switch_srcdir)/libs/yaml
-YAMLBUILDLIB=$(switch_builddir)/libs/yaml
-LIBYAML_A=$(YAMLBUILDLIB)/src/.libs/libyaml.a
-LOCAL_CFLAGS=-I$(YAMLLIB)/include
-LOCAL_LIBADD=$(LIBYAML_A)
-VERBOSE=1
-
-include $(BASE)/build/modmake.rules
-
-local_depend: $(LIBYAML_A)
-
-$(LIBYAML_A):
-       mkdir -p $(YAMLBUILDLIB)
-       cd $(YAMLBUILDLIB) && $(DEFAULT_VARS) $(YAMLLIB)/configure $(DEFAULT_ARGS) --srcdir=$(YAMLLIB)
-       cd $(YAMLBUILDLIB) && $(MAKE)
-
-yamlclean:
-       cd $(YAMLBUILDLIB) && $(MAKE) clean
-
diff --git a/src/mod/languages/mod_yaml/Makefile.am b/src/mod/languages/mod_yaml/Makefile.am
new file mode 100644 (file)
index 0000000..8081dbc
--- /dev/null
@@ -0,0 +1,23 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_yaml
+
+YAMLLIB=$(switch_srcdir)/libs/yaml
+YAMLBUILDLIB=$(switch_builddir)/libs/yaml
+LIBYAML_A=$(YAMLBUILDLIB)/src/.libs/libyaml.a
+
+mod_LTLIBRARIES = mod_yaml.la
+mod_yaml_la_SOURCES  = mod_yaml.c
+mod_yaml_la_CFLAGS   = $(AM_CFLAGS) -I$(YAMLLIB)/include
+mod_yaml_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LIBYAML_A)
+mod_yaml_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+BUILT_SOURCES=$(LIBYAML_A)
+
+$(LIBYAML_A):
+       mkdir -p $(YAMLBUILDLIB)
+       cd $(YAMLBUILDLIB) && $(DEFAULT_VARS) $(YAMLLIB)/configure $(DEFAULT_ARGS) --srcdir=$(YAMLLIB) --with-pic
+       cd $(YAMLBUILDLIB) && $(MAKE)
+
+yamlclean:
+       cd $(YAMLBUILDLIB) && $(MAKE) clean
+
diff --git a/src/mod/loggers/mod_console/Makefile.am b/src/mod/loggers/mod_console/Makefile.am
new file mode 100644 (file)
index 0000000..2e89298
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_console
+
+mod_LTLIBRARIES = mod_console.la
+mod_console_la_SOURCES  = mod_console.c
+mod_console_la_CFLAGS   = $(AM_CFLAGS)
+mod_console_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_console_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/loggers/mod_logfile/Makefile.am b/src/mod/loggers/mod_logfile/Makefile.am
new file mode 100644 (file)
index 0000000..d1acc68
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_logfile
+
+mod_LTLIBRARIES = mod_logfile.la
+mod_logfile_la_SOURCES  = mod_logfile.c
+mod_logfile_la_CFLAGS   = $(AM_CFLAGS)
+mod_logfile_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_logfile_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/loggers/mod_syslog/Makefile.am b/src/mod/loggers/mod_syslog/Makefile.am
new file mode 100644 (file)
index 0000000..20f8dbc
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_syslog
+
+mod_LTLIBRARIES = mod_syslog.la
+mod_syslog_la_SOURCES  = mod_syslog.c
+mod_syslog_la_CFLAGS   = $(AM_CFLAGS)
+mod_syslog_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_syslog_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_de/Makefile.am b/src/mod/say/mod_say_de/Makefile.am
new file mode 100644 (file)
index 0000000..93d9a9f
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_de
+
+mod_LTLIBRARIES = mod_say_de.la
+mod_say_de_la_SOURCES  = mod_say_de.c
+mod_say_de_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_de_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_de_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_en/Makefile.am b/src/mod/say/mod_say_en/Makefile.am
new file mode 100644 (file)
index 0000000..d82bc97
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_en
+
+mod_LTLIBRARIES = mod_say_en.la
+mod_say_en_la_SOURCES  = mod_say_en.c
+mod_say_en_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_en_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_en_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_es/Makefile.am b/src/mod/say/mod_say_es/Makefile.am
new file mode 100644 (file)
index 0000000..343f8d0
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_es
+
+mod_LTLIBRARIES = mod_say_es.la
+mod_say_es_la_SOURCES  = mod_say_es.c
+mod_say_es_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_es_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_es_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_fa/Makefile.am b/src/mod/say/mod_say_fa/Makefile.am
new file mode 100644 (file)
index 0000000..5ecc970
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_fa
+
+mod_LTLIBRARIES = mod_say_fa.la
+mod_say_fa_la_SOURCES  = mod_say_fa.c
+mod_say_fa_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_fa_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_fa_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_fr/Makefile.am b/src/mod/say/mod_say_fr/Makefile.am
new file mode 100644 (file)
index 0000000..dcc1738
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_fr
+
+mod_LTLIBRARIES = mod_say_fr.la
+mod_say_fr_la_SOURCES  = mod_say_fr.c
+mod_say_fr_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_fr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_fr_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_he/Makefile b/src/mod/say/mod_say_he/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/say/mod_say_he/Makefile.am b/src/mod/say/mod_say_he/Makefile.am
new file mode 100644 (file)
index 0000000..585c8ed
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_he
+
+mod_LTLIBRARIES = mod_say_he.la
+mod_say_he_la_SOURCES  = mod_say_he.c
+mod_say_he_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_he_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_he_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_hr/Makefile b/src/mod/say/mod_say_hr/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/say/mod_say_hr/Makefile.am b/src/mod/say/mod_say_hr/Makefile.am
new file mode 100644 (file)
index 0000000..e22da4e
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_hr
+
+mod_LTLIBRARIES = mod_say_hr.la
+mod_say_hr_la_SOURCES  = mod_say_hr.c
+mod_say_hr_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_hr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_hr_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_hu/Makefile b/src/mod/say/mod_say_hu/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/say/mod_say_hu/Makefile.am b/src/mod/say/mod_say_hu/Makefile.am
new file mode 100644 (file)
index 0000000..bae6c18
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_hu
+
+mod_LTLIBRARIES = mod_say_hu.la
+mod_say_hu_la_SOURCES  = mod_say_hu.c
+mod_say_hu_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_hu_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_hu_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_it/Makefile.am b/src/mod/say/mod_say_it/Makefile.am
new file mode 100644 (file)
index 0000000..08227c7
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_it
+
+mod_LTLIBRARIES = mod_say_it.la
+mod_say_it_la_SOURCES  = mod_say_it.c
+mod_say_it_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_it_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_it_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_ja/Makefile.am b/src/mod/say/mod_say_ja/Makefile.am
new file mode 100644 (file)
index 0000000..098c789
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_ja
+
+mod_LTLIBRARIES = mod_say_ja.la
+mod_say_ja_la_SOURCES  = mod_say_ja.c
+mod_say_ja_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_ja_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_ja_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_nl/Makefile.am b/src/mod/say/mod_say_nl/Makefile.am
new file mode 100644 (file)
index 0000000..50271e0
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_nl
+
+mod_LTLIBRARIES = mod_say_nl.la
+mod_say_nl_la_SOURCES  = mod_say_nl.c
+mod_say_nl_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_nl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_nl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_pl/Makefile b/src/mod/say/mod_say_pl/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/say/mod_say_pl/Makefile.am b/src/mod/say/mod_say_pl/Makefile.am
new file mode 100644 (file)
index 0000000..9ba9a38
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_pl
+
+mod_LTLIBRARIES = mod_say_pl.la
+mod_say_pl_la_SOURCES  = mod_say_pl.c
+mod_say_pl_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_pl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_pl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_pt/Makefile b/src/mod/say/mod_say_pt/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/say/mod_say_pt/Makefile.am b/src/mod/say/mod_say_pt/Makefile.am
new file mode 100644 (file)
index 0000000..7cc7821
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_pt
+
+mod_LTLIBRARIES = mod_say_pt.la
+mod_say_pt_la_SOURCES  = mod_say_pt.c
+mod_say_pt_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_pt_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_pt_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_ru/Makefile.am b/src/mod/say/mod_say_ru/Makefile.am
new file mode 100644 (file)
index 0000000..d10896d
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_ru
+
+mod_LTLIBRARIES = mod_say_ru.la
+mod_say_ru_la_SOURCES  = mod_say_ru.c
+mod_say_ru_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_ru_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_ru_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_sv/Makefile b/src/mod/say/mod_say_sv/Makefile
deleted file mode 100644 (file)
index 2c35e6e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-BASE=../../../..
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/say/mod_say_sv/Makefile.am b/src/mod/say/mod_say_sv/Makefile.am
new file mode 100644 (file)
index 0000000..b969785
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_sv
+
+mod_LTLIBRARIES = mod_say_sv.la
+mod_say_sv_la_SOURCES  = mod_say_sv.c
+mod_say_sv_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_sv_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_sv_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_th/Makefile.am b/src/mod/say/mod_say_th/Makefile.am
new file mode 100644 (file)
index 0000000..7bba017
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_th
+
+mod_LTLIBRARIES = mod_say_th.la
+mod_say_th_la_SOURCES  = mod_say_th.c
+mod_say_th_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_th_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_th_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/say/mod_say_zh/Makefile.am b/src/mod/say/mod_say_zh/Makefile.am
new file mode 100644 (file)
index 0000000..d64ef62
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_say_zh
+
+mod_LTLIBRARIES = mod_say_zh.la
+mod_say_zh_la_SOURCES  = mod_say_zh.c
+mod_say_zh_la_CFLAGS   = $(AM_CFLAGS)
+mod_say_zh_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_say_zh_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/timers/mod_posix_timer/Makefile.am b/src/mod/timers/mod_posix_timer/Makefile.am
new file mode 100644 (file)
index 0000000..80c828f
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_posix_timer
+
+mod_LTLIBRARIES = mod_posix_timer.la
+mod_posix_timer_la_SOURCES  = mod_posix_timer.c
+mod_posix_timer_la_CFLAGS   = $(AM_CFLAGS)
+mod_posix_timer_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_posix_timer_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/timers/mod_timerfd/Makefile.am b/src/mod/timers/mod_timerfd/Makefile.am
new file mode 100644 (file)
index 0000000..09c57fb
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_timerfd
+
+mod_LTLIBRARIES = mod_timerfd.la
+mod_timerfd_la_SOURCES  = mod_timerfd.c
+mod_timerfd_la_CFLAGS   = $(AM_CFLAGS)
+mod_timerfd_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_timerfd_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/xml_int/mod_xml_cdr/Makefile b/src/mod/xml_int/mod_xml_cdr/Makefile
deleted file mode 100644 (file)
index c2baec8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include ../../../../build/modmake.rules
diff --git a/src/mod/xml_int/mod_xml_cdr/Makefile.am b/src/mod/xml_int/mod_xml_cdr/Makefile.am
new file mode 100644 (file)
index 0000000..cd8cf88
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_xml_cdr
+
+mod_LTLIBRARIES = mod_xml_cdr.la
+mod_xml_cdr_la_SOURCES  = mod_xml_cdr.c
+mod_xml_cdr_la_CFLAGS   = $(AM_CFLAGS)
+mod_xml_cdr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_xml_cdr_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
index e00b5ff7c0e6320f925a6c660a20aa543bbc5082..d2bc69cde0e558e79f200b489d92f43f8faa8870 100644 (file)
@@ -30,8 +30,8 @@
  * mod_xml_cdr.c -- XML CDR Module to files or curl
  *
  */
-#include <sys/stat.h>
 #include <switch.h>
+#include <sys/stat.h>
 #include <switch_curl.h>
 #define MAX_URLS 20
 
diff --git a/src/mod/xml_int/mod_xml_curl/Makefile b/src/mod/xml_int/mod_xml_curl/Makefile
deleted file mode 100644 (file)
index c2baec8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include ../../../../build/modmake.rules
diff --git a/src/mod/xml_int/mod_xml_curl/Makefile.am b/src/mod/xml_int/mod_xml_curl/Makefile.am
new file mode 100644 (file)
index 0000000..2e7ccff
--- /dev/null
@@ -0,0 +1,8 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_xml_curl
+
+mod_LTLIBRARIES = mod_xml_curl.la
+mod_xml_curl_la_SOURCES  = mod_xml_curl.c
+mod_xml_curl_la_CFLAGS   = $(AM_CFLAGS)
+mod_xml_curl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_xml_curl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
similarity index 52%
rename from src/mod/xml_int/mod_xml_ldap/Makefile
rename to src/mod/xml_int/mod_xml_ldap/Makefile.am
index 7978fb5cf30c82c16c016967296cc3aff296269f..329d0f3a957fd671d894b24b0d95d3f059835663 100644 (file)
@@ -1,4 +1,5 @@
-BASE=../../../..
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_xml_ldap
 
 LDAP=openldap-2.4.19
 LDAP_DIR=$(switch_srcdir)/libs/$(LDAP)
@@ -8,13 +9,15 @@ LDAPLA=$(LDAP_BUILDDIR)/libraries/libldap_r/libldap_r.la
 LIBLBERLA=$(LDAP_BUILDDIR)/libraries/liblber/liblber.la
 LIBLUTILA=$(LDAP_BUILDDIR)/libraries/liblutil/liblutil.a
 
-LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
+mod_LTLIBRARIES = mod_xml_ldap.la
+mod_xml_ldap_la_SOURCES  = mod_xml_ldap.c
+mod_xml_ldap_la_CFLAGS   = $(AM_CFLAGS) -DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
+mod_xml_ldap_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LDAPLA) $(LIBLBERLA) $(LIBLUTILA)
+mod_xml_ldap_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) $(LIBLUTILA)
+BUILT_SOURCES=$(LDAPLA) $(LIBLBERLA) $(LIBLUTILA)
 
-include $(BASE)/build/modmake.rules
-
-DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb
+DEFAULT_ARGS= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb
 
 $(LDAP_DIR):
        $(GETLIB) $(LDAP).tar.gz
similarity index 62%
rename from src/mod/xml_int/mod_xml_radius/Makefile
rename to src/mod/xml_int/mod_xml_radius/Makefile.am
index 63542dff476eb9c0d196b31c2e5ade818a32a411..a5004ea882727c4b68e9a011cab6dcc15df09aeb 100644 (file)
@@ -1,3 +1,6 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_xml_radius
+
 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_xml_radius.la
+mod_xml_radius_la_SOURCES  = mod_xml_radius.c
+mod_xml_radius_la_CFLAGS   = $(AM_CFLAGS) -I$(RADCLIENT_DIR)/include
+mod_xml_radius_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(RADCLIENT_LA)
+mod_xml_radius_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-BASE=../../../..
-include $(BASE)/build/modmake.rules
+BUILT_SOURCES=$(RADCLIENT_LA)
 
 $(RADCLIENT_DIR):
        $(GETLIB) $(RADCLIENT).tar.gz
diff --git a/src/mod/xml_int/mod_xml_rpc/Makefile b/src/mod/xml_int/mod_xml_rpc/Makefile
deleted file mode 100644 (file)
index 7531ae5..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-MAKEFLAGS=-j1
-BASE=../../../..
-XMLRPC_DIR=$(BASE)/libs/xmlrpc-c
-
-LOCAL_OBJS = $(XMLRPC_DIR)/src/version.o\
-$(XMLRPC_DIR)/lib/libutil/asprintf.o\
-$(XMLRPC_DIR)/lib/util/casprintf.o\
-$(XMLRPC_DIR)/lib/abyss/src/channel.o\
-$(XMLRPC_DIR)/lib/abyss/src/chanswitch.o\
-$(XMLRPC_DIR)/lib/util/cmdline_parser.o\
-$(XMLRPC_DIR)/lib/abyss/src/conf.o\
-$(XMLRPC_DIR)/lib/abyss/src/conn.o\
-$(XMLRPC_DIR)/lib/abyss/src/data.o\
-$(XMLRPC_DIR)/lib/abyss/src/date.o\
-$(XMLRPC_DIR)/src/double.o\
-$(XMLRPC_DIR)/lib/libutil/error.o\
-$(XMLRPC_DIR)/lib/abyss/src/file.o\
-$(XMLRPC_DIR)/lib/expat/gennmtab/gennmtab.o\
-$(XMLRPC_DIR)/lib/util/getoptx.o\
-$(XMLRPC_DIR)/lib/abyss/src/handler.o\
-$(XMLRPC_DIR)/lib/abyss/src/http.o\
-$(XMLRPC_DIR)/lib/abyss/src/init.o\
-$(XMLRPC_DIR)/lib/libutil/make_printable.o\
-$(XMLRPC_DIR)/lib/libutil/memblock.o\
-$(XMLRPC_DIR)/src/method.o\
-$(XMLRPC_DIR)/src/parse_value.o\
-$(XMLRPC_DIR)/src/parse_datetime.o\
-$(XMLRPC_DIR)/src/registry.o\
-$(XMLRPC_DIR)/src/resource.o\
-$(XMLRPC_DIR)/lib/abyss/src/response.o\
-$(XMLRPC_DIR)/lib/libutil/select.o\
-$(XMLRPC_DIR)/lib/abyss/src/server.o\
-$(XMLRPC_DIR)/lib/abyss/src/session.o\
-$(XMLRPC_DIR)/lib/libutil/sleep.o\
-$(XMLRPC_DIR)/lib/abyss/src/socket.o\
-$(XMLRPC_DIR)/lib/abyss/src/socket_unix.o\
-$(XMLRPC_DIR)/lib/util/string_parser.o\
-$(XMLRPC_DIR)/lib/util/stripcaseeq.o\
-$(XMLRPC_DIR)/src/system_method.o\
-$(XMLRPC_DIR)/lib/abyss/src/thread_pthread.o\
-$(XMLRPC_DIR)/lib/libutil/time.o\
-$(XMLRPC_DIR)/lib/abyss/src/token.o\
-$(XMLRPC_DIR)/src/trace.o\
-$(XMLRPC_DIR)/lib/abyss/src/trace.o\
-$(XMLRPC_DIR)/lib/libutil/utf8.o\
-$(XMLRPC_DIR)/lib/libutil/string_number.o\
-$(XMLRPC_DIR)/lib/libutil/base64.o\
-$(XMLRPC_DIR)/lib/expat/xmlparse/xmlparse.o\
-$(XMLRPC_DIR)/lib/expat/xmltok/xmlrole.o\
-$(XMLRPC_DIR)/src/xmlrpc_array.o\
-$(XMLRPC_DIR)/src/xmlrpc_authcookie.o\
-$(XMLRPC_DIR)/src/xmlrpc_base64.o\
-$(XMLRPC_DIR)/src/xmlrpc_build.o\
-$(XMLRPC_DIR)/src/xmlrpc_data.o\
-$(XMLRPC_DIR)/src/xmlrpc_datetime.o\
-$(XMLRPC_DIR)/src/xmlrpc_decompose.o\
-$(XMLRPC_DIR)/src/xmlrpc_expat.o\
-$(XMLRPC_DIR)/src/xmlrpc_parse.o\
-$(XMLRPC_DIR)/src/xmlrpc_serialize.o\
-$(XMLRPC_DIR)/src/xmlrpc_server_abyss.o\
-$(XMLRPC_DIR)/src/xmlrpc_server_cgi.o\
-$(XMLRPC_DIR)/src/xmlrpc_string.o\
-$(XMLRPC_DIR)/src/xmlrpc_struct.o\
-$(XMLRPC_DIR)/lib/expat/xmltok/xmltok.o\
-ws.o
-
-LOCAL_CFLAGS = -w -I$(XMLRPC_DIR)/lib/expat/xmlparse -I$(XMLRPC_DIR)/lib/expat/xmltok -I$(XMLRPC_DIR) -I$(XMLRPC_DIR)/include
-LOCAL_CFLAGS+= -I$(XMLRPC_DIR)/lib/abyss/src -I$(XMLRPC_DIR)/lib/util/include -D_THREAD -D__EXTENSIONS__
-LOCAL_CFLAGS+= -I.
-
-include $(BASE)/build/modmake.rules
-
-$(XMLRPCLAS): $(XMLRPC_DIR) $(XMLRPC_DIR)/.update
-       cd $(XMLRPC_DIR) && $(MAKE)
-       $(TOUCH_TARGET)
-
-$(XMLRPC_DIR)/lib/expat/xmltok/xmltok.o: $(XMLRPC_DIR)/lib/expat/xmltok/nametab.h
-
-$(XMLRPC_DIR)/lib/expat/xmltok/nametab.h:
-       cd $(XMLRPC_DIR)/lib/expat/gennmtab && $(MAKE)
-       cd $(XMLRPC_DIR)/lib/expat/xmltok   && ../gennmtab/gennmtab > nametab.h
-
-$(XMLRPC_DIR)/src/version.o: $(XMLRPC_DIR)/version.h
-
-$(XMLRPC_DIR)/version.h:
-       cd $(XMLRPC_DIR) && $(MAKE) version.h
-       cd $(XMLRPC_DIR)/include && $(MAKE) xmlrpc-c/config.h
-
-local_clean:
-       cd $(XMLRPC_DIR) && $(MAKE) clean
-
-
-
diff --git a/src/mod/xml_int/mod_xml_rpc/Makefile.am b/src/mod/xml_int/mod_xml_rpc/Makefile.am
new file mode 100644 (file)
index 0000000..c089a11
--- /dev/null
@@ -0,0 +1,95 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_xml_rpc
+
+MAKEFLAGS=-j1
+XMLRPC_DIR=$(switch_srcdir)/libs/xmlrpc-c
+
+mod_LTLIBRARIES = mod_xml_rpc.la
+mod_xml_rpc_la_SOURCES  = mod_xml_rpc.c
+mod_xml_rpc_la_CFLAGS   = $(AM_CFLAGS) -I. -w -I$(XMLRPC_DIR)/lib/expat/xmlparse 
+mod_xml_rpc_la_CFLAGS  += -I$(XMLRPC_DIR)/lib/expat/xmltok -I$(XMLRPC_DIR) -I$(XMLRPC_DIR)/include 
+mod_xml_rpc_la_CFLAGS  += -I$(XMLRPC_DIR)/lib/abyss/src -I$(XMLRPC_DIR)/lib/util/include -D_THREAD -D__EXTENSIONS__ -D_GNU_SOURCE
+mod_xml_rpc_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_xml_rpc_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+mod_xml_rpc_la_SOURCES += $(XMLRPC_DIR)/src/version.c\
+$(XMLRPC_DIR)/lib/libutil/asprintf.c\
+$(XMLRPC_DIR)/lib/util/casprintf.c\
+$(XMLRPC_DIR)/lib/abyss/src/channel.c\
+$(XMLRPC_DIR)/lib/abyss/src/chanswitch.c\
+$(XMLRPC_DIR)/lib/util/cmdline_parser.c\
+$(XMLRPC_DIR)/lib/abyss/src/conf.c\
+$(XMLRPC_DIR)/lib/abyss/src/conn.c\
+$(XMLRPC_DIR)/lib/abyss/src/data.c\
+$(XMLRPC_DIR)/lib/abyss/src/date.c\
+$(XMLRPC_DIR)/src/double.c\
+$(XMLRPC_DIR)/lib/libutil/error.c\
+$(XMLRPC_DIR)/lib/abyss/src/file.c\
+$(XMLRPC_DIR)/lib/expat/gennmtab/gennmtab.c\
+$(XMLRPC_DIR)/lib/util/getoptx.c\
+$(XMLRPC_DIR)/lib/abyss/src/handler.c\
+$(XMLRPC_DIR)/lib/abyss/src/http.c\
+$(XMLRPC_DIR)/lib/abyss/src/init.c\
+$(XMLRPC_DIR)/lib/libutil/make_printable.c\
+$(XMLRPC_DIR)/lib/libutil/memblock.c\
+$(XMLRPC_DIR)/src/method.c\
+$(XMLRPC_DIR)/src/parse_value.c\
+$(XMLRPC_DIR)/src/parse_datetime.c\
+$(XMLRPC_DIR)/src/registry.c\
+$(XMLRPC_DIR)/src/resource.c\
+$(XMLRPC_DIR)/lib/abyss/src/response.c\
+$(XMLRPC_DIR)/lib/libutil/select.c\
+$(XMLRPC_DIR)/lib/abyss/src/server.c\
+$(XMLRPC_DIR)/lib/abyss/src/session.c\
+$(XMLRPC_DIR)/lib/libutil/sleep.c\
+$(XMLRPC_DIR)/lib/abyss/src/socket.c\
+$(XMLRPC_DIR)/lib/abyss/src/socket_unix.c\
+$(XMLRPC_DIR)/lib/util/string_parser.c\
+$(XMLRPC_DIR)/lib/util/stripcaseeq.c\
+$(XMLRPC_DIR)/src/system_method.c\
+$(XMLRPC_DIR)/lib/abyss/src/thread_pthread.c\
+$(XMLRPC_DIR)/lib/libutil/time.c\
+$(XMLRPC_DIR)/lib/abyss/src/token.c\
+$(XMLRPC_DIR)/src/xml_trace.c\
+$(XMLRPC_DIR)/lib/abyss/src/trace.c\
+$(XMLRPC_DIR)/lib/libutil/utf8.c\
+$(XMLRPC_DIR)/lib/libutil/string_number.c\
+$(XMLRPC_DIR)/lib/libutil/base64.c\
+$(XMLRPC_DIR)/lib/expat/xmlparse/xmlparse.c\
+$(XMLRPC_DIR)/lib/expat/xmltok/xmlrole.c\
+$(XMLRPC_DIR)/src/xmlrpc_array.c\
+$(XMLRPC_DIR)/src/xmlrpc_authcookie.c\
+$(XMLRPC_DIR)/src/xmlrpc_base64.c\
+$(XMLRPC_DIR)/src/xmlrpc_build.c\
+$(XMLRPC_DIR)/src/xmlrpc_data.c\
+$(XMLRPC_DIR)/src/xmlrpc_datetime.c\
+$(XMLRPC_DIR)/src/xmlrpc_decompose.c\
+$(XMLRPC_DIR)/src/xmlrpc_expat.c\
+$(XMLRPC_DIR)/src/xmlrpc_parse.c\
+$(XMLRPC_DIR)/src/xmlrpc_serialize.c\
+$(XMLRPC_DIR)/src/xmlrpc_server_abyss.c\
+$(XMLRPC_DIR)/src/xmlrpc_server_cgi.c\
+$(XMLRPC_DIR)/src/xmlrpc_string.c\
+$(XMLRPC_DIR)/src/xmlrpc_struct.c\
+$(XMLRPC_DIR)/lib/expat/xmltok/xmltok.c\
+ws.c
+
+BUILT_SOURCES=$(XMLRPC_DIR)/version.h $(XMLRPC_DIR)/lib/expat/xmltok/nametab.h
+$(XMLRPC_DIR)/lib/expat/xmltok/xmltok.o: $(XMLRPC_DIR)/lib/expat/xmltok/nametab.h
+
+$(XMLRPC_DIR)/lib/expat/xmltok/nametab.h:
+       cd $(XMLRPC_DIR)/lib/expat/gennmtab && $(MAKE)
+       cd $(XMLRPC_DIR)/lib/expat/xmltok   && ../gennmtab/gennmtab > nametab.h
+
+$(XMLRPC_DIR)/src/version.o: $(XMLRPC_DIR)/version.h
+
+$(XMLRPC_DIR)/version.h:
+       cd $(XMLRPC_DIR) && $(MAKE) version.h
+       cd $(XMLRPC_DIR)/include && $(MAKE) xmlrpc-c/config.h
+
+clean:
+       cd $(XMLRPC_DIR) && $(MAKE) clean
+
+
+
+
diff --git a/src/mod/xml_int/mod_xml_scgi/Makefile b/src/mod/xml_int/mod_xml_scgi/Makefile
deleted file mode 100644 (file)
index 2c7a91d..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-BASE=../../../..
-LOCAL_SOURCES = $(BASE)/libs/libscgi/src/scgi.c
-LOCAL_OBJS = $(BASE)/libs/libscgi/src/scgi.o
-LOCAL_CFLAGS = -I. -I$(BASE)/libs/libscgi/src/include
-include $(BASE)/build/modmake.rules
diff --git a/src/mod/xml_int/mod_xml_scgi/Makefile.am b/src/mod/xml_int/mod_xml_scgi/Makefile.am
new file mode 100644 (file)
index 0000000..7727d99
--- /dev/null
@@ -0,0 +1,7 @@
+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_xml_scgi
+mod_LTLIBRARIES = mod_xml_scgi.la
+mod_xml_scgi_la_SOURCES  = mod_xml_scgi.c $(switch_srcdir)/libs/libscgi/src/scgi.c
+mod_xml_scgi_la_CFLAGS   = $(AM_CFLAGS)  -I. -I$(switch_srcdir)/libs/libscgi/src/include -D_GNU_SOURCE
+mod_xml_scgi_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_xml_scgi_la_LDFLAGS  = -avoid-version -module -no-undefined -shared