From 15c79424e93047e5af9a5a53b66f0c40949ef0d6 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Thu, 9 Jun 2011 18:14:00 -0400
Subject: [PATCH] always use our includes first so we use our srcdir headers
 over installed versions

---
 libs/freetdm/Makefile.am | 42 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/libs/freetdm/Makefile.am b/libs/freetdm/Makefile.am
index b0398ef90c..ef63120dfb 100644
--- a/libs/freetdm/Makefile.am
+++ b/libs/freetdm/Makefile.am
@@ -98,7 +98,7 @@ library_include_HEADERS = \
 	$(SRC)/include/ftdm_dso.h 
 
 lib_LTLIBRARIES	       = libfreetdm.la
-libfreetdm_la_CFLAGS   = $(AM_CFLAGS) $(FTDM_CFLAGS)
+libfreetdm_la_CFLAGS   = $(FTDM_CFLAGS) $(AM_CFLAGS)
 libfreetdm_la_LDFLAGS  = -version-info 1:0:0 $(AM_LDFLAGS)
 libfreetdm_la_LIBADD   = $(LIBS)
 
@@ -112,39 +112,39 @@ noinst_PROGRAMS  = testtones detect_tones detect_dtmf testpri testr2 testanalog
 
 testapp_SOURCES = $(SRC)/testapp.c
 testapp_LDADD   = libfreetdm.la
-testapp_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+testapp_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 
 testcid_SOURCES = $(SRC)/testcid.c
 testcid_LDADD   = libfreetdm.la
-testcid_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+testcid_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 
 testtones_SOURCES = $(SRC)/testtones.c
 testtones_LDADD   = libfreetdm.la
-testtones_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+testtones_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 
 detect_tones_SOURCES = $(SRC)/detect_tones.c
 detect_tones_LDADD   = libfreetdm.la
-detect_tones_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+detect_tones_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 
 detect_dtmf_SOURCES = $(SRC)/detect_dtmf.c
 detect_dtmf_LDADD   = libfreetdm.la
-detect_dtmf_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+detect_dtmf_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 
 #testisdn_SOURCES = $(SRC)/testisdn.c
 #testisdn_LDADD   = libfreetdm.la
-#testisdn_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+#testisdn_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 
 testpri_SOURCES = $(SRC)/testpri.c
 testpri_LDADD   = libfreetdm.la
-testpri_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+testpri_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 
 testr2_SOURCES = $(SRC)/testr2.c
 testr2_LDADD   = libfreetdm.la
-testr2_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+testr2_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 
 testanalog_SOURCES = $(SRC)/testanalog.c
 testanalog_LDADD   = libfreetdm.la
-testanalog_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+testanalog_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 
 #
 # ftmod modules
@@ -152,22 +152,22 @@ testanalog_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_analog.la ftmod_analog_em.la
 
 ftmod_zt_la_SOURCES = $(SRC)/ftmod/ftmod_zt/ftmod_zt.c
-ftmod_zt_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_zt_la_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 ftmod_zt_la_LDFLAGS = -shared -module -avoid-version
 ftmod_zt_la_LIBADD  = libfreetdm.la
 
 ftmod_skel_la_SOURCES = $(SRC)/ftmod/ftmod_skel/ftmod_skel.c
-ftmod_skel_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_skel_la_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 ftmod_skel_la_LDFLAGS = -module -avoid-version
 ftmod_skel_la_LIBADD  = libfreetdm.la
 
 ftmod_analog_la_SOURCES = $(SRC)/ftmod/ftmod_analog/ftmod_analog.c
-ftmod_analog_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_analog_la_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 ftmod_analog_la_LDFLAGS = -shared -module -avoid-version
 ftmod_analog_la_LIBADD  = libfreetdm.la
 
 ftmod_analog_em_la_SOURCES = $(SRC)/ftmod/ftmod_analog_em/ftmod_analog_em.c
-ftmod_analog_em_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_analog_em_la_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 ftmod_analog_em_la_LDFLAGS = -shared -module -avoid-version
 ftmod_analog_em_la_LIBADD  = libfreetdm.la
 
@@ -176,7 +176,7 @@ mod_LTLIBRARIES += ftmod_wanpipe.la
 ftmod_wanpipe_la_SOURCES = $(SRC)/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
 # some structures within Wanpipe drivers are not c99 compatible, so we need to compile ftmod_wanpipe
 # without c99 flags, use FTDM_COMPAT_CFLAGS instead
