Update some modules to use CPPFLAGS

These modules use curl and we'll be adding in some bits to the
CPPFLAGS.

diff --git a/src/mod/applications/mod_cidlookup/Makefile.am b/src/mod/applications/mod_cidlookup/Makefile.am
index c908e2717a6e219454032f7e7f7763b2649bc557..cfa53960770e60d49dd587e449d6cf12112d01a9 100644 (file)
--- a/src/mod/applications/mod_cidlookup/Makefile.am
+++ b/src/mod/applications/mod_cidlookup/Makefile.am
@@ -4,5 +4,6 @@ MODNAME=mod_cidlookup
 mod_LTLIBRARIES = mod_cidlookup.la
 mod_cidlookup_la_SOURCES  = mod_cidlookup.c
 mod_cidlookup_la_CFLAGS   = $(AM_CFLAGS)
+mod_cidlookup_la_CPPFLAGS   = $(AM_CPPFLAGS)
 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_curl/Makefile.am b/src/mod/applications/mod_curl/Makefile.am
index 6e0debb65fa54cc7a8dd30f7723e7317f6e43dab..171d9ce0279d464fe23f176ce89a41863071b57b 100644 (file)
--- a/src/mod/applications/mod_curl/Makefile.am
+++ b/src/mod/applications/mod_curl/Makefile.am
@@ -11,6 +11,7 @@ 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_CPPFLAGS = $(AM_CPPFLAGS)
 mod_curl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(JSONLA)
 mod_curl_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
index 31452d695224f764211f95c113e8126a50386cd5..c9a79fb5eb49567c0b619c048f8545c663e3bc0e 100644 (file)
--- a/src/mod/applications/mod_httapi/Makefile.am
+++ b/src/mod/applications/mod_httapi/Makefile.am
@@ -4,5 +4,6 @@ MODNAME=mod_httapi
 mod_LTLIBRARIES = mod_httapi.la
 mod_httapi_la_SOURCES  = mod_httapi.c
 mod_httapi_la_CFLAGS   = $(AM_CFLAGS)
+mod_httapi_la_CPPFLAGS = $(AM_CPPFLAGS)
 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.am b/src/mod/applications/mod_http_cache/Makefile.am
index b03e43a24704fc00c6d6c009e742cea7ecd7de5d..a6bbad6a8322204e2216ed2043d6378d8878944e 100644 (file)
--- a/src/mod/applications/mod_http_cache/Makefile.am
+++ b/src/mod/applications/mod_http_cache/Makefile.am
@@ -4,5 +4,6 @@ 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_CPPFLAGS = $(AM_CPPFLAGS)
 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_snom/Makefile.am b/src/mod/applications/mod_snom/Makefile.am
index 0551c854e235896502027e2cd83457d6b18838db..d8931966f171697c57c8e81edd2a310f9a0b721f 100644 (file)
--- a/src/mod/applications/mod_snom/Makefile.am
+++ b/src/mod/applications/mod_snom/Makefile.am
@@ -4,5 +4,6 @@ MODNAME=mod_snom
 mod_LTLIBRARIES = mod_snom.la
 mod_snom_la_SOURCES  = mod_snom.c
 mod_snom_la_CFLAGS   = $(AM_CFLAGS)
+mod_snom_la_CPPFLAGS = $(AM_CPPFLAGS)
 mod_snom_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_snom_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

diff --git a/src/mod/event_handlers/mod_format_cdr/Makefile.am b/src/mod/event_handlers/mod_format_cdr/Makefile.am
index 1867de159a537cc511b133c786234e9bc0f1a4b9..20a744791af6b59037e2ca92307684a9b4fa905c 100644 (file)
--- a/src/mod/event_handlers/mod_format_cdr/Makefile.am
+++ b/src/mod/event_handlers/mod_format_cdr/Makefile.am
@@ -4,5 +4,6 @@ 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_CPPFLAGS = $(AM_CPPFLAGS)
 mod_format_cdr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_format_cdr_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

diff --git a/src/mod/event_handlers/mod_json_cdr/Makefile.am b/src/mod/event_handlers/mod_json_cdr/Makefile.am
index a81462999a31d63f1334d00c017d8dc9a61a49a9..01d06a3652dfa369029835a659b05ac6a6ab74d7 100644 (file)
--- a/src/mod/event_handlers/mod_json_cdr/Makefile.am
+++ b/src/mod/event_handlers/mod_json_cdr/Makefile.am
@@ -4,5 +4,6 @@ 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_CPPFLAGS = $(AM_CPPFLAGS)
 mod_json_cdr_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_json_cdr_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

diff --git a/src/mod/formats/mod_shout/Makefile.am b/src/mod/formats/mod_shout/Makefile.am
index bb679fd3c274b67b11ae8e1d27dc8cfc05d04ea9..cda4e17d2e2e727f9c20c9ec3549c5d4adc2da07 100644 (file)
--- a/src/mod/formats/mod_shout/Makefile.am
+++ b/src/mod/formats/mod_shout/Makefile.am
@@ -20,7 +20,7 @@ MPG123LA=$(MPG123_BUILDDIR)/src/libmpg123/libmpg123.la
 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_CPPFLAGS = $(AM_CPPFLAGS) -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"`
 

diff --git a/src/mod/xml_int/mod_xml_curl/Makefile.am b/src/mod/xml_int/mod_xml_curl/Makefile.am
index 2e7ccff8a4c0748e6a0c3cf71a22e7a9199deed7..a07755213b0c5a1f4fac03c31c7b095cf1ca78cc 100644 (file)
--- a/src/mod/xml_int/mod_xml_curl/Makefile.am
+++ b/src/mod/xml_int/mod_xml_curl/Makefile.am
@@ -4,5 +4,6 @@ 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_CPPFLAGS = $(AM_CPPFLAGS)
 mod_xml_curl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_xml_curl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared