mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-14 13:21:53 +02:00
6de0c2173e
link openh323 and pwlib statically. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3737 3c298f89-4303-0410-b956-a3cf2f4a3e73
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
diff -ruN asterisk-1.2.1-old/channels/Makefile asterisk-1.2.1-new/channels/Makefile
|
|
--- asterisk-1.2.1-old/channels/Makefile 2006-05-07 13:06:06.000000000 +0200
|
|
+++ asterisk-1.2.1-new/channels/Makefile 2006-05-07 15:26:00.000000000 +0200
|
|
@@ -15,6 +15,7 @@
|
|
#
|
|
|
|
CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so chan_skinny.so chan_features.so
|
|
+CXXLIBS=-lstdc++
|
|
|
|
ifneq (${OSARCH},CYGWIN)
|
|
# if you really, really want to use these drivers, uncomment the line below
|
|
@@ -230,7 +231,7 @@
|
|
|
|
ifeq (${OSARCH},Linux)
|
|
chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
|
|
- $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++
|
|
+ $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CXXLIBS)
|
|
else
|
|
chan_h323.so: chan_h323.o h323/libchanh323.a
|
|
$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
|
|
diff -ruN asterisk-1.2.1-old/channels/h323/Makefile asterisk-1.2.1-new/channels/h323/Makefile
|
|
--- asterisk-1.2.1-old/channels/h323/Makefile 2005-11-29 19:24:39.000000000 +0100
|
|
+++ asterisk-1.2.1-new/channels/h323/Makefile 2006-05-07 13:18:46.000000000 +0200
|
|
@@ -30,7 +30,7 @@
|
|
touch $(SOURCES)
|
|
|
|
libchanh323.a: $(OBJS)
|
|
- ar crv $@ $(OBJS)
|
|
+ $(AR) crv $@ $(OBJS)
|
|
|
|
Makefile.ast: FORCE
|
|
@echo H323CFLAGS = $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) >$@.tmp
|