diff --git a/libs/openzap/Makefile b/libs/openzap/Makefile deleted file mode 100644 index ece84e085a..0000000000 --- a/libs/openzap/Makefile +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright (c) 2007, Anthony Minessale II -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of the original author; nor the names of any contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -CFLAGS=-std=gnu99 -ffast-math -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -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 \ -$(SRC)/zap_io.o \ -$(SRC)/zap_isdn.o \ -$(SRC)/zap_analog.o \ -$(SRC)/zap_config.o \ -$(SRC)/zap_callerid.o \ -$(SRC)/fsk.o \ -$(SRC)/uart.o \ -$(SRC)/g711.o \ -$(SRC)/libteletone_detect.o \ -$(SRC)/libteletone_generate.o \ -$(SRC)/zap_buffer.o \ -$(SRC)/zap_threadmutex.o \ -$(SRC)/isdn/EuroISDNStateNT.o \ -$(SRC)/isdn/EuroISDNStateTE.o \ -$(SRC)/isdn/mfifo.o \ -$(SRC)/isdn/Q921.o \ -$(SRC)/isdn/Q931api.o \ -$(SRC)/isdn/Q931.o \ -$(SRC)/isdn/Q931ie.o \ -$(SRC)/isdn/Q931mes.o \ -$(SRC)/isdn/Q931StateNT.o \ -$(SRC)/isdn/Q931StateTE.o \ -$(SRC)/isdn/nationalmes.o \ -$(SRC)/isdn/nationalStateNT.o \ -$(SRC)/isdn/nationalStateTE.o \ -$(SRC)/isdn/DMSmes.o \ -$(SRC)/isdn/DMSStateNT.o \ -$(SRC)/isdn/DMSStateTE.o \ -$(SRC)/isdn/5ESSmes.o \ -$(SRC)/isdn/5ESSStateNT.o \ -$(SRC)/isdn/5ESSStateTE.o \ -$(SRC)/isdn/Q932mes.o \ -$(SRC)/zap_zt.o \ -$(SRC)/zap_wanpipe.o - -#SRCS=$(shell echo $(OBJS) | sed "s/\.o/\.c/g") - -HEADERS= $(SRC)/include/fsk.h \ -$(SRC)/include/g711.h \ -$(SRC)/include/hashtable.h \ -$(SRC)/include/hashtable_itr.h \ -$(SRC)/include/hashtable_private.h \ -$(SRC)/include/libteletone_detect.h \ -$(SRC)/include/libteletone_generate.h \ -$(SRC)/include/libteletone.h \ -$(SRC)/include/openzap.h \ -$(SRC)/include/sangoma_tdm_api.h \ -$(SRC)/include/uart.h \ -$(SRC)/include/wanpipe_tdm_api_iface.h \ -$(SRC)/include/zap_analog.h \ -$(SRC)/include/zap_buffer.h \ -$(SRC)/include/zap_config.h \ -$(SRC)/include/zap_isdn.h \ -$(SRC)/include/zap_skel.h \ -$(SRC)/include/zap_threadmutex.h \ -$(SRC)/include/zap_types.h \ -$(SRC)/include/zap_wanpipe.h \ -$(SRC)/include/zap_zt.h \ -$(SRC)/isdn/include/mfifo.h \ -$(SRC)/isdn/include/national.h \ -$(SRC)/isdn/include/DMS.h \ -$(SRC)/isdn/include/5ESS.h \ -$(SRC)/isdn/include/Q921.h \ -$(SRC)/isdn/include/Q931.h \ -$(SRC)/isdn/include/Q931ie.h \ -$(SRC)/isdn/include/Q932.h - -PWD=$(shell pwd) -INCS=-I$(PWD)/$(SRC)/include -I$(PWD)/$(SRC)/isdn/include -CFLAGS+= $(INCS) $(ZAP_CFLAGS) -MYLIB=libopenzap.a -LIBPRIA=libpri.a -LIBPRI=./libpri -TMP=-I$(LIBPRI) -I$(SRC)/include -I./src -w - -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),) -OBJS += $(SRC)/zap_pika.o -CFLAGS += -DZAP_PIKA_SUPPORT -I$(PIKA_DIR) -ADD_OBJS = $(PIKA_LIB) -endif -endif - -all: $(MYLIB) - -$(MYLIB): $(OBJS) $(HEADERS) $(SOURCES) - ar rcs $(MYLIB) $(OBJS) $(ADD_OBJS) - ranlib $(MYLIB) - -testapp: $(SRC)/testapp.c $(MYLIB) - $(CC) $(INCS) -L. $(SRC)/testapp.c -o testapp -lopenzap -lm -lpthread - -testcid: $(SRC)/testcid.c $(MYLIB) - $(CC) $(INCS) -L. -g -ggdb $(SRC)/testcid.c -o testcid -lopenzap -lm -lpthread - -testtones: $(SRC)/testtones.c $(MYLIB) - $(CC) $(INCS) -L. $(SRC)/testtones.c -o testtones -lopenzap -lm - -detect_tones: $(SRC)/detect_tones.c $(MYLIB) - $(CC) $(INCS) -L. $(SRC)/detect_tones.c -o detect_tones -lopenzap -lm - -detect_dtmf: $(SRC)/detect_dtmf.c $(MYLIB) - $(CC) $(INCS) -L. $(SRC)/detect_dtmf.c -o detect_dtmf -lopenzap -lm - -testisdn: $(SRC)/testisdn.c $(MYLIB) - $(CC) $(INCS) $(ZAP_CFLAGS) -L. $(SRC)/testisdn.c -o testisdn -lopenzap -lm -lpthread - -testanalog: $(SRC)/testanalog.c $(MYLIB) - $(CC) $(INCS) -L. $(SRC)/testanalog.c -o testanalog -lopenzap -lm -lpthread - -$(SRC)/priserver.o: $(SRC)/priserver.c - $(CC) $(INCS) $(TMP) -c $(SRC)/priserver.c -o $(SRC)/priserver.o - -$(SRC)/sangoma_pri.o: $(SRC)/sangoma_pri.c - $(CC) $(INCS) $(TMP) -c $(SRC)/sangoma_pri.c -o $(SRC)/sangoma_pri.o - -$(LIBPRI)/$(LIBPRIA): - cd libpri && make - -priserver: $(MYLIB) $(SRC)/priserver.o $(SRC)/sangoma_pri.o $(LIBPRI)/$(LIBPRIA) - $(CC) $(SRC)/sangoma_pri.o $(SRC)/priserver.o -L. -o priserver -lopenzap -lm -lpthread $(LIBPRI)/$(LIBPRIA) - -$(SRC)/zap_io.o: $(SRC)/zap_io.c - $(CC) $(MOD_CFLAGS) $(CC_CFLAGS) $(CFLAGS) -c $< -o $@ - -%.o: %.c $(HEADERS) - $(CC) $(CC_CFLAGS) $(CFLAGS) -c $< -o $@ - -dox: - cd docs && doxygen $(PWD)/docs/Doxygen.conf - -mod_openzap/mod_openzap.so: $(MYLIB) mod_openzap/mod_openzap.c - cd mod_openzap && make - -mod_openzap: mod_openzap/mod_openzap.so - -mod_openzap-install: mod_openzap - cd mod_openzap && make install - -mod_openzap-clean: - @if [ -f mod_openzap/mod_openzap.so ] ; then cd mod_openzap && make clean ; fi - -clean: mod_openzap-clean - rm -f $(SRC)/*.o $(SRC)/isdn/*.o $(MYLIB) *~ \#* testapp testcid testtones detect_tones detect_dtmf priserver testisdn testanalog - @if [ -f $(LIBPRI)/$(LIBPRIA) ] ; then cd $(LIBPRI) && make clean ; fi diff --git a/libs/openzap/configure.ac b/libs/openzap/configure.ac index 920ff6cacb..a3512e95a1 100644 --- a/libs/openzap/configure.ac +++ b/libs/openzap/configure.ac @@ -32,7 +32,7 @@ AX_COMPILER_VENDOR case "${ax_cv_c_compiler_vendor}" in gnu) - COMP_VENDOR_CFLAGS="-std=gnu99 -ffast-math -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes" + COMP_VENDOR_CFLAGS="-Wall -Werror -Wextra -Wno-unused-parameter" ;; sun) COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -D__FUNCTION__=__func__ -xvpara" @@ -41,7 +41,7 @@ sun) fi ;; *) - COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes" + COMP_VENDOR_CFLAGS="-Wall -Werror -Wextra -Wno-unused-parameter" ;; esac diff --git a/libs/openzap/general.makefile b/libs/openzap/general.makefile deleted file mode 100644 index e69de29bb2..0000000000