Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv8121/channels
Modified Files:
Makefile
Log Message:
Rework astersk make process to be compatable with the Open H.323 build process.
Bug #3981
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- Makefile 28 Mar 2005 16:28:00 -0000 1.68
+++ Makefile 29 Apr 2005 04:37:02 -0000 1.69
@@ -121,6 +121,10 @@
include .depend
endif
+ifneq ($(wildcard h323/Makefile.ast),)
+include h323/Makefile.ast
+endif
+
ifeq ($(CROSS_COMPILE),)
gentone: gentone.c
$(CC) -o gentone gentone.c -lm
@@ -178,8 +182,13 @@
chan_vpb.so: chan_vpb.o
$(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
+ifeq (${OSARCH},Linux)
+chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
+ $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a
$(H323LDLIBS) -lstdc++
+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
+endif
#chan_modem.so : chan_modem.o
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
