[Asterisk-cvs] asterisk-addons/asterisk-ooh323c Makefile.am, 1.5, 1.6 Makefile.in, 1.4, 1.5

vphirke vphirke
Wed Oct 26 16:56:52 CDT 2005


Update of /usr/cvsroot/asterisk-addons/asterisk-ooh323c
In directory mongoose.digium.com:/tmp/cvs-serv18763

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Updated stack source as well as channel driver

Index: Makefile.am
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	12 Oct 2005 01:54:32 -0000	1.5
+++ Makefile.am	26 Oct 2005 20:49:40 -0000	1.6
@@ -3,12 +3,12 @@
 INSTALLPREFIX=@OOASTINSTALL@
 lib_LTLIBRARIES = libchan_h323.la
 libchan_h323_la_LDFLAGS = -L$(top_builddir)/ooh323c/src -version-info 1:1:0
-libchan_h323_la_SOURCES = src/chan_h323.h src/chan_h323.c src/ooh323cDriver.h src/ooh323cDriver.c ooh323c/src/ooLogChan.h ooh323c/src/ooLogChan.c ooh323c/src/ooUtils.c ooh323c/src/ooUtils.h ooh323c/src/ooGkClient.h ooh323c/src/ooGkClient.c ooh323c/src/context.c ooh323c/src/ooCommon.h ooh323c/src/ooDateTime.h ooh323c/src/ooDateTime.c ooh323c/src/decode.c ooh323c/src/dlist.c ooh323c/src/encode.c ooh323c/src/errmgmt.c ooh323c/src/memheap.c ooh323c/src/memheap.h ooh323c/src/ooasn1.h  ooh323c/src/ootrace.h ooh323c/src/ootrace.c ooh323c/src/oochannels.c ooh323c/src/oochannels.h ooh323c/src/ooh245.c ooh323c/src/ooh245.h ooh323c/src/oohdr.h ooh323c/src/ooper.h ooh323c/src/ooports.c ooh323c/src/ooports.h ooh323c/src/ooq931.c ooh323c/src/ooq931.h ooh323c/src/ooCapability.c ooh323c/src/ooCapability.h ooh323c/src/ooSocket.c ooh323c/src/ooSocket.h ooh323c/src/ootypes.h ooh323c/src/perutil.c ooh323c/src/eventHandler.c ooh323c/src/eventHandler.h ooh323c/src/ooCalls.c ooh323c/src/ooCalls.h ooh323c/src/ooStackCmds.c ooh323c/src/ooStackCmds.h ooh323c/src/ooh323.c ooh323c/src/ooh323.h ooh323c/src/ooh323ep.c ooh323c/src/ooh323ep.h ooh323c/src/printHandler.c ooh323c/src/printHandler.h ooh323c/src/rtctype.c ooh323c/src/rtctype.h ooh323c/src/ooTimer.c ooh323c/src/ooTimer.h ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c ooh323c/src/h323/H235-SECURITY-MESSAGES.h ooh323c/src/h323/H323-MESSAGES.c ooh323c/src/h323/H323-MESSAGESDec.c ooh323c/src/h323/H323-MESSAGESEnc.c ooh323c/src/h323/H323-MESSAGES.h ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
+libchan_h323_la_SOURCES = src/chan_h323.h src/chan_h323.c src/ooh323cDriver.h src/ooh323cDriver.c ooh323c/src/ooCmdChannel.h ooh323c/src/ooCmdChannel.c ooh323c/src/ooLogChan.h ooh323c/src/ooLogChan.c ooh323c/src/ooUtils.c ooh323c/src/ooUtils.h ooh323c/src/ooGkClient.h ooh323c/src/ooGkClient.c ooh323c/src/context.c ooh323c/src/ooCommon.h ooh323c/src/ooDateTime.h ooh323c/src/ooDateTime.c ooh323c/src/decode.c ooh323c/src/dlist.c ooh323c/src/encode.c ooh323c/src/errmgmt.c ooh323c/src/memheap.c ooh323c/src/memheap.h ooh323c/src/ooasn1.h  ooh323c/src/ootrace.h ooh323c/src/ootrace.c ooh323c/src/oochannels.c ooh323c/src/oochannels.h ooh323c/src/ooh245.c ooh323c/src/ooh245.h ooh323c/src/oohdr.h ooh323c/src/ooper.h ooh323c/src/ooports.c ooh323c/src/ooports.h ooh323c/src/ooq931.c ooh323c/src/ooq931.h ooh323c/src/ooCapability.c ooh323c/src/ooCapability.h ooh323c/src/ooSocket.c ooh323c/src/ooSocket.h ooh323c/src/ootypes.h ooh323c/src/perutil.c ooh323c/src/eventHandler.c ooh323c/src/eventHandler.h ooh323c/src/ooCalls.c ooh323c/src/ooCalls.h ooh323c/src/ooStackCmds.c ooh323c/src/ooStackCmds.h ooh323c/src/ooh323.c ooh323c/src/ooh323.h ooh323c/src/ooh323ep.c ooh323c/src/ooh323ep.h ooh323c/src/printHandler.c ooh323c/src/printHandler.h ooh323c/src/rtctype.c ooh323c/src/rtctype.h ooh323c/src/ooTimer.c ooh323c/src/ooTimer.h ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c ooh323c/src/h323/H235-SECURITY-MESSAGES.h ooh323c/src/h323/H323-MESSAGES.c ooh323c/src/h323/H323-MESSAGESDec.c ooh323c/src/h323/H323-MESSAGESEnc.c ooh323c/src/h323/H323-MESSAGES.h ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
 
