From c993962d0b034c40528d0bf2f951f8ef1714d8a0 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Thu, 20 Mar 2014 19:41:13 +0000 Subject: [PATCH] Update some modules to use CPPFLAGS These modules use curl and we'll be adding in some bits to the CPPFLAGS. --- src/mod/applications/mod_cidlookup/Makefile.am | 1 + src/mod/applications/mod_curl/Makefile.am | 1 + src/mod/applications/mod_httapi/Makefile.am | 1 + src/mod/applications/mod_http_cache/Makefile.am | 1 + src/mod/applications/mod_snom/Makefile.am | 1 + src/mod/event_handlers/mod_format_cdr/Makefile.am | 1 + src/mod/event_handlers/mod_json_cdr/Makefile.am | 1 + src/mod/formats/mod_shout/Makefile.am | 2 +- src/mod/xml_int/mod_xml_curl/Makefile.am | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_cidlookup/Makefile.am b/src/mod/applications/mod_cidlookup/Makefile.am index c908e2717a..cfa5396077 100644 --- 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 6e0debb65f..171d9ce027 100644 --- 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 31452d6952..c9a79fb5eb 100644 --- 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 b03e43a247..a6bbad6a83 100644 --- 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 0551c854e2..d8931966f1 100644 --- 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 1867de159a..20a744791a 100644 --- 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 a81462999a..01d06a3652 100644 --- 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 bb679fd3c2..cda4e17d2e 100644 --- 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 2e7ccff8a4..a07755213b 100644 --- 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