comparison make/defs.make @ 91:a294fd0c4b38

6583644: Move all managed/SCCS files out of 'build' into 'make' directory Summary: Moved makefiles out of build and build/closed into make/ Reviewed-by: kvn, ohair
author kamg
date Wed, 09 Apr 2008 14:22:48 -0400
parents a61af66fc99e
children d1605aabd0a1 6470a2a42f92
comparison
equal deleted inserted replaced
90:cf4e16e9ca60 91:a294fd0c4b38
55 # the current directory for a parent directory containing "src/share/vm". 55 # the current directory for a parent directory containing "src/share/vm".
56 # If that fails, look for $GAMMADIR in the environment. 56 # If that fails, look for $GAMMADIR in the environment.
57 # When the tree of subdirs is built, this setting is stored in each flags.make. 57 # When the tree of subdirs is built, this setting is stored in each flags.make.
58 GAMMADIR := $(shell until ([ -d dev ]&&echo $${GAMMADIR:-/GAMMADIR/}) || ([ -d src/share/vm ]&&pwd); do cd ..; done) 58 GAMMADIR := $(shell until ([ -d dev ]&&echo $${GAMMADIR:-/GAMMADIR/}) || ([ -d src/share/vm ]&&pwd); do cd ..; done)
59 HS_SRC_DIR=$(GAMMADIR)/src 59 HS_SRC_DIR=$(GAMMADIR)/src
60 HS_MAKE_DIR=$(GAMMADIR)/make
60 HS_BUILD_DIR=$(GAMMADIR)/build 61 HS_BUILD_DIR=$(GAMMADIR)/build
61 62
62 ifeq ($(USER),) 63 ifeq ($(USER),)
63 USER=$(USERNAME) 64 USER=$(USERNAME)
64 endif 65 endif
168 BOOTDIR=$(ALT_BOOTDIR) 169 BOOTDIR=$(ALT_BOOTDIR)
169 endif 170 endif
170 171
171 # The platform dependent defs.make defines platform specific variable such 172 # The platform dependent defs.make defines platform specific variable such
172 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined. 173 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
173 include $(GAMMADIR)/build/$(OSNAME)/makefiles/defs.make 174 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
174 175
175 # We are trying to put platform specific defintions 176 # We are trying to put platform specific defintions
176 # files to build/$(OSNAME)/makefiles dictory. However 177 # files to make/$(OSNAME)/makefiles dictory. However
177 # some definitions are common for both linux and solaris, 178 # some definitions are common for both linux and solaris,
178 # so we put them here. 179 # so we put them here.
179 ifneq ($(OSNAME),windows) 180 ifneq ($(OSNAME),windows)
180 ABS_OUTPUTDIR := $(shell $(CD) $(OUTPUTDIR); $(PWD)) 181 ABS_OUTPUTDIR := $(shell mkdir -p $(OUTPUTDIR); $(CD) $(OUTPUTDIR); $(PWD))
181 ABS_BOOTDIR := $(shell $(CD) $(BOOTDIR); $(PWD)) 182 ABS_BOOTDIR := $(shell $(CD) $(BOOTDIR); $(PWD))
182 ABS_GAMMADIR := $(shell $(CD) $(GAMMADIR); $(PWD)) 183 ABS_GAMMADIR := $(shell $(CD) $(GAMMADIR); $(PWD))
183 ABS_OS_MAKEFILE := $(shell $(CD) $(HS_BUILD_DIR)/$(OSNAME); $(PWD))/Makefile 184 ABS_OS_MAKEFILE := $(shell $(CD) $(HS_MAKE_DIR)/$(OSNAME); $(PWD))/Makefile
184 185
185 # uname, HotSpot source directory, build directory and JDK use different names 186 # uname, HotSpot source directory, build directory and JDK use different names
186 # for CPU architectures. 187 # for CPU architectures.
187 # ARCH - uname output 188 # ARCH - uname output
188 # SRCARCH - where to find HotSpot cpu and os_cpu source files 189 # SRCARCH - where to find HotSpot cpu and os_cpu source files