make/lib/Lib-jdk.accessibility.gmk

*** 1,7 ****
  #
! # Copyright (c) 2014, 2016, 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) 2014, 2018, 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
*** 39,50 ****
  
    define SetupJavaDLL
      # Parameter 1 Suffix
      # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
  
!     $(call SetupNativeCompilation,BUILD_JAVAACCESSBRIDGE$1, \
!         LIBRARY = javaaccessbridge$1, \
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
          SRC := $(JAVA_AB_SRCDIR), \
          OPTIMIZATION := LOW, \
          CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS) \
              $(addprefix -I,$(JAVA_AB_SRCDIR)) \
--- 39,50 ----
  
    define SetupJavaDLL
      # Parameter 1 Suffix
      # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
  
!     $(call SetupNativeCompilation, BUILD_JAVAACCESSBRIDGE$1, \
!         NAME := javaaccessbridge$1, \
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
          SRC := $(JAVA_AB_SRCDIR), \
          OPTIMIZATION := LOW, \
          CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS) \
              $(addprefix -I,$(JAVA_AB_SRCDIR)) \
*** 69,80 ****
    endef
  
    define SetupWinDLL
      # Parameter 1 Suffix
      # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
!     $(call SetupNativeCompilation,BUILD_WINDOWSACCESSBRIDGE$1, \
!         LIBRARY = windowsaccessbridge$1, \
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
          SRC := $(WIN_AB_SRCDIR), \
          OPTIMIZATION := LOW, \
          CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT $(ACCESSBRIDGE_CFLAGS) \
              $(addprefix -I,$(WIN_AB_SRCDIR)) \
--- 69,80 ----
    endef
  
    define SetupWinDLL
      # Parameter 1 Suffix
      # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
!     $(call SetupNativeCompilation, BUILD_WINDOWSACCESSBRIDGE$1, \
!         NAME := windowsaccessbridge$1, \
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
          SRC := $(WIN_AB_SRCDIR), \
          OPTIMIZATION := LOW, \
          CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT $(ACCESSBRIDGE_CFLAGS) \
              $(addprefix -I,$(WIN_AB_SRCDIR)) \
*** 97,108 ****
  
    endef
  
    define SetupAccessBridgeSysInfo
  
!     $(call SetupNativeCompilation,BUILD_ACCESSBRIDGESYSINFO, \
!         LIBRARY = jabsysinfo, \
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
          SRC := $(SYSINFO_SRCDIR), \
          OPTIMIZATION := LOW, \
          CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS), \
          LDFLAGS := $(LDFLAGS_JDKLIB) \
--- 97,108 ----
  
    endef
  
    define SetupAccessBridgeSysInfo
  
!     $(call SetupNativeCompilation, BUILD_ACCESSBRIDGESYSINFO, \
!         NAME := jabsysinfo, \
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
          SRC := $(SYSINFO_SRCDIR), \
          OPTIMIZATION := LOW, \
          CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS), \
          LDFLAGS := $(LDFLAGS_JDKLIB) \