comparison make/windows/makefiles/generated.make @ 383:99dd4bbd9eec

Merge
author acorn
date Tue, 30 Sep 2008 12:24:27 -0400
parents 1ee8caae33af
children 0fc81f0a8ca8
comparison
equal deleted inserted replaced
382:e4355b352b7d 383:99dd4bbd9eec
48 # parallel gc 48 # parallel gc
49 IncludeDBs_gc= $(WorkSpace)/src/share/vm/includeDB_gc_parallel \ 49 IncludeDBs_gc= $(WorkSpace)/src/share/vm/includeDB_gc_parallel \
50 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \ 50 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \
51 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_shared \ 51 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_shared \
52 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parNew \ 52 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parNew \
53 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep 53 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep \
54 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_g1
54 55
55 IncludeDBs_core=$(IncludeDBs_base) $(IncludeDBs_gc) \ 56 IncludeDBs_core=$(IncludeDBs_base) $(IncludeDBs_gc) \
56 $(WorkSpace)/src/share/vm/includeDB_features 57 $(WorkSpace)/src/share/vm/includeDB_features
57 58
58 !if "$(Variant)" == "core" 59 !if "$(Variant)" == "core"