jdk/make/CopyFiles.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 53,79 ****
  
  COPY_FILES = $(H_TARGET_FILES)
  
  ##########################################################################################
  
! ifndef OPENJDK
!   ifeq ($(OPENJDK_TARGET_OS), windows)
      COPY_FILES += $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCallbacks.h \
          $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.h \
          $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgePackages.h \
          $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.c \
          $(JDK_OUTPUTDIR)/lib/accessibility.properties
  
      $(OPENJDK_TARGET_OS_INCLUDE)/bridge/%: \
!         $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/%
                  $(install-file)
  
      $(JDK_OUTPUTDIR)/lib/accessibility.properties: \
!         $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/accessibility.properties
                  $(install-file)
- 
-   endif
  endif
  
  ##########################################################################################
  
  LIBDIR = $(JDK_OUTPUTDIR)/lib
--- 53,76 ----
  
  COPY_FILES = $(H_TARGET_FILES)
  
  ##########################################################################################
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
      COPY_FILES += $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCallbacks.h \
          $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.h \
          $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgePackages.h \
          $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.c \
          $(JDK_OUTPUTDIR)/lib/accessibility.properties
  
      $(OPENJDK_TARGET_OS_INCLUDE)/bridge/%: \
!         $(JDK_TOPDIR)/src/windows/native/sun/bridge/%
                  $(install-file)
  
      $(JDK_OUTPUTDIR)/lib/accessibility.properties: \
!         $(JDK_TOPDIR)/src/windows/native/sun/bridge/accessibility.properties
                  $(install-file)
  endif
  
  ##########################################################################################
  
  LIBDIR = $(JDK_OUTPUTDIR)/lib