-ftmod_wanpipe_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_COMPAT_CFLAGS) -D__LINUX__ -I/usr/include/wanpipe
+ftmod_wanpipe_la_CFLAGS  = $(FTDM_COMPAT_CFLAGS) $(AM_CFLAGS) -D__LINUX__ -I/usr/include/wanpipe
 ftmod_wanpipe_la_LDFLAGS = -shared -module -avoid-version -lsangoma
 ftmod_wanpipe_la_LIBADD  = libfreetdm.la
 endif
@@ -184,7 +184,7 @@ endif
 if HAVE_LIBISDN
 mod_LTLIBRARIES += ftmod_isdn.la
 ftmod_isdn_la_SOURCES  = $(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c
-ftmod_isdn_la_CFLAGS   = $(AM_CFLAGS) $(FTDM_CFLAGS) -D_GNU_SOURCE $(LIBISDN_CPPFLAGS) $(PCAP_CPPFLAGS)
+ftmod_isdn_la_CFLAGS   = $(FTDM_CFLAGS) $(AM_CFLAGS) -D_GNU_SOURCE $(LIBISDN_CPPFLAGS) $(PCAP_CPPFLAGS)
 ftmod_isdn_la_LDFLAGS  = -shared -module -avoid-version $(LIBISDN_LDFLAGS) $(PCAP_LDFLAGS)
 ftmod_isdn_la_LIBADD   = libfreetdm.la $(LIBISDN_LIBS) $(PCAP_LIBS)
 endif
@@ -192,7 +192,7 @@ endif
 if HAVE_LIBPRI
 mod_LTLIBRARIES += ftmod_libpri.la
 ftmod_libpri_la_SOURCES = $(SRC)/ftmod/ftmod_libpri/ftmod_libpri.c $(SRC)/ftmod/ftmod_libpri/lpwrap_pri.c
-ftmod_libpri_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_libpri_la_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 ftmod_libpri_la_LDFLAGS = -shared -module -avoid-version -lpri
 ftmod_libpri_la_LIBADD  = libfreetdm.la
 endif
@@ -200,7 +200,7 @@ endif
 if HAVE_PRITAP
 mod_LTLIBRARIES += ftmod_pritap.la
 ftmod_pritap_la_SOURCES = $(SRC)/ftmod/ftmod_pritap/ftmod_pritap.c 
-ftmod_pritap_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_pritap_la_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 ftmod_pritap_la_LDFLAGS = -shared -module -avoid-version -lpri
 ftmod_pritap_la_LIBADD  = libfreetdm.la
 endif
@@ -223,7 +223,7 @@ ftmod_sangoma_ss7_la_SOURCES = \
 	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c \
 	$(SRC)/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
 
-ftmod_sangoma_ss7_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS) -D_GNU_SOURCE
+ftmod_sangoma_ss7_la_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS) -D_GNU_SOURCE
 ftmod_sangoma_ss7_la_LDFLAGS = -shared -module -avoid-version -lsng_ss7
 ftmod_sangoma_ss7_la_LIBADD  = libfreetdm.la
 endif
@@ -243,7 +243,7 @@ ftmod_sangoma_isdn_la_SOURCES = \
 	$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c \
 	$(SRC)/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
 
-ftmod_sangoma_isdn_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS) -D_GNU_SOURCE
+ftmod_sangoma_isdn_la_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS) -D_GNU_SOURCE
 ftmod_sangoma_isdn_la_LDFLAGS = -shared -module -avoid-version -lsng_isdn
 ftmod_sangoma_isdn_la_LIBADD  = libfreetdm.la
 endif
@@ -251,7 +251,7 @@ endif
 if HAVE_OPENR2
 mod_LTLIBRARIES += ftmod_r2.la
 ftmod_r2_la_SOURCES = $(SRC)/ftmod/ftmod_r2/ftmod_r2.c  $(SRC)/ftmod/ftmod_r2/ftmod_r2_io_mf_lib.c
-ftmod_r2_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
+ftmod_r2_la_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
 ftmod_r2_la_LDFLAGS = -shared -module -avoid-version -lopenr2
 ftmod_r2_la_LIBADD  = libfreetdm.la
 endif