< prev index next >

make/copy/CopyCommon.gmk

Print this page

        

@@ -31,41 +31,40 @@
 #
 # Copy exported include headers files to output directory, if present.
 #
 
 INCLUDE_TARGET_DIR := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE)
+INCLUDE_SOURCE_DIR := $(TOPDIR)/src/$(MODULE)/share/native/include
 
-$(eval $(call SetupCopyFiles, COPY_EXPORTED_INCLUDE, \
-    SRC := $(TOPDIR)/src/$(MODULE)/share/native/include, \
+ifneq ($(wildcard $(INCLUDE_SOURCE_DIR)/*), )
+  $(eval $(call SetupCopyFiles, COPY_EXPORTED_INCLUDE, \
+      SRC := $(INCLUDE_SOURCE_DIR), \
     DEST := $(INCLUDE_TARGET_DIR), \
-    FILES := $(wildcard \
-        $(TOPDIR)/src/$(MODULE)/share/native/include/* \
-        $(TOPDIR)/src/$(MODULE)/share/native/include/*/*), \
-))
+      FILES := $(shell $(FIND) $(INCLUDE_SOURCE_DIR) -type f), \
+  ))
 
-TARGETS += $(COPY_EXPORTED_INCLUDE)
+  TARGETS += $(COPY_EXPORTED_INCLUDE)
+endif
 
 # For historical reasons, the OS include directories have odd names.
 INCLUDE_TARGET_OS_SUBDIR := $(OPENJDK_TARGET_OS)
 ifeq ($(OPENJDK_TARGET_OS), windows)
   INCLUDE_TARGET_OS_SUBDIR := win32
 else ifeq ($(OPENJDK_TARGET_OS), macosx)
   INCLUDE_TARGET_OS_SUBDIR := darwin
 endif
 
 # Use the most specific of OS and OS_TYPE.
-ifneq ($(wildcard $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS)/native/include/*), )
-  INCLUDE_SOURCE_OS_SUBDIR := $(OPENJDK_TARGET_OS)
-else
-  INCLUDE_SOURCE_OS_SUBDIR := $(OPENJDK_TARGET_OS_TYPE)
+INCLUDE_SOURCE_OS_DIR := $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS)/native/include
+ifeq ($(wildcard $(INCLUDE_SOURCE_OS_DIR)/*), )
+  INCLUDE_SOURCE_OS_DIR := $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/include
 endif
 
-$(eval $(call SetupCopyFiles, COPY_EXPORTED_INCLUDE_OS, \
-    SRC := $(TOPDIR)/src/$(MODULE)/$(INCLUDE_SOURCE_OS_SUBDIR)/native/include, \
+ifneq ($(wildcard $(INCLUDE_SOURCE_OS_DIR)/*), )
+  $(eval $(call SetupCopyFiles, COPY_EXPORTED_INCLUDE_OS, \
+      SRC := $(INCLUDE_SOURCE_OS_DIR), \
     DEST := $(INCLUDE_TARGET_DIR)/$(INCLUDE_TARGET_OS_SUBDIR), \
-    FILES := $(wildcard \
-        $(TOPDIR)/src/$(MODULE)/$(INCLUDE_SOURCE_OS_SUBDIR)/native/include/* \
-        $(TOPDIR)/src/$(MODULE)/$(INCLUDE_SOURCE_OS_SUBDIR)/native/include/*/*), \
-))
-
-TARGETS += $(COPY_EXPORTED_INCLUDE_OS)
+      FILES := $(shell $(FIND) $(INCLUDE_SOURCE_OS_DIR) -type f), \
+  ))
 
+  TARGETS += $(COPY_EXPORTED_INCLUDE_OS)
+endif
< prev index next >