remove redundant CFLAGS for BSD which are already set in the main Makefile (issue...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8101 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/Makefile b/apps/Makefile
index acd76bb..2930309 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -50,10 +50,6 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_CO
 APPS+=app_osplookup.so
 endif
 
-ifeq ($(findstring BSD,${OSARCH}),BSD)
-CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
-endif
-
 CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
 ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
   ifneq (${CURLLIBS},)

diff --git a/channels/Makefile b/channels/Makefile
index 56935d9..4c61b48 100644 (file)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -16,10 +16,6 @@
 
 CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so chan_skinny.so chan_features.so
 
-ifeq ($(findstring BSD,${OSARCH}),BSD)
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
-endif
-
 ifeq (${OSARCH},OpenBSD)
   PTLIB=-lpt_OpenBSD_x86_r
   H323LIB=-lh323_OpenBSD_x86_r

diff --git a/codecs/Makefile b/codecs/Makefile
index c499941..49c041a 100644 (file)
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -74,10 +74,6 @@ endif
 
 LIBLPC10=lpc10/liblpc10.a
 
-ifeq ($(findstring BSD,${OSARCH}),BSD)
-  CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
-endif
-
 CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so  \
         codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
        codec_g726.so

diff --git a/formats/Makefile b/formats/Makefile
index 4225824..9858180 100644 (file)
--- a/formats/Makefile
+++ b/formats/Makefile
@@ -29,10 +29,6 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
   FORMAT_LIBS+=format_ogg_vorbis.so
 endif
 
-ifeq ($(findstring BSD,${OSARCH}),BSD)
-  CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
-endif
-
 GSMLIB=../codecs/gsm/lib/libgsm.a
 
 ifeq (${OSARCH},CYGWIN)

diff --git a/funcs/Makefile b/funcs/Makefile
index 63d36bf..773594c 100644 (file)
--- a/funcs/Makefile
+++ b/funcs/Makefile
@@ -47,10 +47,6 @@ else
 CFLAGS+=-fPIC
 endif
 
-ifeq ($(findstring BSD,${OSARCH}),BSD)
-  CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
-endif
-
 all: $(FUNCS)
 
 clean:

diff --git a/pbx/Makefile b/pbx/Makefile
index f86ae48..c8fe28b 100644 (file)
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -14,10 +14,6 @@
 PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so pbx_realtime.so \
          pbx_ael.so
 
-ifeq ($(findstring BSD,${OSARCH}),BSD)
-  CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
-endif
-
 # Add GTK console if appropriate
 #PBX_LIBS+=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
 # Add KDE Console if appropriate

diff --git a/utils/Makefile b/utils/Makefile
index a07a39d..dd21bbe 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -16,10 +16,6 @@
 #
 CFLAGS+=-DNO_AST_MM
 
-ifeq ($(findstring BSD,${OSARCH}),BSD)
-  CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
-endif
-
 TARGET=stereorize streamplayer
 
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),)