[svn-commits] kmoore: trunk r330764 - in /trunk: ./ main/Makefile

[SVN commits to the Digium repositories]

Author: kmoore
Date: Wed Aug  3 10:16:25 2011
New Revision: 330764

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=330764
Log:
Merged revisions 330763 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330763 | kmoore | 2011-08-03 10:15:26 -0500 (Wed, 03 Aug 2011) | 16 lines
  
  Merged revisions 330762 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r330762 | kmoore | 2011-08-03 10:14:36 -0500 (Wed, 03 Aug 2011) | 9 lines
    
    editing files in main/editline does not ensure rebuild of libedit.a
    
    When editing a source file in main/editline, the build system does not rebuild
    libedit.a and uses the already existing one instead.  Adding a PHONY to
    CHECK_SUBDIR fixes this problem.
    
    (closes issue ASTERISK-16221)
    Patch-by: Walter Doekes
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/main/Makefile?view=diff&rev=330764&r1=330763&r2=330764
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Wed Aug  3 10:16:25 2011
@@ -106,6 +106,7 @@
   endif
 endif
 
+.PHONY: CHECK_SUBDIR
 CHECK_SUBDIR:	# do nothing, just make sure that we recurse in the subdir/
 
 editline/libedit.a: CHECK_SUBDIR