mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	remove redundant CFLAGS for BSD which are already set in the main Makefile (issue #6250)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8101 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -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},) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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: | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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),) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user