From 8123c918b22b4e32d20dbdb1e4f388b3434ebebf Mon Sep 17 00:00:00 2001 From: paulc Date: Fri, 18 Mar 2005 18:16:59 +0000 Subject: [PATCH] Moved the engine away, added install-noapi git-svn-id: http://yate.null.ro/svn/yate/trunk@260 acf43c95-373e-0410-b603-e72c3f656dc1 --- ChangeLog | 4 ++ Makefile.in | 54 ++++++++++--------------- clients/main-gtk.cpp | 3 +- clients/main-qt.cpp | 3 +- configure.in | 3 +- contrib/ysip/Makefile.in | 2 +- contrib/ysip/body.cpp | 6 +-- contrib/ysip/engine.cpp | 3 +- contrib/ysip/message.cpp | 5 +-- contrib/ysip/transaction.cpp | 3 +- contrib/ysip/util.cpp | 2 +- contrib/ysip/util.h | 2 +- contrib/ysip/yatesip.h | 4 +- engine/.cvsignore | 7 ++++ engine/Configuration.cpp | 2 +- engine/DataBlock.cpp | 2 +- engine/DataFormat.cpp | 2 +- engine/Engine.cpp | 2 +- engine/Makefile.in | 76 ++++++++++++++++++++++++++++++++++++ engine/Message.cpp | 2 +- engine/Mutex.cpp | 2 +- engine/NamedList.cpp | 2 +- engine/ObjList.cpp | 2 +- engine/Plugin.cpp | 2 +- engine/String.cpp | 2 +- engine/TelEngine.cpp | 2 +- engine/Thread.cpp | 2 +- engine/YMD5.cpp | 4 +- main.cpp | 2 +- modules/Makefile.in | 2 +- modules/callgen.cpp | 3 +- modules/cdrbuild.cpp | 3 +- modules/cdrfile.cpp | 2 +- modules/cdrpgsql.cpp | 2 +- modules/extmodule.cpp | 3 +- modules/faxchan.cpp | 3 +- modules/gsmcodec.cpp | 3 +- modules/h323chan.cpp | 3 +- modules/iaxchan.cpp | 3 +- modules/moh.cpp | 3 +- modules/msgsniff.cpp | 2 +- modules/osschan.cpp | 3 +- modules/pgsqlroute.cpp | 3 +- modules/regexroute.cpp | 3 +- modules/regfile.cpp | 2 +- modules/register.cpp | 2 +- modules/rmanager.cpp | 2 +- modules/tonegen.cpp | 3 +- modules/wavefile.cpp | 3 +- modules/ysipchan.cpp | 3 +- modules/zapchan.cpp | 3 +- scripts/Makefile.in | 2 +- test/Makefile.in | 2 +- test/randcall.cpp | 2 +- test/test.cpp | 2 +- test/test1.cpp | 2 +- yatengine.h | 8 ++-- yatephone.h | 10 ++--- 58 files changed, 174 insertions(+), 120 deletions(-) create mode 100644 engine/.cvsignore create mode 100644 engine/Makefile.in diff --git a/ChangeLog b/ChangeLog index 5bba8aed..55028dfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Mar 18 2005 Paul Chitescu +- Bumped version to 0.8.8 +- Rearranged directories and file names + Tue Jan 18 2005 Paul Chitescu - Version 0.8.7 - Fixed session destruction in libiax diff --git a/Makefile.in b/Makefile.in index dbf16cb5..6eda75d4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -10,7 +10,6 @@ DEBUG := CXX := @CXX@ -Wall SED := sed DEFS := -LIBAUX:= -ldl LIBTHR:= -lpthread INCLUDES := -I. -I@srcdir@ CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ @@ -19,19 +18,16 @@ LDCONFIG:=true MKDEPS := ./config.status PROGS:= yate -SLIBS:= libyate.so.@PACKAGE_VERSION@ libyate.so -INCS := telengine.h telephony.h +YLIB := libyate.so.@PACKAGE_VERSION@ +SLIBS:= $(YLIB) libyate.so +INCS := yatengine.h yatephone.h GENS := yateversn.h LIBS := MAN8 := yate.8 yate-config.8 DOCS := README COPYING ChangeLog -ENGOBJS := TelEngine.o String.o ObjList.o NamedList.o Configuration.o \ - Message.o Mutex.o Thread.o Plugin.o Engine.o MD5.o -TELOBJS :=DataBlock.o DataFormat.o OBJS := main.o -LIBOBJS := $(ENGOBJS) $(TELOBJS) -CLEANS = $(PROGS) $(SLIBS) $(LIBS) $(OBJS) $(LIBOBJS) yatepaths.h core +CLEANS = $(PROGS) $(SLIBS) $(LIBS) $(OBJS) yatepaths.h core COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS) LINK = $(CXX) $(LDFLAGS) @@ -55,6 +51,7 @@ everything: engine contrib modules test apidocs .PHONY: clean distclean cvsclean clean-config-files clean-tables clean-apidocs clean: @-$(RM) $(CLEANS) 2>/dev/null + $(MAKE) -C ./engine $@ $(MAKE) -C ./modules $@ $(MAKE) -C ./test $@ @for i in contrib/*; do \ @@ -81,14 +78,14 @@ cvsclean: check-topdir clean clean-tables clean-apidocs clean-config-files -rm -f configure .PHONY: engine contrib modules test apidocs-build check-topdir -engine: tables yatepaths.h $(LIBS) $(SLIBS) $(PROGS) +engine: tables yatepaths.h libyate.so $(PROGS) apidocs-build: check-topdir kdoc -C ./kdoc-filter.sh -d docs/api/ $(INCS) apidocs: @srcdir@/docs/api/index.html -@srcdir@/docs/api/index.html: @srcdir@/telengine.h @srcdir@/telephony.h +@srcdir@/docs/api/index.html: @srcdir@/yatengine.h @srcdir@/yatephone.h $(MAKE) apidocs-build .PHONY: strip sex love war @@ -125,8 +122,10 @@ yatepaths.h: $(MKDEPS) @echo '#define MOD_PATH "$(DESTDIR)$(moddir)"' > $@ @echo '#define CFG_PATH "$(DESTDIR)$(confdir)"' >> $@ -.PHONY: install install-root -install install-root: all apidocs +.PHONY: install install-root install-noapi install-api uninstall uninstall-root +install install-root: all apidocs install-noapi install-api + +install-noapi: all @mkdir -p "$(DESTDIR)$(libdir)/" && \ for i in $(SLIBS) ; do \ if [ -h "$$i" ]; then \ @@ -158,10 +157,11 @@ install install-root: all apidocs for i in $(DOCS) ; do \ install -m 0644 @srcdir@/$$i "$(DESTDIR)$(docdir)/" ; \ done ; + +install-api: apidocs install -m 0644 @srcdir@/docs/*.html "$(DESTDIR)$(docdir)/" && \ install -m 0644 @srcdir@/docs/api/*.html "$(DESTDIR)$(docdir)/api/" -.PHONY: uninstall uninstall-root uninstall uninstall-root: @-for i in $(SLIBS) ; do \ rm "$(DESTDIR)$(libdir)/$$i" ; \ @@ -216,22 +216,7 @@ snapshot tarball: check-topdir clean tables apidocs $$wd; \ rm $$wd/tar-exclude -Engine.o: @srcdir@/Engine.cpp $(MKDEPS) @srcdir@/telengine.h yateversn.h yatepaths.h - $(COMPILE) -c $< - -DataBlock.o: @srcdir@/DataBlock.cpp $(MKDEPS) @srcdir@/telengine.h @srcdir@/telephony.h - $(COMPILE) -c $< - -DataFormat.o: @srcdir@/DataFormat.cpp $(MKDEPS) @srcdir@/telengine.h @srcdir@/telephony.h - $(COMPILE) -c $< - -Mutex.o: @srcdir@/Mutex.cpp $(MKDEPS) @srcdir@/telengine.h - $(COMPILE) @MUTEX_HACK@ -c $< - -Thread.o: @srcdir@/Thread.cpp $(MKDEPS) @srcdir@/telengine.h - $(COMPILE) @THREAD_KILL@ -c $< - -%.o: @srcdir@/%.cpp $(MKDEPS) @srcdir@/telengine.h +%.o: @srcdir@/%.cpp $(MKDEPS) @srcdir@/yatengine.h $(COMPILE) -c $< @srcdir@/configure: @srcdir@/configure.in @@ -243,19 +228,20 @@ config.status: @srcdir@/configure Makefile: @srcdir@/Makefile.in $(MKDEPS) ./config.status -yate: $(OBJS) libyate.so $(LIBS) +yate: libyate.so $(OBJS) $(LIBS) $(LINK) -o $@ $(LIBTHR) $^ -libyate.so: libyate.so.@PACKAGE_VERSION@ +libyate.so: $(YLIB) ln -sf $^ $@ -libyate.so.@PACKAGE_VERSION@: $(LIBOBJS) $(LIBS) - $(LINK) -shared -o $@ -Wl,--soname=$@ $(LIBTHR) $^ $(LIBAUX) +.PHONY: $(YLIB) +$(YLIB): + $(MAKE) -C ./engine all .PHONY: help help: @echo -e 'Usual make targets:\n\ all engine contrib modules apidocs test everything\n\ - install uninstall install-root uninstall-root\n\ + install uninstall install-noapi install-root uninstall-root\n\ clean distclean cvsclean (avoid this one!)\n\ snapshot tarball' diff --git a/clients/main-gtk.cpp b/clients/main-gtk.cpp index c3b91181..fce680e8 100644 --- a/clients/main-gtk.cpp +++ b/clients/main-gtk.cpp @@ -22,8 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include #include #include diff --git a/clients/main-qt.cpp b/clients/main-qt.cpp index c6a36069..d20fed89 100644 --- a/clients/main-qt.cpp +++ b/clients/main-qt.cpp @@ -23,8 +23,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include #include diff --git a/configure.in b/configure.in index 55984f9d..e6f59ceb 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(YATE, 0.8.7) +AC_INIT(YATE, 0.8.8) AC_CONFIG_SRCDIR([README]) AC_PREREQ(2.52) @@ -544,6 +544,7 @@ AC_CONFIG_FILES([yate.spec yate.pc yateversn.h Makefile + engine/Makefile modules/Makefile scripts/Makefile conf.d/Makefile diff --git a/contrib/ysip/Makefile.in b/contrib/ysip/Makefile.in index ddffce4c..3b46c580 100644 --- a/contrib/ysip/Makefile.in +++ b/contrib/ysip/Makefile.in @@ -9,7 +9,7 @@ DEFS := INCLUDES := -I@top_srcdir@ -I../.. -I@srcdir@ CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= -L.. -lyate -INCFILES := @top_srcdir@/telengine.h @top_srcdir@/telephony.h \ +INCFILES := @top_srcdir@/yatengine.h @top_srcdir@/yatephone.h \ @srcdir@/ysip.h @srcdir@/util.h PROGS= diff --git a/contrib/ysip/body.cpp b/contrib/ysip/body.cpp index 8f1ae7ba..f7637d2a 100644 --- a/contrib/ysip/body.cpp +++ b/contrib/ysip/body.cpp @@ -21,14 +21,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include +#include #include #include -#include -#include - using namespace TelEngine; SIPBody::SIPBody(const String& type) diff --git a/contrib/ysip/engine.cpp b/contrib/ysip/engine.cpp index 0ead3c0c..0dcfbe91 100644 --- a/contrib/ysip/engine.cpp +++ b/contrib/ysip/engine.cpp @@ -21,13 +21,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include #include #include -#include using namespace TelEngine; diff --git a/contrib/ysip/message.cpp b/contrib/ysip/message.cpp index 352d6f57..e1e72fad 100644 --- a/contrib/ysip/message.cpp +++ b/contrib/ysip/message.cpp @@ -21,13 +21,12 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include +#include #include #include -#include -#include using namespace TelEngine; diff --git a/contrib/ysip/transaction.cpp b/contrib/ysip/transaction.cpp index 219191e6..7b2c3c93 100644 --- a/contrib/ysip/transaction.cpp +++ b/contrib/ysip/transaction.cpp @@ -21,12 +21,11 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include #include -#include using namespace TelEngine; diff --git a/contrib/ysip/util.cpp b/contrib/ysip/util.cpp index 9c61900c..6de8f921 100644 --- a/contrib/ysip/util.cpp +++ b/contrib/ysip/util.cpp @@ -21,7 +21,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/contrib/ysip/util.h b/contrib/ysip/util.h index 38f65b13..0a6acd20 100644 --- a/contrib/ysip/util.h +++ b/contrib/ysip/util.h @@ -21,7 +21,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include namespace TelEngine { diff --git a/contrib/ysip/yatesip.h b/contrib/ysip/yatesip.h index 922bb5a9..009a0f9c 100644 --- a/contrib/ysip/yatesip.h +++ b/contrib/ysip/yatesip.h @@ -21,8 +21,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include +#include /** * We use Telephony Engine namespace, which in fact holds just the diff --git a/engine/.cvsignore b/engine/.cvsignore new file mode 100644 index 00000000..cfebb73f --- /dev/null +++ b/engine/.cvsignore @@ -0,0 +1,7 @@ +Makefile +core* +*.o +*.a +*.orig +*~ +.*.swp diff --git a/engine/Configuration.cpp b/engine/Configuration.cpp index e031dde7..f539ba9f 100644 --- a/engine/Configuration.cpp +++ b/engine/Configuration.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telengine.h" +#include "yatengine.h" #include #include diff --git a/engine/DataBlock.cpp b/engine/DataBlock.cpp index ec3590ff..4d777721 100644 --- a/engine/DataBlock.cpp +++ b/engine/DataBlock.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telephony.h" +#include "yatephone.h" #include #include diff --git a/engine/DataFormat.cpp b/engine/DataFormat.cpp index 417cac6e..5dd20309 100644 --- a/engine/DataFormat.cpp +++ b/engine/DataFormat.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telephony.h" +#include "yatephone.h" #include #include diff --git a/engine/Engine.cpp b/engine/Engine.cpp index dbd4f10e..a13ae7b8 100644 --- a/engine/Engine.cpp +++ b/engine/Engine.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telengine.h" +#include "yatengine.h" #include "yatepaths.h" #include "yateversn.h" diff --git a/engine/Makefile.in b/engine/Makefile.in new file mode 100644 index 00000000..a8863aab --- /dev/null +++ b/engine/Makefile.in @@ -0,0 +1,76 @@ +# Makefile +# This file holds the make rules for the Telephony Engine + +# override DEBUG at compile time to enable full debug or remove it all +DEBUG := + +CXX := @CXX@ -Wall +SED := sed +DEFS := +LIBAUX:= -ldl +LIBTHR:= -lpthread +INCLUDES := -I.. -I@top_srcdir@ +CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ +LDFLAGS:= +LDCONFIG:=true + +MKDEPS := ../config.status +YLIB:= ../libyate.so.@PACKAGE_VERSION@ +EINC := @top_srcdir@/yatengine.h +PINC := @top_srcdir@/yatephone.h +LIBS := +ENGOBJS := TelEngine.o String.o ObjList.o NamedList.o Configuration.o \ + Message.o Mutex.o Thread.o Plugin.o Engine.o MD5.o +TELOBJS :=DataBlock.o DataFormat.o + +LIBOBJS := $(ENGOBJS) $(TELOBJS) +CLEANS = $(LIBOBJS) core +COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CFLAGS) +LINK = $(CXX) $(LDFLAGS) + +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +libdir = @libdir@ +incdir = @includedir@/yate +mandir = @mandir@ +docdir = $(prefix)/share/doc/yate-@PACKAGE_VERSION@ +vardir = @localstatedir@/lib/yate +moddir = @libdir@/yate +confdir = @sysconfdir@/yate + +.PHONY: all +all: $(YLIB) + +.PHONY: clean +clean: + @-$(RM) $(CLEANS) 2>/dev/null + +.PHONY: strip +strip: all + -strip --strip-debug --discard-locals $(YLIB) + +Engine.o: @srcdir@/Engine.cpp $(MKDEPS) $(EINC) ../yateversn.h ../yatepaths.h + $(COMPILE) -c $< + +DataBlock.o: @srcdir@/DataBlock.cpp $(MKDEPS) $(EINC) $(PINC) + $(COMPILE) -c $< + +DataFormat.o: @srcdir@/DataFormat.cpp $(MKDEPS) $(EINC) $(PINC) + $(COMPILE) -c $< + +Mutex.o: @srcdir@/Mutex.cpp $(MKDEPS) $(EINC) + $(COMPILE) @MUTEX_HACK@ -c $< + +Thread.o: @srcdir@/Thread.cpp $(MKDEPS) $(EINC) + $(COMPILE) @THREAD_KILL@ -c $< + +%.o: @srcdir@/%.cpp $(MKDEPS) $(EINC) + $(COMPILE) -c $< + +Makefile: @srcdir@/Makefile.in $(MKDEPS) + cd .. && ./config.status + +$(YLIB): $(LIBOBJS) $(LIBS) + $(LINK) -shared -o $@ -Wl,--soname=$@ $(LIBTHR) $^ $(LIBAUX) diff --git a/engine/Message.cpp b/engine/Message.cpp index 62a64271..12b6c010 100644 --- a/engine/Message.cpp +++ b/engine/Message.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telengine.h" +#include "yatengine.h" #include using namespace TelEngine; diff --git a/engine/Mutex.cpp b/engine/Mutex.cpp index b23f4958..a1036e7f 100644 --- a/engine/Mutex.cpp +++ b/engine/Mutex.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telengine.h" +#include "yatengine.h" #include #include diff --git a/engine/NamedList.cpp b/engine/NamedList.cpp index 595b0ff8..f5d4175d 100644 --- a/engine/NamedList.cpp +++ b/engine/NamedList.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telengine.h" +#include "yatengine.h" using namespace TelEngine; diff --git a/engine/ObjList.cpp b/engine/ObjList.cpp index 114782aa..65864121 100644 --- a/engine/ObjList.cpp +++ b/engine/ObjList.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telengine.h" +#include "yatengine.h" using namespace TelEngine; diff --git a/engine/Plugin.cpp b/engine/Plugin.cpp index 1d407cd5..dfe41f7b 100644 --- a/engine/Plugin.cpp +++ b/engine/Plugin.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telengine.h" +#include "yatengine.h" using namespace TelEngine; diff --git a/engine/String.cpp b/engine/String.cpp index a677c205..2dcdad5e 100644 --- a/engine/String.cpp +++ b/engine/String.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telengine.h" +#include "yatengine.h" #include #include diff --git a/engine/TelEngine.cpp b/engine/TelEngine.cpp index 3c4bc16f..de19c9e8 100644 --- a/engine/TelEngine.cpp +++ b/engine/TelEngine.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telengine.h" +#include "yatengine.h" #include #include diff --git a/engine/Thread.cpp b/engine/Thread.cpp index 1c7e9dff..f14d7efe 100644 --- a/engine/Thread.cpp +++ b/engine/Thread.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telengine.h" +#include "yatengine.h" #include #include diff --git a/engine/YMD5.cpp b/engine/YMD5.cpp index 7175f99a..a45d0153 100644 --- a/engine/YMD5.cpp +++ b/engine/YMD5.cpp @@ -23,7 +23,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include "yatengine.h" + #include #include @@ -359,6 +360,7 @@ bool MD5::update(const void* buf, unsigned int len) return false; init(); MD5_Update((MD5_CTX*)m_private, (unsigned char const*)buf, len); + return true; } const unsigned char* MD5::rawDigest() diff --git a/main.cpp b/main.cpp index d6bbaeb5..a8f71d62 100644 --- a/main.cpp +++ b/main.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "telengine.h" +#include "yatengine.h" extern "C" int main(int argc, const char **argv, const char **environ) { diff --git a/modules/Makefile.in b/modules/Makefile.in index 0ba2c3a1..efc00cd1 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -15,7 +15,7 @@ CFLAGS := -O2 @MODULE_CPPFLAGS@ @INLINE_FLAGS@ LDFLAGS:= -L.. -lyate MODFLAGS:= @MODULE_LDFLAGS@ MODSTRIP:= @MODULE_SYMBOLS@ -INCFILES := @top_srcdir@/telengine.h @top_srcdir@/telephony.h ../yateversn.h +INCFILES := @top_srcdir@/yatengine.h @top_srcdir@/yatephone.h ../yateversn.h SUBDIRS := MKDEPS := ../config.status diff --git a/modules/callgen.cpp b/modules/callgen.cpp index 6caaac9a..b5009607 100644 --- a/modules/callgen.cpp +++ b/modules/callgen.cpp @@ -22,8 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include #include #include diff --git a/modules/cdrbuild.cpp b/modules/cdrbuild.cpp index 9b25d56b..2b24861e 100644 --- a/modules/cdrbuild.cpp +++ b/modules/cdrbuild.cpp @@ -22,8 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include #include diff --git a/modules/cdrfile.cpp b/modules/cdrfile.cpp index b3036bbb..111f8b6f 100644 --- a/modules/cdrfile.cpp +++ b/modules/cdrfile.cpp @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/modules/cdrpgsql.cpp b/modules/cdrpgsql.cpp index 2366040c..6f27c4eb 100644 --- a/modules/cdrpgsql.cpp +++ b/modules/cdrpgsql.cpp @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include #include diff --git a/modules/extmodule.cpp b/modules/extmodule.cpp index bb598213..1b5598d8 100644 --- a/modules/extmodule.cpp +++ b/modules/extmodule.cpp @@ -25,8 +25,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include #include #include diff --git a/modules/faxchan.cpp b/modules/faxchan.cpp index 450614a6..352aa76a 100644 --- a/modules/faxchan.cpp +++ b/modules/faxchan.cpp @@ -42,8 +42,7 @@ extern "C" { #include "spandsp.h" }; -#include -#include +#include #include #include diff --git a/modules/gsmcodec.cpp b/modules/gsmcodec.cpp index 7d4db7ca..a63256aa 100644 --- a/modules/gsmcodec.cpp +++ b/modules/gsmcodec.cpp @@ -22,8 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include extern "C" { #include diff --git a/modules/h323chan.cpp b/modules/h323chan.cpp index 57e16693..b470f9a9 100644 --- a/modules/h323chan.cpp +++ b/modules/h323chan.cpp @@ -54,8 +54,7 @@ #define USE_CAPABILITY_FACTORY #endif -#include -#include +#include #include #include diff --git a/modules/iaxchan.cpp b/modules/iaxchan.cpp index 78e75d20..5a8b3cdd 100644 --- a/modules/iaxchan.cpp +++ b/modules/iaxchan.cpp @@ -23,8 +23,7 @@ */ -#include -#include +#include #include #include diff --git a/modules/moh.cpp b/modules/moh.cpp index ceb5947d..fe0242b1 100644 --- a/modules/moh.cpp +++ b/modules/moh.cpp @@ -32,8 +32,7 @@ * by Maciek Kaminski (maciejka_at_tiger.com.pl) */ -#include -#include +#include #include #include diff --git a/modules/msgsniff.cpp b/modules/msgsniff.cpp index 6beca385..4a8b3818 100644 --- a/modules/msgsniff.cpp +++ b/modules/msgsniff.cpp @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/modules/osschan.cpp b/modules/osschan.cpp index b570c34a..652835cc 100644 --- a/modules/osschan.cpp +++ b/modules/osschan.cpp @@ -24,8 +24,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include #include #include diff --git a/modules/pgsqlroute.cpp b/modules/pgsqlroute.cpp index 804eb4e8..e2e11911 100644 --- a/modules/pgsqlroute.cpp +++ b/modules/pgsqlroute.cpp @@ -22,8 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include #include #include diff --git a/modules/regexroute.cpp b/modules/regexroute.cpp index 6ebdbeb8..4bb20572 100644 --- a/modules/regexroute.cpp +++ b/modules/regexroute.cpp @@ -22,8 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include #include diff --git a/modules/regfile.cpp b/modules/regfile.cpp index 86885163..1073e08a 100644 --- a/modules/regfile.cpp +++ b/modules/regfile.cpp @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include diff --git a/modules/register.cpp b/modules/register.cpp index 48b66dd7..9a0458b1 100644 --- a/modules/register.cpp +++ b/modules/register.cpp @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include #include diff --git a/modules/rmanager.cpp b/modules/rmanager.cpp index bd9aead1..8b417029 100644 --- a/modules/rmanager.cpp +++ b/modules/rmanager.cpp @@ -23,7 +23,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include #include diff --git a/modules/tonegen.cpp b/modules/tonegen.cpp index fef0b61f..3b07f5ba 100644 --- a/modules/tonegen.cpp +++ b/modules/tonegen.cpp @@ -22,8 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include #include #include diff --git a/modules/wavefile.cpp b/modules/wavefile.cpp index 1c34add1..9c2562e9 100644 --- a/modules/wavefile.cpp +++ b/modules/wavefile.cpp @@ -22,8 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include #include #include diff --git a/modules/ysipchan.cpp b/modules/ysipchan.cpp index 7fcc319d..bb0bdd0a 100644 --- a/modules/ysipchan.cpp +++ b/modules/ysipchan.cpp @@ -22,8 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include +#include #include #include diff --git a/modules/zapchan.cpp b/modules/zapchan.cpp index 5018f5ce..4a466c37 100644 --- a/modules/zapchan.cpp +++ b/modules/zapchan.cpp @@ -35,8 +35,7 @@ extern int q931_setup(struct pri *pri, q931_call *c, struct pri_sr *req); #include #include -#include -#include +#include #include diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 14d90038..e6314fae 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -5,7 +5,7 @@ DESTDIR := SCRIPTS := -SCRLIBS := libyate.php Yate.pm +SCRLIBS := libyate.php libyatechan.php libyate.py Yate.pm prefix = @prefix@ exec_prefix = @exec_prefix@ diff --git a/test/Makefile.in b/test/Makefile.in index 01b91545..9401422d 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -36,7 +36,7 @@ strip: all clean: @-$(RM) $(PROGS) $(LIBS) $(OBJS) core 2>/dev/null -%.o: @srcdir@/%.cpp $(MKDEPS) @top_srcdir@/telengine.h +%.o: @srcdir@/%.cpp $(MKDEPS) @top_srcdir@/yatengine.h $(COMPILE) -c $< Makefile: @srcdir@/Makefile.in $(MKDEPS) diff --git a/test/randcall.cpp b/test/randcall.cpp index 9aa6cbcd..c1ac6ffb 100644 --- a/test/randcall.cpp +++ b/test/randcall.cpp @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include #include diff --git a/test/test.cpp b/test/test.cpp index 912496bd..f5c95739 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -3,7 +3,7 @@ This file holds the entry point of the Telephony Engine */ -#include +#include using namespace TelEngine; diff --git a/test/test1.cpp b/test/test1.cpp index b1dfb044..9793b887 100644 --- a/test/test1.cpp +++ b/test/test1.cpp @@ -3,7 +3,7 @@ This file holds the entry point of the Telephony Engine */ -#include +#include #include diff --git a/yatengine.h b/yatengine.h index e80b9cd1..eef0ae92 100644 --- a/yatengine.h +++ b/yatengine.h @@ -1,5 +1,5 @@ /** - * telengine.h + * yatengine.h * This file is part of the YATE Project http://YATE.null.ro * * Yet Another Telephony Engine - a fully featured software PBX and IVR @@ -20,8 +20,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef __TELENGINE_H -#define __TELENGINE_H +#ifndef __YATENGINE_H +#define __YATENGINE_H #ifndef __cplusplus #error C++ is required @@ -2353,4 +2353,4 @@ private: }; // namespace TelEngine -#endif /* __TELENGINE_H */ +#endif /* __YATENGINE_H */ diff --git a/yatephone.h b/yatephone.h index 9987a6d6..6084807a 100644 --- a/yatephone.h +++ b/yatephone.h @@ -1,5 +1,5 @@ /** - * telephony.h + * yatephone.h * This file is part of the YATE Project http://YATE.null.ro * * Yet Another Telephony Engine - a fully featured software PBX and IVR @@ -20,14 +20,14 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef __TELEPHONY_H -#define __TELEPHONY_H +#ifndef __YATEPHONE_H +#define __YATEPHONE_H #ifndef __cplusplus #error C++ is required #endif -#include +#include /** * Holds all Telephony Engine related classes. @@ -720,4 +720,4 @@ public: }; // namespace TelEngine -#endif /* __TELEPHONY_H */ +#endif /* __YATEPHONE_H */