make/lib/Lib-jdk.accessibility.gmk

*** 28,57 ****
  ################################################################################
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
  
    ROOT_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
-   JAVA_AB_SRCDIR := $(ROOT_SRCDIR)/libjavaaccessbridge $(ROOT_SRCDIR)/common
-   WIN_AB_SRCDIR := $(ROOT_SRCDIR)/libwindowsaccessbridge $(ROOT_SRCDIR)/common
-   SYSINFO_SRCDIR := $(ROOT_SRCDIR)/libjabsysinfo
-   ACCESSBRIDGE_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/jdk.accessibility \
-       -I$(TOPDIR)/src/java.desktop/windows/native/include \
-       -I$(TOPDIR)/src/java.desktop/share/native/include
  
    define SetupJavaDLL
      # Parameter 1 Suffix
      # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
  
      $(call SetupJdkLibrary, BUILD_JAVAACCESSBRIDGE$1, \
          NAME := javaaccessbridge$1, \
!         SRC := $(JAVA_AB_SRCDIR), \
          OPTIMIZATION := LOW, \
          DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
!         CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS) \
!             $(addprefix -I,$(JAVA_AB_SRCDIR)) \
!             -I$(ROOT_SRCDIR)/include/bridge \
              -DACCESSBRIDGE_ARCH_$2, \
          LDFLAGS := $(LDFLAGS_JDKLIB), \
          LIBS := kernel32.lib user32.lib gdi32.lib \
              winspool.lib comdlg32.lib advapi32.lib shell32.lib \
              $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \
              ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \
--- 28,54 ----
  ################################################################################
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
  
    ROOT_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
  
    define SetupJavaDLL
      # Parameter 1 Suffix
      # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
  
      $(call SetupJdkLibrary, BUILD_JAVAACCESSBRIDGE$1, \
          NAME := javaaccessbridge$1, \
!         SRC := libjavaaccessbridge, \
!         EXTRA_SRC := common, \
          OPTIMIZATION := LOW, \
          DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
!         CFLAGS := $(CFLAGS_JDKLIB) \
              -DACCESSBRIDGE_ARCH_$2, \
+         EXTRA_HEADER_DIRS := \
+             include/bridge \
+             java.base:include \
+             java.desktop:include, \
          LDFLAGS := $(LDFLAGS_JDKLIB), \
          LIBS := kernel32.lib user32.lib gdi32.lib \
              winspool.lib comdlg32.lib advapi32.lib shell32.lib \
              $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \
              ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \
*** 66,82 ****
    define SetupWinDLL
      # Parameter 1 Suffix
      # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
      $(call SetupJdkLibrary, BUILD_WINDOWSACCESSBRIDGE$1, \
          NAME := windowsaccessbridge$1, \
!         SRC := $(WIN_AB_SRCDIR), \
          OPTIMIZATION := LOW, \
          DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
!         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) \
              -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
          LIBS := kernel32.lib user32.lib gdi32.lib \
              winspool.lib comdlg32.lib advapi32.lib shell32.lib \
              ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \
--- 63,81 ----
    define SetupWinDLL
      # Parameter 1 Suffix
      # Parameter 2 ACCESSBRIDGE_ARCH_ suffix
      $(call SetupJdkLibrary, BUILD_WINDOWSACCESSBRIDGE$1, \
          NAME := windowsaccessbridge$1, \
!         SRC := libwindowsaccessbridge, \
!         EXTRA_SRC := common, \
          OPTIMIZATION := LOW, \
          DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
!         CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
              -DACCESSBRIDGE_ARCH_$2, \
+         EXTRA_HEADER_DIRS := \
+             include/bridge \
+             java.base:include, \
          LDFLAGS := $(LDFLAGS_JDKLIB) \
              -def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
          LIBS := kernel32.lib user32.lib gdi32.lib \
              winspool.lib comdlg32.lib advapi32.lib shell32.lib \
              ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \
*** 89,101 ****
  
    define SetupAccessBridgeSysInfo
  
      $(call SetupJdkLibrary, BUILD_ACCESSBRIDGESYSINFO, \
          NAME := jabsysinfo, \
-         SRC := $(SYSINFO_SRCDIR), \
          OPTIMIZATION := LOW, \
!         CFLAGS := $(CFLAGS_JDKLIB) $(ACCESSBRIDGE_CFLAGS), \
          LDFLAGS := $(LDFLAGS_JDKLIB), \
          VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
      )
  
      TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO)
--- 88,99 ----
  
    define SetupAccessBridgeSysInfo
  
      $(call SetupJdkLibrary, BUILD_ACCESSBRIDGESYSINFO, \
          NAME := jabsysinfo, \
          OPTIMIZATION := LOW, \
!         CFLAGS := $(CFLAGS_JDKLIB), \
          LDFLAGS := $(LDFLAGS_JDKLIB), \
          VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
      )
  
      TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO)