comparison make/bsd/makefiles/vm.make @ 6858:b261523fe66c hs25-b05

Merge
author amurillo
date Fri, 12 Oct 2012 13:55:52 -0700
parents fb19af007ffc
children e522a00b91aa 892acf0431ef
comparison
equal deleted inserted replaced
6829:0cc77f9b31ad 6858:b261523fe66c
188 COMPILER1_SPECIFIC_FILES := c1_\* 188 COMPILER1_SPECIFIC_FILES := c1_\*
189 SHARK_SPECIFIC_FILES := shark 189 SHARK_SPECIFIC_FILES := shark
190 ZERO_SPECIFIC_FILES := zero 190 ZERO_SPECIFIC_FILES := zero
191 191
192 # Always exclude these. 192 # Always exclude these.
193 Src_Files_EXCLUDE := jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 193 Src_Files_EXCLUDE += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
194 194
195 # Exclude per type. 195 # Exclude per type.
196 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 196 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
197 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 197 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
198 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) 198 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)