[asterisk-commits] pcadach: branch pcadach/chan_h323-live r40956 - in /team/pcadach/chan_h323-li...

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Wed Aug 23 15:43:18 2006
New Revision: 40956

URL: http://svn.digium.com/view/asterisk?rev=40956&view=rev
Log:
Slightly update chan_h323 build process

Modified:
    team/pcadach/chan_h323-live/channels/Makefile
    team/pcadach/chan_h323-live/channels/h323/Makefile
    team/pcadach/chan_h323-live/channels/h323/Makefile.in

Modified: team/pcadach/chan_h323-live/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/Makefile?rev=40956&r1=40955&r2=40956&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/Makefile (original)
+++ team/pcadach/chan_h323-live/channels/Makefile Wed Aug 23 15:43:18 2006
@@ -97,11 +97,11 @@
 ifeq ($(OSARCH),linux-gnu)
 chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
-	$(CMD_PREFIX) $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++
+	$(CMD_PREFIX) $(CXX) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS)
 else
 chan_h323.so: chan_h323.o h323/libchanh323.a
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
-	$(CMD_PREFIX) $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
+	$(CMD_PREFIX) $(CXX) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 endif
 
 chan_misdn.o: CFLAGS+=-Imisdn -DCHAN_MISDN_VERSION=\"0.3.0\" 

Modified: team/pcadach/chan_h323-live/channels/h323/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/h323/Makefile?rev=40956&r1=40955&r2=40956&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/Makefile (original)
+++ team/pcadach/chan_h323-live/channels/h323/Makefile Wed Aug 23 15:43:18 2006
@@ -6,12 +6,11 @@
 
 .PHONY: Makefile.ast
 
-default::	notrace
+default::	opt
 
 # Verify those options with main Makefile
 STDCCFLAGS	= -DNDEBUG
-STDCCFLAGS	+= $(shell grep ^DEBUG_THREADS ../../Makefile | sed -e "s/^DEBUG_THREADS[ 	]*=//" -e "s/\([^\#]*\)\#.*/\1/")
-STDCCFLAGS	+= -I../../include -include "asterisk/autoconfig.h"
+STDCCFLAGS	+= -I../../include -include asterisk/autoconfig.h
 STDCCFLAGS	+= -fPIC
 #OPTCCFLAGS	+=
 CFLAGS		= -pipe

Modified: team/pcadach/chan_h323-live/channels/h323/Makefile.in
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/h323/Makefile.in?rev=40956&r1=40955&r2=40956&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/Makefile.in (original)
+++ team/pcadach/chan_h323-live/channels/h323/Makefile.in Wed Aug 23 15:43:18 2006
@@ -10,8 +10,7 @@
 
 # Verify those options with main Makefile
 STDCCFLAGS	= -DNDEBUG
-STDCCFLAGS	+= $(shell grep ^DEBUG_THREADS ../../Makefile | sed -e "s/^DEBUG_THREADS[ 	]*=//" -e "s/\([^\#]*\)\#.*/\1/")
-STDCCFLAGS	+= -I../../include -include "asterisk/autoconfig.h"
+STDCCFLAGS	+= -I../../include -include asterisk/autoconfig.h
 STDCCFLAGS	+= -fPIC
 #OPTCCFLAGS	+=
 CFLAGS		= -pipe