equal
deleted
inserted
replaced
24 # |
24 # |
25 |
25 |
26 BUILD_PARENT_DIRECTORY=. |
26 BUILD_PARENT_DIRECTORY=. |
27 |
27 |
28 ifndef TOPDIR |
28 ifndef TOPDIR |
29 TOPDIR:=$(shell \ |
29 TOPDIR:=. |
30 if [ -r ./j2se/make/Makefile -o -r ./jdk/make/Makefile ]; then \ |
|
31 echo "."; \ |
|
32 else \ |
|
33 echo "../.."; \ |
|
34 fi) |
|
35 endif |
30 endif |
36 |
31 |
37 ifndef CONTROL_TOPDIR |
32 ifndef CONTROL_TOPDIR |
38 CONTROL_TOPDIR=$(TOPDIR)/control |
33 CONTROL_TOPDIR=$(TOPDIR) |
39 CONTROL_TOPDIR:=$(shell \ |
|
40 if [ -r $(TOPDIR)/control/make/Makefile ]; then \ |
|
41 echo "$(TOPDIR)/control"; \ |
|
42 else \ |
|
43 echo "$(TOPDIR)"; \ |
|
44 fi) |
|
45 endif |
34 endif |
46 |
35 |
47 # Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true) |
36 # Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true) |
48 OPENJDK_SOURCETREE=$(TOPDIR)/openjdk |
37 OPENJDK_SOURCETREE=$(TOPDIR)/openjdk |
49 OPENJDK_BUILDDIR:=$(shell \ |
38 OPENJDK_BUILDDIR:=$(shell \ |
50 if [ -r $(OPENJDK_SOURCETREE)/control/make/Makefile ]; then \ |
39 if [ -r $(OPENJDK_SOURCETREE)/Makefile ]; then \ |
51 echo "$(OPENJDK_SOURCETREE)/control/make"; \ |
|
52 elif [ -r $(OPENJDK_SOURCETREE)/Makefile ]; then \ |
|
53 echo "$(OPENJDK_SOURCETREE)"; \ |
40 echo "$(OPENJDK_SOURCETREE)"; \ |
54 else \ |
41 else \ |
55 echo "."; \ |
42 echo "."; \ |
56 fi) |
43 fi) |
57 |
44 |
495 |
482 |
496 .PHONY: all build what clobber insane \ |
483 .PHONY: all build what clobber insane \ |
497 fastdebug_build debug_build product_build setup \ |
484 fastdebug_build debug_build product_build setup \ |
498 dev dev-build dev-sanity dev-clobber |
485 dev dev-build dev-sanity dev-clobber |
499 |
486 |
500 # FIXUP: Old j2se targets |
|
501 j2se_fastdebug_only: jdk_fastdebug_only |
|
502 j2se_only: jdk_only |
|
503 |
|
504 # Force target |
487 # Force target |
505 FRC: |
488 FRC: |
506 |
489 |