[asterisk-addons-commits] qwell: branch qwell/moddirmagic r517 - in /team/qwell/moddirmagic: ./ channel...

SVN commits to the Asterisk addons project asterisk-addons-commits at lists.digium.com
Wed Feb 6 17:29:29 CST 2008 

Author: qwell
Date: Wed Feb  6 17:29:29 2008
New Revision: 517

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=517
Log:
Holy crap, it compiles.

Added:
    team/qwell/moddirmagic/channels/chan_ooh323.c   (contents, props changed)
      - copied, changed from r516, team/qwell/moddirmagic/channels/asterisk-ooh323c/src/chan_h323.c
    team/qwell/moddirmagic/channels/chan_ooh323.h   (props changed)
      - copied unchanged from r516, team/qwell/moddirmagic/channels/asterisk-ooh323c/src/chan_h323.h
    team/qwell/moddirmagic/channels/ooh323cDriver.c   (props changed)
      - copied unchanged from r516, team/qwell/moddirmagic/channels/asterisk-ooh323c/src/ooh323cDriver.c
    team/qwell/moddirmagic/channels/ooh323cDriver.h   (contents, props changed)
      - copied, changed from r516, team/qwell/moddirmagic/channels/asterisk-ooh323c/src/ooh323cDriver.h
    team/qwell/moddirmagic/configs/ooh323.conf.sample   (props changed)
      - copied unchanged from r516, team/qwell/moddirmagic/channels/asterisk-ooh323c/h323.conf.sample
Removed:
    team/qwell/moddirmagic/channels/asterisk-ooh323c/src/chan_h323.c
    team/qwell/moddirmagic/channels/asterisk-ooh323c/src/chan_h323.h
    team/qwell/moddirmagic/channels/asterisk-ooh323c/src/ooh323cDriver.c
    team/qwell/moddirmagic/channels/asterisk-ooh323c/src/ooh323cDriver.h
Modified:
    team/qwell/moddirmagic/Makefile
    team/qwell/moddirmagic/channels/Makefile

Modified: team/qwell/moddirmagic/Makefile
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/Makefile?view=diff&rev=517&r1=516&r2=517
==============================================================================
--- team/qwell/moddirmagic/Makefile (original)
+++ team/qwell/moddirmagic/Makefile Wed Feb  6 17:29:29 2008
@@ -20,7 +20,6 @@
 export SOLINK
 
 .PHONY: menuselect clean dist-clean distclean all cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
-#.PHONY: all install samples clean update distclean dist-clean menuselect chan_ooh323.so format_mp3.so
 
 ASTCFLAGS+=-fPIC
 
@@ -152,7 +151,6 @@
 	@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS)
 	@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS)
 
-#$(SUBDIRS): main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
 $(SUBDIRS): makeopts.embed_rules
 
 $(MOD_SUBDIRS):
@@ -196,9 +194,6 @@
 
 clean: $(SUBDIRS_CLEAN)
 	@$(MAKE) -C menuselect clean
-	@if [ -f asterisk-ooh323c/Makefile ] ; then \
-		$(MAKE) -C asterisk-ooh323c clean ; \
-	fi
 
 dist-clean: distclean
 
@@ -209,16 +204,6 @@
 	rm -f config.log config.status
 	rm -rf autom4te.cache
 	rm -f build_tools/menuselect-deps
-
-	@if [ -f asterisk-ooh323c/Makefile ] ; then \
-		$(MAKE) -C asterisk-ooh323c distclean ; \
-	fi
-
-chan_ooh323.so:
-	@if [ ! -f asterisk-ooh323c/Makefile ] ; then \
-		cd asterisk-ooh323c && ./configure ; \
-	fi
-	@$(MAKE) -C asterisk-ooh323c
 
 samples: 
 	mkdir -p $(DESTDIR)$(ASTETCDIR)

Modified: team/qwell/moddirmagic/channels/Makefile
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/channels/Makefile?view=diff&rev=517&r1=516&r2=517
==============================================================================
--- team/qwell/moddirmagic/channels/Makefile (original)
+++ team/qwell/moddirmagic/channels/Makefile Wed Feb  6 17:29:29 2008
@@ -15,11 +15,37 @@
 MENUSELECT_CATEGORY=CHANNELS
 MENUSELECT_DESCRIPTION=Channel Drivers
 
