# HG changeset patch
# User sla
# Date 1292429034 28800
# Node ID 450ece4d8a10f9714cf0459ebf28b8003d7901e1
# Parent  aa6e219afbf1590b4d9228730435fdd67a80d46b# Parent  e7ad5f6f4d29b5f3099be3e7256e2bcd43a9ae2c
Merge

diff -r aa6e219afbf1 -r 450ece4d8a10 make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make	Wed Dec 15 07:11:31 2010 -0800
+++ b/make/linux/makefiles/vm.make	Wed Dec 15 08:03:54 2010 -0800
@@ -168,7 +168,9 @@
 
 # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE.
 define findsrc
-	$(notdir $(shell find $(1) \( -name \*.c -o -name \*.cpp -o -name \*.s \) -a \! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \) ))
+	$(notdir $(shell find $(1)/. ! -name . -prune \
+		-a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \
+		-a ! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \)))
 endef
 
 Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e)))
diff -r aa6e219afbf1 -r 450ece4d8a10 make/solaris/makefiles/vm.make
--- a/make/solaris/makefiles/vm.make	Wed Dec 15 07:11:31 2010 -0800
+++ b/make/solaris/makefiles/vm.make	Wed Dec 15 08:03:54 2010 -0800
@@ -184,7 +184,9 @@
 
 # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE.
 define findsrc
-	$(notdir $(shell find $(1) \( -name \*.c -o -name \*.cpp -o -name \*.s \) -a \! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \) ))
+	$(notdir $(shell find $(1)/. ! -name . -prune \
+		-a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \
+		-a ! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \)))
 endef
 
 Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e)))
diff -r aa6e219afbf1 -r 450ece4d8a10 make/windows/create_obj_files.sh
--- a/make/windows/create_obj_files.sh	Wed Dec 15 07:11:31 2010 -0800
+++ b/make/windows/create_obj_files.sh	Wed Dec 15 08:03:54 2010 -0800
@@ -107,8 +107,12 @@
 	"x86_64") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} *x86_32*" ;;
 esac
 
+# Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE.
 function findsrc {
-    $FIND ${1} \( -name \*.c -o -name \*.cpp -o -name \*.s \) -a \! \( -name ${Src_Files_EXCLUDE// / -o -name } \) | sed 's/.*\/\(.*\)/\1/';
+    $FIND ${1}/. ! -name . -prune \
+		-a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \
+		-a \! \( -name ${Src_Files_EXCLUDE// / -o -name } \) \
+		| sed 's/.*\/\(.*\)/\1/';
 }
 
 Src_Files=