X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=83b789fa2245b0246286ee91a5aeee05fb52c966;hb=c4db7276e0055931bb29942d12a10494f569e749;hp=dabf0c03fe80a60911b972f6cb343ca2a1b6c253;hpb=1d7ca713bacb12a356b3b3de0f6a942eb3c085a1;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index dabf0c03fe8..83b789fa224 100644
--- a/Makefile
+++ b/Makefile
@@ -77,9 +77,9 @@ debug-opt-prof:
 dist-hook::
 	$(Echo) Eliminating files constructed by configure
 	$(Verb) $(RM) -f \
-	  $(TopDistDir)/include/llvm/ADT/hash_map  \
-	  $(TopDistDir)/include/llvm/ADT/hash_set  \
-	  $(TopDistDir)/include/llvm/ADT/iterator  \
+	  $(TopDistDir)/include/llvm/ADT/hash_map.h  \
+	  $(TopDistDir)/include/llvm/ADT/hash_set.h  \
+	  $(TopDistDir)/include/llvm/ADT/iterator.h  \
 	  $(TopDistDir)/include/llvm/Config/config.h  \
 	  $(TopDistDir)/include/llvm/Support/DataTypes.h  \
 	  $(TopDistDir)/include/llvm/Support/ThreadSupport.h
@@ -95,9 +95,9 @@ install-libs: install
 FilesToConfig := \
   include/llvm/Config/config.h \
   include/llvm/Support/DataTypes.h \
-  include/llvm/ADT/hash_map \
-  include/llvm/ADT/hash_set \
-  include/llvm/ADT/iterator
+  include/llvm/ADT/hash_map.h \
+  include/llvm/ADT/hash_set.h \
+  include/llvm/ADT/iterator.h
 FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
 
 all-local:: $(FilesToConfigPATH)
@@ -142,15 +142,16 @@ build-for-llvm-top:
 	fi
 	$(Verb) $(MAKE) tools-only
 
-
-
 SVN = svn
+SVN-UPDATE-OPTIONS =
 AWK = awk
-SUB-SVN-DIRS = $(AWK) '/\?      / {print $$2}' | xargs $(SVN) info 2>/dev/null | grep "Path: " | $(AWK) '{print $$2}'
+SUB-SVN-DIRS = $(AWK) '/\?\ \ \ \ \ \ / {print $$2}'   \
+		| LANG=C xargs $(SVN) info 2>/dev/null \
+		| $(AWK) '/Path:\ / {print $$2}'
 
 update:
-	$(SVN) update
-	@ $(SVN) status | $(SUB-SVN-DIRS) | xargs $(SVN) update
+	$(SVN) $(SVN-UPDATE-OPTIONS) update $(LLVM_SRC_ROOT)
+	@ $(SVN) status $(LLVM_SRC_ROOT) | $(SUB-SVN-DIRS) | xargs $(SVN) $(SVN-UPDATE-OPTIONS) update
 
 happiness: update all check