-libchan_h323_la_LIBADD = -lpthread 
+INCLUDES = -I$(top_builddir)/ooh323c/src -I$(top_builddir)/ooh323c/src/h323
 
+libchan_h323_la_LIBADD = -lpthread 
 
-INCLUDES = -I$(top_builddir)/ooh323c/src -I$(top_builddir)/ooh323c/src/h323
 
 
 

Index: Makefile.in
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.in	19 Aug 2005 19:49:38 -0000	1.4
+++ Makefile.in	26 Oct 2005 20:49:40 -0000	1.5
@@ -90,12 +90,12 @@
 CFLAGS = @OOH323CFLAGS@
 lib_LTLIBRARIES = libchan_h323.la
 libchan_h323_la_LDFLAGS = -L$(top_builddir)/ooh323c/src -version-info 1:1:0
-libchan_h323_la_SOURCES = src/chan_h323.h src/chan_h323.c src/ooh323cDriver.h src/ooh323cDriver.c ooh323c/src/ooLogChan.h ooh323c/src/ooLogChan.c ooh323c/src/ooUtils.c ooh323c/src/ooUtils.h ooh323c/src/ooGkClient.h ooh323c/src/ooGkClient.c ooh323c/src/context.c ooh323c/src/ooCommon.h ooh323c/src/ooDateTime.h ooh323c/src/ooDateTime.c ooh323c/src/decode.c ooh323c/src/dlist.c ooh323c/src/encode.c ooh323c/src/errmgmt.c ooh323c/src/memheap.c ooh323c/src/memheap.h ooh323c/src/ooasn1.h  ooh323c/src/ootrace.h ooh323c/src/ootrace.c ooh323c/src/oochannels.c ooh323c/src/oochannels.h ooh323c/src/ooh245.c ooh323c/src/ooh245.h ooh323c/src/oohdr.h ooh323c/src/ooper.h ooh323c/src/ooports.c ooh323c/src/ooports.h ooh323c/src/ooq931.c ooh323c/src/ooq931.h ooh323c/src/ooCapability.c ooh323c/src/ooCapability.h ooh323c/src/ooSocket.c ooh323c/src/ooSocket.h ooh323c/src/ootypes.h ooh323c/src/perutil.c ooh323c/src/eventHandler.c ooh323c/src/eventHandler.h ooh323c/src/ooCalls.c ooh323c/src/ooCalls.h ooh323c/src/ooStackCmds.c ooh323c/src/ooStackCmds.h ooh323c/src/ooh323.c ooh323c/src/ooh323.h ooh323c/src/ooh323ep.c ooh323c/src/ooh323ep.h ooh323c/src/printHandler.c ooh323c/src/printHandler.h ooh323c/src/rtctype.c ooh323c/src/rtctype.h ooh323c/src/ooTimer.c ooh323c/src/ooTimer.h ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c ooh323c/src/h323/H235-SECURITY-MESSAGES.h ooh323c/src/h323/H323-MESSAGES.c ooh323c/src/h323/H323-MESSAGESDec.c ooh323c/src/h323/H323-MESSAGESEnc.c ooh323c/src/h323/H323-MESSAGES.h ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
-
-libchan_h323_la_LIBADD = -lpthread 
+libchan_h323_la_SOURCES = src/chan_h323.h src/chan_h323.c src/ooh323cDriver.h src/ooh323cDriver.c ooh323c/src/ooCmdChannel.h ooh323c/src/ooCmdChannel.c ooh323c/src/ooLogChan.h ooh323c/src/ooLogChan.c ooh323c/src/ooUtils.c ooh323c/src/ooUtils.h ooh323c/src/ooGkClient.h ooh323c/src/ooGkClient.c ooh323c/src/context.c ooh323c/src/ooCommon.h ooh323c/src/ooDateTime.h ooh323c/src/ooDateTime.c ooh323c/src/decode.c ooh323c/src/dlist.c ooh323c/src/encode.c ooh323c/src/errmgmt.c ooh323c/src/memheap.c ooh323c/src/memheap.h ooh323c/src/ooasn1.h  ooh323c/src/ootrace.h ooh323c/src/ootrace.c ooh323c/src/oochannels.c ooh323c/src/oochannels.h ooh323c/src/ooh245.c ooh323c/src/ooh245.h ooh323c/src/oohdr.h ooh323c/src/ooper.h ooh323c/src/ooports.c ooh323c/src/ooports.h ooh323c/src/ooq931.c ooh323c/src/ooq931.h ooh323c/src/ooCapability.c ooh323c/src/ooCapability.h ooh323c/src/ooSocket.c ooh323c/src/ooSocket.h ooh323c/src/ootypes.h ooh323c/src/perutil.c ooh323c/src/eventHandler.c ooh323c/src/eventHandler.h ooh323c/src/ooCalls.c ooh323c/src/ooCalls.h ooh323c/src/ooStackCmds.c ooh323c/src/ooStackCmds.h ooh323c/src/ooh323.c ooh323c/src/ooh323.h ooh323c/src/ooh323ep.c ooh323c/src/ooh323ep.h ooh323c/src/printHandler.c ooh323c/src/printHandler.h ooh323c/src/rtctype.c ooh323c/src/rtctype.h ooh323c/src/ooTimer.c ooh323c/src/ooTimer.h ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c ooh323c/src/h323/H235-SECURITY-MESSAGES.h ooh323c/src/h323/H323-MESSAGES.c ooh323c/src/h323/H323-MESSAGESDec.c ooh323c/src/h323/H323-MESSAGESEnc.c ooh323c/src/h323/H323-MESSAGES.h ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
 
 INCLUDES = -I$(top_builddir)/ooh323c/src -I$(top_builddir)/ooh323c/src/h323
 
