make/lib/Lib-jdk.accessibility.gmk

*** 1,7 ****
  #
! # Copyright (c) 2014, 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
--- 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
*** 46,56 ****
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
          SRC := $(JAVA_AB_SRCDIR), \
          OPTIMIZATION := LOW, \
          CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS) \
              $(addprefix -I,$(JAVA_AB_SRCDIR)) \
!             -I$(JDK_TOPDIR)/src/jdk.accessibility/windows/native/include/bridge \
              -DACCESSBRIDGE_ARCH_$2, \
          LDFLAGS := $(LDFLAGS_JDKLIB) -subsystem:windows, \
          LIBS := kernel32.lib user32.lib gdi32.lib \
              winspool.lib comdlg32.lib advapi32.lib shell32.lib \
              $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \
--- 46,56 ----
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
          SRC := $(JAVA_AB_SRCDIR), \
          OPTIMIZATION := LOW, \
          CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS) \
              $(addprefix -I,$(JAVA_AB_SRCDIR)) \
!             -I$(ROOT_SRCDIR)/include/bridge \
              -DACCESSBRIDGE_ARCH_$2, \
          LDFLAGS := $(LDFLAGS_JDKLIB) -subsystem:windows, \
          LIBS := kernel32.lib user32.lib gdi32.lib \
              winspool.lib comdlg32.lib advapi32.lib shell32.lib \
              $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \
*** 76,86 ****
          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)) \
!             -I$(JDK_TOPDIR)/src/jdk.accessibility/windows/native/include/bridge \
              -DACCESSBRIDGE_ARCH_$2, \
          LDFLAGS := $(LDFLAGS_JDKLIB) -subsystem:windows \
              -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
          LIBS := kernel32.lib user32.lib gdi32.lib \
              winspool.lib comdlg32.lib advapi32.lib shell32.lib \
--- 76,86 ----
          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)) \
!             -I$(ROOT_SRCDIR)/include/bridge \
              -DACCESSBRIDGE_ARCH_$2, \
          LDFLAGS := $(LDFLAGS_JDKLIB) -subsystem:windows \
              -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
          LIBS := kernel32.lib user32.lib gdi32.lib \
              winspool.lib comdlg32.lib advapi32.lib shell32.lib \