package/asterisk/patches/asterisk-1.0.7-Makefile-codecs.patch

   1 diff -ruN asterisk-1.0.7-old/codecs/Makefile asterisk-1.0.7-new/codecs/Makefile
   2 --- asterisk-1.0.7-old/codecs/Makefile  2005-03-17 15:43:51.000000000 +0100
   3 +++ asterisk-1.0.7-new/codecs/Makefile  2005-03-22 23:26:20.000000000 +0100
   4 @@ -17,21 +17,21 @@
   5  # g723.1b)
   6  #
   7  #MODG723=codec_g723_1.so codec_g723_1b.so
   8 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
   9 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
  10 -MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
  11 +#MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
  12 +#MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
  13 +#MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
  14  MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
  15  CFLAGS+=-fPIC
  16 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
  17 -CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
  18 -CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex")
  19 +#CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
  20 +#CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
  21 +#CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex")
  22
  23  LIBG723=g723.1/libg723.a
  24  LIBG723B=g723.1b/libg723b.a
  25  LIBGSM=gsm/lib/libgsm.a
  26  LIBGSMT=gsm/lib/libgsm.a
  27  LIBLPC10=lpc10/liblpc10.a
  28 -LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib")
  29 +LIBSPEEX=$(LDFLAGS_EXTRA)
  30  LIBSPEEX+=-lspeex -lm
  31  LIBILBC=ilbc/libilbc.a
  32
  33 @@ -43,26 +43,26 @@
  34
  35  clean:
  36         rm -f *.so *.o .depend
  37 -       ! [ -d g723.1 ] || $(MAKE) -C g723.1 clean
  38 -       ! [ -d g723.1b ] || $(MAKE) -C g723.1b clean
  39 -       $(MAKE) -C gsm clean
  40 -       $(MAKE) -C lpc10 clean
  41 -       $(MAKE) -C ilbc clean
  42 +       ! [ -d g723.1 ] || $(MAKE) PROC=$(PROC) -C g723.1 clean
  43 +       ! [ -d g723.1b ] || $(MAKE) PROC=$(PROC) -C g723.1b clean
  44 +       $(MAKE) PROC=$(PROC) -C gsm clean
  45 +       $(MAKE) PROC=$(PROC) -C lpc10 clean
  46 +       $(MAKE) PROC=$(PROC) -C ilbc clean
  47
  48  $(LIBG723):
  49 -       $(MAKE) -C g723.1 all
  50 +       $(MAKE) PROC=$(PROC) -C g723.1 all
  51
  52  gsm/lib/libgsm.a:
  53 -       $(MAKE) -C gsm lib/libgsm.a
  54 +       $(MAKE) PROC=$(PROC) -C gsm lib/libgsm.a
  55
  56  $(LIBG723B):
  57 -       $(MAKE) -C g723.1b all
  58 +       $(MAKE) PROC=$(PROC) -C g723.1b all
  59
  60  $(LIBLPC10):
  61 -       $(MAKE) -C lpc10 all
  62 +       $(MAKE) PROC=$(PROC) -C lpc10 all
  63
  64  $(LIBILBC):
  65 -       $(MAKE) -C ilbc all
  66 +       $(MAKE) PROC=$(PROC) -C ilbc all
  67
  68  codec_ilbc.so: codec_ilbc.o $(LIBILBC)
  69         $(CC) $(SOLINK) -o $@ $< $(LIBILBC)