build update

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@362 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/openzap/.update b/libs/openzap/.update
new file mode 100644 (file)
index 0000000..9e957ff
--- /dev/null
+++ b/libs/openzap/.update
@@ -0,0 +1 @@
+Wed Jan  9 20:08:13 EST 2008

diff --git a/libs/openzap/Makefile b/libs/openzap/Makefile
index e90992406f1a0906635e216d0a3c48ad9a94bd9c..1919a525554ec98d8ae38a3c0267f10de8171006 100644 (file)
--- a/libs/openzap/Makefile
+++ b/libs/openzap/Makefile
@@ -30,6 +30,44 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 SRC=src
+SOURCES=\
+$(SRC)/hashtable.c \
+$(SRC)/hashtable_itr.c \
+$(SRC)/zap_io.c \
+$(SRC)/zap_isdn.c \
+$(SRC)/zap_analog.c \
+$(SRC)/zap_config.c \
+$(SRC)/zap_callerid.c \
+$(SRC)/fsk.c \
+$(SRC)/uart.c \
+$(SRC)/g711.c \
+$(SRC)/libteletone_detect.c \
+$(SRC)/libteletone_generate.c \
+$(SRC)/zap_buffer.c \
+$(SRC)/zap_threadmutex.c \
+$(SRC)/isdn/EuroISDNStateNT.c \
+$(SRC)/isdn/EuroISDNStateTE.c \
+$(SRC)/isdn/mfifo.c \
+$(SRC)/isdn/Q921.c \
+$(SRC)/isdn/Q931api.c \
+$(SRC)/isdn/Q931.c \
+$(SRC)/isdn/Q931ie.c \
+$(SRC)/isdn/Q931mes.c \
+$(SRC)/isdn/Q931StateNT.c \
+$(SRC)/isdn/Q931StateTE.c \
+$(SRC)/isdn/nationalmes.c \
+$(SRC)/isdn/nationalStateNT.c \
+$(SRC)/isdn/nationalStateTE.c \
+$(SRC)/isdn/DMSmes.c \
+$(SRC)/isdn/DMSStateNT.c \
+$(SRC)/isdn/DMSStateTE.c \
+$(SRC)/isdn/5ESSmes.c \
+$(SRC)/isdn/5ESSStateNT.c \
+$(SRC)/isdn/5ESSStateTE.c \
+$(SRC)/isdn/Q932mes.c \
+$(SRC)/zap_zt.c \
+$(SRC)/zap_wanpipe.c
+
 OBJS=\
 $(SRC)/hashtable.o \
 $(SRC)/hashtable_itr.o \
@@ -109,8 +147,8 @@ LIBPRIA=libpri.a
 LIBPRI=./libpri
 TMP=-I$(LIBPRI) -I$(SRC)/include -I./src -w
 
-PIKA_DIR=$(shell ls -d /usr/include/pika)
-PIKA_LIB=$(shell ls /usr/lib/libpikahmpapi.so)
+PIKA_DIR=$(shell ls -d /usr/include/pika 2>/dev/null)
+PIKA_LIB=$(shell ls /usr/lib/libpikahmpapi.so 2>/dev/null)
 
 ifneq ($(PIKA_DIR),)
 ifneq ($(PIKA_LIB),)
@@ -124,7 +162,7 @@ include general.makefile
 
 all: $(MYLIB)
 
-$(MYLIB): $(OBJS) $(HEADERS)
+$(MYLIB): $(OBJS) $(HEADERS) $(SOURCES)
        ar rcs $(MYLIB) $(OBJS) $(ADD_OBJS)
        ranlib $(MYLIB)
 

diff --git a/libs/openzap/mod_openzap/Makefile b/libs/openzap/mod_openzap/Makefile
index fcbf198180db2d92c1fa64486d516251bd771b37..2609dc75a5b47dbf58354fc3e0628f691fccf43e 100644 (file)
--- a/libs/openzap/mod_openzap/Makefile
+++ b/libs/openzap/mod_openzap/Makefile
@@ -8,7 +8,7 @@ include $(BASE)/build/modmake.rules
 
 local_depend: $(OZA)
 
-$(OZA): 
+$(OZA): $(OZ_DIR)/.update
        cd $(OZ_DIR) && $(MAKE) ZAP_MODS="wanpipe zt" ZAP_CFLAGS="-g -ggdb $(ALL_CXXFLAGS)"
 
 

diff --git a/libs/openzap/mod_openzap/mod_openzap.c b/libs/openzap/mod_openzap/mod_openzap.c
index b9de0281b5ee0985a736bc2a5f059d4a6f3cf970..1797cfe55581058a3ab46806707d2916de9c8e55 100644 (file)
--- a/libs/openzap/mod_openzap/mod_openzap.c
+++ b/libs/openzap/mod_openzap/mod_openzap.c
@@ -502,7 +502,7 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
 {
        switch_channel_t *channel = NULL;
        private_t *tech_pvt = NULL;
-       uint32_t len;
+       zap_size_t len;
        zap_wait_flag_t wflags = ZAP_READ;
        char dtmf[128] = "";
        zap_status_t status;