[asterisk-commits] russell: branch 1.6.2 r267446 - in /branches/1.6.2: ./ channels/h323/Makefile.in

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Jun  3 09:48:55 2010
New Revision: 267446

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=267446
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/h323/Makefile.in

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/channels/h323/Makefile.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/h323/Makefile.in?view=diff&rev=267446&r1=267445&r2=267446
==============================================================================
--- branches/1.6.2/channels/h323/Makefile.in (original)
+++ branches/1.6.2/channels/h323/Makefile.in Thu Jun  3 09:48:55 2010
@@ -37,8 +37,12 @@
 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