From: Kevin P. Fleming Date: Tue, 19 Dec 2006 21:28:43 +0000 (+0000) Subject: Merged revisions 48586 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~3686 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa5931d0c3fae55df04c9eae6aac0db593593f98;p=thirdparty%2Fasterisk.git Merged revisions 48586 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r48586 | kpfleming | 2006-12-19 15:28:04 -0600 (Tue, 19 Dec 2006) | 2 lines suppress compiler warnings in this module until it can be improved ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48587 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/Makefile b/channels/Makefile index 3d36793d42..7363725140 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -107,8 +107,10 @@ chan_h323.so: chan_h323.o h323/libchanh323.a $(CMD_PREFIX) $(CXX) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat endif -chan_misdn.o: ASTCFLAGS+=-Imisdn +chan_misdn.o: ASTCFLAGS+=-Imisdn -misdn_config.o: ASTCFLAGS+=-Imisdn +misdn_config.o: ASTCFLAGS+=-Imisdn + +misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): chan_misdn.o misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o