stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8189229: Remove references to $(TOPDIR)/src/*/$(MODULE)

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2017-10-13 15:22:02 +02:00
parent 2abb1c7d7f
commit 7d50345d2d
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/CompileDemos.gmk
View File

@ -37,9 +37,13 @@ include SetupJavaCompilers.gmk
include TextFileProcessing.gmk include TextFileProcessing.gmk
include ZipArchive.gmk include ZipArchive.gmk
# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, CompileDemos-pre.gmk))
# Prepare the find cache. # Prepare the find cache.
$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/demo \ DEMO_SRC_DIRS += $(TOPDIR)/src/demo
$(TOPDIR)/src/*/demo)))
$(eval $(call FillCacheFind, $(wildcard $(DEMO_SRC_DIRS))))
# Append demo goals to this variable. # Append demo goals to this variable.
TARGETS = TARGETS =
@ -303,7 +307,7 @@ endif
################################################################################ ################################################################################
# Hook to include the corresponding custom file, if present. # Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, CompileDemos.gmk)) $(eval $(call IncludeCustomExtension, CompileDemos-post.gmk))
all: $(TARGETS) all: $(TARGETS)
images: $(IMAGES_TARGETS) images: $(IMAGES_TARGETS)

8
make/lib/Lib-java.base.gmk
View File

@ -25,9 +25,13 @@
include LibCommon.gmk include LibCommon.gmk
# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, lib/Lib-java.base.gmk))
# Prepare the find cache. # Prepare the find cache.
$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.base/*/native \ LIB_java.base_SRC_DIRS += $(TOPDIR)/src/java.base/*/native
$(TOPDIR)/src/*/java.base/*/native)))
$(eval $(call FillCacheFind, $(wildcard $(LIB_java.base_SRC_DIRS))))
include CoreLibraries.gmk include CoreLibraries.gmk
include NetworkingLibraries.gmk include NetworkingLibraries.gmk

8
make/lib/Lib-java.desktop.gmk
View File

@ -25,9 +25,13 @@
include LibCommon.gmk include LibCommon.gmk
# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, lib/Lib-java.desktop.gmk))
# Prepare the find cache. # Prepare the find cache.
$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.desktop/*/native \ LIB_java.desktop_SRC_DIRS += $(TOPDIR)/src/java.desktop/*/native
$(TOPDIR)/src/*/java.desktop/*/native)))
$(eval $(call FillCacheFind, $(wildcard $(LIB_java.desktop_SRC_DIRS))))
include LibosxLibraries.gmk include LibosxLibraries.gmk
include PlatformLibraries.gmk include PlatformLibraries.gmk