+H323OBJS=ooCmdChannel.o ooLogChan.o ooUtils.o ooGkClient.o context.o \
+	ooDateTime.o decode.o dlist.o encode.o errmgmt.o \
+	memheap.o ootrace.o oochannels.o ooh245.o ooports.o \
+	ooq931.o ooCapability.o ooSocket.o perutil.o eventHandler.o \
+	ooCalls.o ooStackCmds.o ooh323.o ooh323ep.o printHandler.o \
+	rtctype.o ooTimer.o h323/H235-SECURITY-MESSAGESDec.o \
+	h323/H235-SECURITY-MESSAGESEnc.o h323/H323-MESSAGES.o h323/H323-MESSAGESDec.o \
+	h323/H323-MESSAGESEnc.o h323/MULTIMEDIA-SYSTEM-CONTROL.o \
+	h323/MULTIMEDIA-SYSTEM-CONTROLDec.o h323/MULTIMEDIA-SYSTEM-CONTROLEnc.o
+
+H323CFLAGS=-Iasterisk-ooh323c/ooh323c/src -Iasterisk-ooh323c/ooh323c/src/h323
+
 all: _all
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
 clean::
+	@if [ -f asterisk-ooh323c/Makefile ] ; then \
+		$(MAKE) -C asterisk-ooh323c clean ; \
+	fi
 
 dist-clean::
+	@if [ -f asterisk-ooh323c/Makefile ] ; then \
+		$(MAKE) -C asterisk-ooh323c distclean ; \
+	fi
 
+chan_ooh323.o: ASTCFLAGS+=$(H323CFLAGS)
+
+$(if $(filter chan_ooh323,$(EMBEDDED_MODS)),modules.link,chan_ooh323.so): ASTCFLAGS+=$(H323CFLAGS)
+$(if $(filter chan_ooh323,$(EMBEDDED_MODS)),modules.link,chan_ooh323.so): $(addprefix asterisk-ooh323c/ooh323c/src/,$(H323OBJS)) chan_ooh323.o ooh323cDriver.o
+#	@if [ ! -f asterisk-ooh323c/Makefile ] ; then \
+#		cd asterisk-ooh323c && ./configure ; \
+#	fi
+#	@$(MAKE) -C asterisk-ooh323c

Copied: team/qwell/moddirmagic/channels/chan_ooh323.c (from r516, team/qwell/moddirmagic/channels/asterisk-ooh323c/src/chan_h323.c)
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/channels/chan_ooh323.c?view=diff&rev=517&p1=team/qwell/moddirmagic/channels/asterisk-ooh323c/src/chan_h323.c&r1=516&p2=team/qwell/moddirmagic/channels/chan_ooh323.c&r2=517
==============================================================================
--- team/qwell/moddirmagic/channels/asterisk-ooh323c/src/chan_h323.c (original)
+++ team/qwell/moddirmagic/channels/chan_ooh323.c Wed Feb  6 17:29:29 2008
@@ -15,9 +15,7 @@
  *****************************************************************************/
 
 
-#include "chan_h323.h"
-
-#define AST_MODULE "chan_ooh323"
+#include "chan_ooh323.h"
 
 /* Defaults */
 #define DEFAULT_CONTEXT "default"

Propchange: team/qwell/moddirmagic/channels/chan_ooh323.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/qwell/moddirmagic/channels/chan_ooh323.c
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/qwell/moddirmagic/channels/chan_ooh323.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: team/qwell/moddirmagic/channels/chan_ooh323.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/qwell/moddirmagic/channels/chan_ooh323.h
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/qwell/moddirmagic/channels/chan_ooh323.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: team/qwell/moddirmagic/channels/ooh323cDriver.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/qwell/moddirmagic/channels/ooh323cDriver.c
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/qwell/moddirmagic/channels/ooh323cDriver.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: team/qwell/moddirmagic/channels/ooh323cDriver.h (from r516, team/qwell/moddirmagic/channels/asterisk-ooh323c/src/ooh323cDriver.h)
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/channels/ooh323cDriver.h?view=diff&rev=517&p1=team/qwell/moddirmagic/channels/asterisk-ooh323c/src/ooh323cDriver.h&r1=516&p2=team/qwell/moddirmagic/channels/ooh323cDriver.h&r2=517
==============================================================================
--- team/qwell/moddirmagic/channels/asterisk-ooh323c/src/ooh323cDriver.h (original)
+++ team/qwell/moddirmagic/channels/ooh323cDriver.h Wed Feb  6 17:29:29 2008
@@ -15,7 +15,7 @@
  *****************************************************************************/
 #ifndef _OO_H323CDRIVER_H_
 #define __OO_H323DRIVER_H_
-#include "chan_h323.h"
+#include "chan_ooh323.h"
 #include "ootypes.h"
 #include "ooh323ep.h"
 #include "oochannels.h"

Propchange: team/qwell/moddirmagic/channels/ooh323cDriver.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/qwell/moddirmagic/channels/ooh323cDriver.h
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/qwell/moddirmagic/channels/ooh323cDriver.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: team/qwell/moddirmagic/configs/ooh323.conf.sample
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/qwell/moddirmagic/configs/ooh323.conf.sample
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/qwell/moddirmagic/configs/ooh323.conf.sample
------------------------------------------------------------------------------
    svn:mime-type = text/plain

More information about the asterisk-addons-commits mailing list