equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 1995, 2012, 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. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
20 # |
20 # |
21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 # or visit www.oracle.com if you need additional information or have any |
22 # or visit www.oracle.com if you need additional information or have any |
23 # questions. |
23 # questions. |
24 # |
24 # |
|
25 |
|
26 # If NEWBUILD is defined, use the new build-infra Makefiles and configure. |
|
27 # See NewMakefile.gmk for more information. |
|
28 |
|
29 ifeq ($(NEWBUILD),true) |
|
30 |
|
31 # The new top level Makefile |
|
32 include NewMakefile.gmk |
|
33 |
|
34 else # Original Makefile logic |
25 |
35 |
26 BUILD_PARENT_DIRECTORY=. |
36 BUILD_PARENT_DIRECTORY=. |
27 |
37 |
28 # Basename of any originally supplied ALT_OUTPUTDIR directory |
38 # Basename of any originally supplied ALT_OUTPUTDIR directory |
29 ifndef ORIG_OUTPUTDIR_BASENAME |
39 ifndef ORIG_OUTPUTDIR_BASENAME |
555 generic_debug_build |
565 generic_debug_build |
556 |
566 |
557 # Force target |
567 # Force target |
558 FRC: |
568 FRC: |
559 |
569 |
|
570 endif # Original Makefile logic |
|
571 |