--- a/hotspot/make/linux/makefiles/vm.make Wed Dec 15 07:11:31 2010 -0800
+++ b/hotspot/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)))
--- a/hotspot/make/solaris/makefiles/vm.make Wed Dec 15 07:11:31 2010 -0800
+++ b/hotspot/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)))
--- a/hotspot/make/windows/create_obj_files.sh Wed Dec 15 07:11:31 2010 -0800
+++ b/hotspot/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=