patch file cleanup... ick.. kaloz you owe me some love
[openwrt/svn-archive/archive.git] / net / asterisk / patches / 012-Makefile-channels.patch
1 diff -Nru asterisk-1.2.14.org/channels/Makefile asterisk-1.2.14/channels/Makefile
2 --- asterisk-1.2.14.org/channels/Makefile 2006-08-17 23:57:19.000000000 +0200
3 +++ asterisk-1.2.14/channels/Makefile 2006-12-27 09:12:28.000000000 +0100
4 @@ -110,7 +110,7 @@
5 endif
6
7 ifndef WITHOUT_ZAPTEL
8 -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
9 +ifneq ($(wildcard $(STAGING_DIR)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
10 ifeq (${OSARCH},NetBSD)
11 SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
12 endif
13 @@ -151,6 +151,9 @@
14
15 #CFLAGS+=$(shell [ -f $(ZAPDIR)/libzap.a ] && echo "-I$(ZAPDIR)")
16
17 +CFLAGS += $(EXTRA_CFLAGS)
18 +CHANNEL_LIBS += $(EXTRA_CHAN_MODULES)
19 +
20 all: depend $(CHANNEL_LIBS)
21
22 clean:
23 @@ -158,7 +161,7 @@
24 rm -f busy.h ringtone.h gentone gentone-ulaw
25
26 %.so : %.o
27 - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
28 + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
29
30 ifneq ($(wildcard .depend),)
31 include .depend
32 @@ -204,7 +207,7 @@
33 $(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
34
35 chan_zap.so: chan_zap.o
36 - $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -ltonezone
37 + $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) $(EXTRA_LDFLAGS) -ltonezone
38
39 chan_sip.so: chan_sip.o
40 $(CC) $(SOLINK) -o $@ ${CYGSOLINK} chan_sip.o ${CYGSOLIB}