From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 3 Jun 2010 14:48:55 +0000 (+0000)
Subject: Merged revisions 267445 via svnmerge from
X-Git-Tag: 1.6.2.10-rc1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=980f56837b9cbf804c73a69e01df5b29a5753f97;p=thirdparty%2Fasterisk.git

Merged revisions 267445 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r267445 | russell | 2010-06-03 09:48:09 -0500 (Thu, 03 Jun 2010) | 2 lines

  Comment out a rule that likes to run implicitly unnecessarily, breaking builds
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@267446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/h323/Makefile.in b/channels/h323/Makefile.in
index 2d5f3a5477..2908c52cb6 100644
--- a/channels/h323/Makefile.in
+++ b/channels/h323/Makefile.in
@@ -37,8 +37,12 @@ $(SOURCES)::	Makefile ../../Makefile
 libchanh323.a:	$(OBJS)
 	ar crv $@ $(OBJS)
 
-cisco-h225.cxx::	cisco-h225.asn
-	asnparser -m CISCO_H225 -c $<
+# 
+# We have this file in svn, so this is commented out to ensure it doesn't try
+# to run implicitly.  However, it's still here for reference.
+#
+#cisco-h225.cxx::	cisco-h225.asn
+#	asnparser -m CISCO_H225 -c $<
 
 Makefile.ast:
 	@echo H323CFLAGS  = $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) >$@.tmp