OpenJDK / valhalla / valhalla
changeset 47367:6694369ed3f9
8189229: Remove references to $(TOPDIR)/src/*/$(MODULE)
Reviewed-by: erikj
| author | ihse |
|---|---|
| date | Fri, 13 Oct 2017 15:22:02 +0200 |
| parents | e8bd8e969070 |
| children | 079a87f87518 |
| files | make/CompileDemos.gmk make/lib/Lib-java.base.gmk make/lib/Lib-java.desktop.gmk |
| diffstat | 3 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CompileDemos.gmk Fri Oct 13 14:17:10 2017 +0100 +++ b/make/CompileDemos.gmk Fri Oct 13 15:22:02 2017 +0200 @@ -37,9 +37,13 @@ include TextFileProcessing.gmk include ZipArchive.gmk +# Hook to include the corresponding custom file, if present. +$(eval $(call IncludeCustomExtension, CompileDemos-pre.gmk)) + # Prepare the find cache. -$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/demo \ - $(TOPDIR)/src/*/demo))) +DEMO_SRC_DIRS += $(TOPDIR)/src/demo + +$(eval $(call FillCacheFind, $(wildcard $(DEMO_SRC_DIRS)))) # Append demo goals to this variable. TARGETS = @@ -303,7 +307,7 @@ ################################################################################ # Hook to include the corresponding custom file, if present. -$(eval $(call IncludeCustomExtension, CompileDemos.gmk)) +$(eval $(call IncludeCustomExtension, CompileDemos-post.gmk)) all: $(TARGETS) images: $(IMAGES_TARGETS)
--- a/make/lib/Lib-java.base.gmk Fri Oct 13 14:17:10 2017 +0100 +++ b/make/lib/Lib-java.base.gmk Fri Oct 13 15:22:02 2017 +0200 @@ -25,9 +25,13 @@ include LibCommon.gmk +# Hook to include the corresponding custom file, if present. +$(eval $(call IncludeCustomExtension, lib/Lib-java.base.gmk)) + # Prepare the find cache. -$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.base/*/native \ - $(TOPDIR)/src/*/java.base/*/native))) +LIB_java.base_SRC_DIRS += $(TOPDIR)/src/java.base/*/native + +$(eval $(call FillCacheFind, $(wildcard $(LIB_java.base_SRC_DIRS)))) include CoreLibraries.gmk include NetworkingLibraries.gmk
--- a/make/lib/Lib-java.desktop.gmk Fri Oct 13 14:17:10 2017 +0100 +++ b/make/lib/Lib-java.desktop.gmk Fri Oct 13 15:22:02 2017 +0200 @@ -25,9 +25,13 @@ include LibCommon.gmk +# Hook to include the corresponding custom file, if present. +$(eval $(call IncludeCustomExtension, lib/Lib-java.desktop.gmk)) + # Prepare the find cache. -$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.desktop/*/native \ - $(TOPDIR)/src/*/java.desktop/*/native))) +LIB_java.desktop_SRC_DIRS += $(TOPDIR)/src/java.desktop/*/native + +$(eval $(call FillCacheFind, $(wildcard $(LIB_java.desktop_SRC_DIRS)))) include LibosxLibraries.gmk include PlatformLibraries.gmk