comparison make/linux/makefiles/top.make @ 1696:688a538aa654

Merge
author trims
date Fri, 13 Aug 2010 10:55:42 -0700
parents d2ede61b7a12
children f95d63e2154a
comparison
equal deleted inserted replaced
1673:6709c14587c2 1696:688a538aa654
1 # 1 #
2 # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
73 $(VM)/includeDB_features 73 $(VM)/includeDB_features
74 Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 74 Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
75 Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2 75 Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
76 Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2 76 Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
77 Include_DBs/ZERO = $(Include_DBs/CORE) $(VM)/includeDB_zero 77 Include_DBs/ZERO = $(Include_DBs/CORE) $(VM)/includeDB_zero
78 Include_DBs/SHARK = $(Include_DBs/ZERO) $(VM)/includeDB_shark
78 Include_DBs = $(Include_DBs/$(TYPE)) 79 Include_DBs = $(Include_DBs/$(TYPE))
79 80
80 Cached_plat = $(GENERATED)/platform.current 81 Cached_plat = $(GENERATED)/platform.current
81 Cached_db = $(GENERATED)/includeDB.current 82 Cached_db = $(GENERATED)/includeDB.current
82 83