diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2008-06-12 10:14:08 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2008-06-12 10:14:08 +0000 |
| commit | 8a089d17c71fa2f9b891ba323b9b0b456b60cadd (patch) | |
| tree | b684f1defa12a2892a74976b68d76a50b2c9c73e /net/asterisk10/files/patch-channels::Makefile | |
| parent | - Update to 0.06 (diff) | |
o Update codec negotiation patch. This version should be working with
built-in h323 module;
o don't link main binary with h323 library and friends. This creates
issues with ooh323 module, from the asterisk-addons package.
Bump PORTREVISION.
Diffstat (limited to 'net/asterisk10/files/patch-channels::Makefile')
| -rw-r--r-- | net/asterisk10/files/patch-channels::Makefile | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/net/asterisk10/files/patch-channels::Makefile b/net/asterisk10/files/patch-channels::Makefile index dbe7d0c7a0d2..833abdac1569 100644 --- a/net/asterisk10/files/patch-channels::Makefile +++ b/net/asterisk10/files/patch-channels::Makefile @@ -3,7 +3,7 @@ $FreeBSD$ --- channels/Makefile.orig +++ channels/Makefile -@@ -26,8 +26,8 @@ +@@ -32,8 +32,8 @@ endif ifeq ($(OSARCH),FreeBSD) @@ -14,7 +14,7 @@ $FreeBSD$ CHANH323LIB=-pthread endif -@@ -72,12 +72,12 @@ +@@ -78,12 +78,13 @@ h323/libchanh323.a h323/Makefile.ast: $(CMD_PREFIX) $(MAKE) -C h323 $(CMD_PREFIX) rm -f ../main/asterisk @@ -24,6 +24,7 @@ $FreeBSD$ - $(CMD_PREFIX) echo - $(CMD_PREFIX) echo "***************************************************************" - $(CMD_PREFIX) exit 1 ++ $(CMD_PREFIX) $(MAKE) -C . chan_h323.so +# $(CMD_PREFIX) echo "***************************************************************" +# $(CMD_PREFIX) echo +# $(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********" @@ -32,4 +33,17 @@ $FreeBSD$ +# $(CMD_PREFIX) exit 1 endif - gentone: gentone.c + dist-clean:: +@@ -113,8 +114,12 @@ + else + chan_h323.so: chan_h323.o h323/libchanh323.a + $(ECHO_PREFIX) echo " [LD] $^ -> $@" ++ifeq ($(OSARCH),FreeBSD) ++ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) ++else + $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat + endif ++endif + + chan_misdn.o: ASTCFLAGS+=-Imisdn + |