[llvm-branch-commits] [cfe-branch] r127690 - in /cfe/branches/release_29: ./ include/clang/Makefile test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Tue Mar 15 15:01:06 2011
New Revision: 127690

URL: http://llvm.org/viewvc/llvm-project?rev=127690&view=rev
Log:
For PR2928:
--- Merging r127326 into '.':
U    include/clang/Makefile


Modified:
    cfe/branches/release_29/   (props changed)
    cfe/branches/release_29/include/clang/Makefile
    cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 15 15:01:06 2011
@@ -1,2 +1,2 @@
-/cfe/trunk:127283,127308,127460,127541,127543,127563
+/cfe/trunk:127283,127308,127326,127460,127541,127543,127563
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_29/include/clang/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/include/clang/Makefile?rev=127690&r1=127689&r2=127690&view=diff
==============================================================================
--- cfe/branches/release_29/include/clang/Makefile (original)
+++ cfe/branches/release_29/include/clang/Makefile Tue Mar 15 15:01:06 2011
@@ -8,9 +8,12 @@
 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_includedir)
 	$(Verb) if test -d "$(PROJ_SRC_ROOT)/tools/clang/include/clang" ; then \
 	  cd $(PROJ_SRC_ROOT)/tools/clang/include && \
-	  for  hdr in `find clang -type f '!' '(' -name '*~' \
-	      -o -name '.#*' -o -name '*.in' -o -name '*.txt' \
-	      -o -name 'Makefile' -o -name '*.td' -o -name '*.orig' ')' -print \
+	  for  hdr in `find clang -type f \
+	      '(' -name LICENSE.TXT \
+	       -o -name '*.def' \
+	       -o -name '*.h' \
+	       -o -name '*.inc' \
+	      ')' -print \
               | grep -v CVS | grep -v .svn | grep -v .dir` ; do \
 	    instdir=$(DESTDIR)`dirname "$(PROJ_includedir)/$$hdr"` ; \
 	    if test \! -d "$$instdir" ; then \
@@ -23,7 +26,12 @@
 ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
 	$(Verb) if test -d "$(PROJ_OBJ_ROOT)/tools/clang/include/clang" ; then \
 	  cd $(PROJ_OBJ_ROOT)/tools/clang/include && \
-	  for hdr in `find clang -type f '!' '(' -name 'Makefile' ')' -print \
+	  for hdr in `find clang -type f \
+	      '(' -name LICENSE.TXT \
+	       -o -name '*.def' \
+	       -o -name '*.h' \
+	       -o -name '*.inc' \
+	      ')' -print \
             | grep -v CVS | grep -v .tmp | grep -v .dir` ; do \
 	    $(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
 	  done ; \

Propchange: cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 15 15:01:06 2011
@@ -1 +1 @@
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127283,127308,127460,127541,127543,127563
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127283,127308,127326,127460,127541,127543,127563