From: Kinsey Moore <kmoore@digium.com>
Date: Wed, 3 Aug 2011 15:15:26 +0000 (+0000)
Subject: Merged revisions 330762 via svnmerge from
X-Git-Tag: 10.0.0-beta2~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d6d961a60fe7284ea099ed618630cbe34e53ed1;p=thirdparty%2Fasterisk.git

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
........


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

diff --git a/main/Makefile b/main/Makefile
index 9533163e30..d7315c3c22 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -106,6 +106,7 @@ ASTLINK+=-Wl,--version-script,asterisk.exports
   endif
 endif
 
+.PHONY: CHECK_SUBDIR
 CHECK_SUBDIR:	# do nothing, just make sure that we recurse in the subdir/
 
 editline/libedit.a: CHECK_SUBDIR