+libchan_h323_la_LIBADD = -lpthread 
+
 EXTRA_DIST = extensions.conf h323.conf README COPYING
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -105,15 +105,15 @@
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
 libchan_h323_la_DEPENDENCIES =
-am_libchan_h323_la_OBJECTS = chan_h323.lo ooh323cDriver.lo ooLogChan.lo \
-	ooUtils.lo ooGkClient.lo context.lo ooDateTime.lo decode.lo \
-	dlist.lo encode.lo errmgmt.lo memheap.lo ootrace.lo \
-	oochannels.lo ooh245.lo ooports.lo ooq931.lo ooCapability.lo \
-	ooSocket.lo perutil.lo eventHandler.lo ooCalls.lo \
-	ooStackCmds.lo ooh323.lo ooh323ep.lo printHandler.lo rtctype.lo \
-	ooTimer.lo H235-SECURITY-MESSAGESDec.lo \
-	H235-SECURITY-MESSAGESEnc.lo H323-MESSAGES.lo \
-	H323-MESSAGESDec.lo H323-MESSAGESEnc.lo \
+am_libchan_h323_la_OBJECTS = chan_h323.lo ooh323cDriver.lo \
+	ooCmdChannel.lo ooLogChan.lo ooUtils.lo ooGkClient.lo \
+	context.lo ooDateTime.lo decode.lo dlist.lo encode.lo \
+	errmgmt.lo memheap.lo ootrace.lo oochannels.lo ooh245.lo \
+	ooports.lo ooq931.lo ooCapability.lo ooSocket.lo perutil.lo \
+	eventHandler.lo ooCalls.lo ooStackCmds.lo ooh323.lo ooh323ep.lo \
+	printHandler.lo rtctype.lo ooTimer.lo \
+	H235-SECURITY-MESSAGESDec.lo H235-SECURITY-MESSAGESEnc.lo \
+	H323-MESSAGES.lo H323-MESSAGESDec.lo H323-MESSAGESEnc.lo \
 	MULTIMEDIA-SYSTEM-CONTROL.lo MULTIMEDIA-SYSTEM-CONTROLDec.lo \
 	MULTIMEDIA-SYSTEM-CONTROLEnc.lo
 libchan_h323_la_OBJECTS = $(am_libchan_h323_la_OBJECTS)
