Mercurial > hg > openjdk > lambda
changeset 8:cbc8ad9dd0e0 jdk7-b25
6623832: Cleanup old j2se makefile targets
Summary: Just removing unneeded makefile rules and 'control' logic.
Reviewed-by: xdono
author | ohair |
---|---|
date | Tue, 25 Mar 2008 14:38:56 -0700 |
parents | 05809a7eb190 |
children | 9410f77cc30c |
files | Makefile make/jdk-rules.gmk |
diffstat | 2 files changed, 3 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue Mar 18 11:01:40 2008 -0700 +++ b/Makefile Tue Mar 25 14:38:56 2008 -0700 @@ -26,30 +26,17 @@ BUILD_PARENT_DIRECTORY=. ifndef TOPDIR - TOPDIR:=$(shell \ - if [ -r ./j2se/make/Makefile -o -r ./jdk/make/Makefile ]; then \ - echo "."; \ - else \ - echo "../.."; \ - fi) + TOPDIR:=. endif ifndef CONTROL_TOPDIR - CONTROL_TOPDIR=$(TOPDIR)/control - CONTROL_TOPDIR:=$(shell \ - if [ -r $(TOPDIR)/control/make/Makefile ]; then \ - echo "$(TOPDIR)/control"; \ - else \ - echo "$(TOPDIR)"; \ - fi) + CONTROL_TOPDIR=$(TOPDIR) endif # Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true) OPENJDK_SOURCETREE=$(TOPDIR)/openjdk OPENJDK_BUILDDIR:=$(shell \ - if [ -r $(OPENJDK_SOURCETREE)/control/make/Makefile ]; then \ - echo "$(OPENJDK_SOURCETREE)/control/make"; \ - elif [ -r $(OPENJDK_SOURCETREE)/Makefile ]; then \ + if [ -r $(OPENJDK_SOURCETREE)/Makefile ]; then \ echo "$(OPENJDK_SOURCETREE)"; \ else \ echo "."; \ @@ -497,10 +484,6 @@ fastdebug_build debug_build product_build setup \ dev dev-build dev-sanity dev-clobber -# FIXUP: Old j2se targets -j2se_fastdebug_only: jdk_fastdebug_only -j2se_only: jdk_only - # Force target FRC:
--- a/make/jdk-rules.gmk Tue Mar 18 11:01:40 2008 -0700 +++ b/make/jdk-rules.gmk Tue Mar 25 14:38:56 2008 -0700 @@ -121,11 +121,3 @@ .PHONY: jdk jdk-build jdk-clobber jdk-sanity -# FIXUP: Old j2se target names -j2se-build: jdk-build -j2se-clobber:: jdk-clobber -j2se-sanity:: jdk-sanity -j2se: jdk - -.PHONY: j2se j2se-build j2se-clobber j2se-sanity -