@@ -139,6 +139,7 @@
 @AMDEP_TRUE@	./$(DEPDIR)/eventHandler.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/memheap.Plo ./$(DEPDIR)/ooCalls.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/ooCapability.Plo \
+ at AMDEP_TRUE@	./$(DEPDIR)/ooCmdChannel.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/ooDateTime.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/ooGkClient.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/ooLogChan.Plo ./$(DEPDIR)/ooSocket.Plo \
@@ -234,6 +235,7 @@
 	done
 chan_h323.lo: src/chan_h323.c
 ooh323cDriver.lo: src/ooh323cDriver.c
+ooCmdChannel.lo: ooh323c/src/ooCmdChannel.c
 ooLogChan.lo: ooh323c/src/ooLogChan.c
 ooUtils.lo: ooh323c/src/ooUtils.c
 ooGkClient.lo: ooh323c/src/ooGkClient.c
@@ -300,6 +302,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memheap.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ooCalls.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ooCapability.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ooCmdChannel.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ooDateTime.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ooGkClient.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ooLogChan.Plo at am__quote@
@@ -376,6 +379,24 @@
 @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ooh323cDriver.lo `test -f 'src/ooh323cDriver.c' || echo '$(srcdir)/'`src/ooh323cDriver.c
 
+ooCmdChannel.o: ooh323c/src/ooCmdChannel.c
+ at AMDEP_TRUE@	source='ooh323c/src/ooCmdChannel.c' object='ooCmdChannel.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@	depfile='$(DEPDIR)/ooCmdChannel.Po' tmpdepfile='$(DEPDIR)/ooCmdChannel.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ooCmdChannel.o `test -f 'ooh323c/src/ooCmdChannel.c' || echo '$(srcdir)/'`ooh323c/src/ooCmdChannel.c
+
+ooCmdChannel.obj: ooh323c/src/ooCmdChannel.c
+ at AMDEP_TRUE@	source='ooh323c/src/ooCmdChannel.c' object='ooCmdChannel.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@	depfile='$(DEPDIR)/ooCmdChannel.Po' tmpdepfile='$(DEPDIR)/ooCmdChannel.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ooCmdChannel.obj `cygpath -w ooh323c/src/ooCmdChannel.c`
+
+ooCmdChannel.lo: ooh323c/src/ooCmdChannel.c
+ at AMDEP_TRUE@	source='ooh323c/src/ooCmdChannel.c' object='ooCmdChannel.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@	depfile='$(DEPDIR)/ooCmdChannel.Plo' tmpdepfile='$(DEPDIR)/ooCmdChannel.TPlo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ooCmdChannel.lo `test -f 'ooh323c/src/ooCmdChannel.c' || echo '$(srcdir)/'`ooh323c/src/ooCmdChannel.c
+
 ooLogChan.o: ooh323c/src/ooLogChan.c
 @AMDEP_TRUE@	source='ooh323c/src/ooLogChan.c' object='ooLogChan.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@	depfile='$(DEPDIR)/ooLogChan.Po' tmpdepfile='$(DEPDIR)/ooLogChan.TPo' @AMDEPBACKSLASH@
@@ -1214,10 +1235,10 @@
 	$(MAKE) "CFLAGS = -g -DGNU -D_GNU_SOURCE -D_REENTRANT" all
 
 install: 
-	cp .libs/libchan_h323.so.1.0.1 /usr/lib/asterisk/modules/chan_h323.so
+	cp .libs/libchan_h323.so.1.0.1 /usr/lib/asterisk/modules/chan_ooh323.so
 
 sample:
-	cp h323.conf.sample /etc/asterisk/h323.conf
+	cp h323.conf.sample /etc/asterisk/ooh323.conf
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:




More information about the svn-commits mailing list