make/launcher/Launcher-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
*** 31,52 ****
  ifeq ($(OPENJDK_TARGET_OS), windows)
  
    JABSWITCH_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/jabswitch
    ACCESSBRIDGE_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/common
  
!   $(eval $(call SetupNativeCompilation,BUILD_JABSWITCH, \
        SRC := $(JABSWITCH_SRC), \
        INCLUDE_FILES := jabswitch.cpp, \
        CFLAGS := $(filter-out -Zc:wchar_t-, $(CFLAGS_JDKEXE)) -Zc:wchar_t \
            -analyze- -Od -Gd -D_WINDOWS \
            -D_UNICODE -DUNICODE -RTC1 -EHsc, \
        DISABLED_WARNINGS_microsoft := 4267 4996, \
        LDFLAGS := $(LDFLAGS_JDKEXE), \
        LIBS := advapi32.lib version.lib user32.lib, \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jabswitch, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
-       PROGRAM := jabswitch, \
        VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRC)/AccessBridgeStatusWindow.RC, \
        RC_FLAGS := $(RC_FLAGS) \
            -D "JDK_FNAME=jabswitch.exe" \
            -D "JDK_INTERNAL_NAME=jabswitch" \
            -D "JDK_FTYPE=0x01L", \
--- 31,53 ----
  ifeq ($(OPENJDK_TARGET_OS), windows)
  
    JABSWITCH_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/jabswitch
    ACCESSBRIDGE_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/common
  
!   $(eval $(call SetupNativeCompilation, BUILD_JABSWITCH, \
!       NAME := jabswitch, \
!       TYPE := EXECUTABLE, \
        SRC := $(JABSWITCH_SRC), \
        INCLUDE_FILES := jabswitch.cpp, \
        CFLAGS := $(filter-out -Zc:wchar_t-, $(CFLAGS_JDKEXE)) -Zc:wchar_t \
            -analyze- -Od -Gd -D_WINDOWS \
            -D_UNICODE -DUNICODE -RTC1 -EHsc, \
        DISABLED_WARNINGS_microsoft := 4267 4996, \
        LDFLAGS := $(LDFLAGS_JDKEXE), \
        LIBS := advapi32.lib version.lib user32.lib, \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jabswitch, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
        VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRC)/AccessBridgeStatusWindow.RC, \
        RC_FLAGS := $(RC_FLAGS) \
            -D "JDK_FNAME=jabswitch.exe" \
            -D "JDK_INTERNAL_NAME=jabswitch" \
            -D "JDK_FTYPE=0x01L", \
*** 68,85 ****
    define SetupInspector
    # Parameter 1 File name suffix
    # Parameter 2 ACCESSBRIDGE_ARCH_ -D suffix
  
      $$(eval $$(call SetupNativeCompilation, BUILD_JACCESSINSPECTOR$1, \
        SRC := $(TOPDIR)/jaccessinspector $(TOPDIR)/common \
            $(TOPDIR)/toolscommon $(TOPDIR)/bridge, \
        CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
        LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
        LIBS := advapi32.lib user32.lib, \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jaccessinspector$1, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
-       PROGRAM := jaccessinspector$1, \
        VERSIONINFO_RESOURCE := $(TOPDIR)/jaccessinspector/jaccessinspectorWindow.rc, \
        RC_FLAGS := $$(RC_FLAGS) \
            -D "JDK_FNAME=jaccessinspector$1.exe" \
            -D "JDK_INTERNAL_NAME=jaccessinspector$1" \
            -D "JDK_FTYPE=0x01L", \
--- 69,87 ----
    define SetupInspector
    # Parameter 1 File name suffix
    # Parameter 2 ACCESSBRIDGE_ARCH_ -D suffix
  
      $$(eval $$(call SetupNativeCompilation, BUILD_JACCESSINSPECTOR$1, \
+       NAME := jaccessinspector$1, \
+       TYPE := EXECUTABLE, \
        SRC := $(TOPDIR)/jaccessinspector $(TOPDIR)/common \
            $(TOPDIR)/toolscommon $(TOPDIR)/bridge, \
        CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
        LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
        LIBS := advapi32.lib user32.lib, \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jaccessinspector$1, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
        VERSIONINFO_RESOURCE := $(TOPDIR)/jaccessinspector/jaccessinspectorWindow.rc, \
        RC_FLAGS := $$(RC_FLAGS) \
            -D "JDK_FNAME=jaccessinspector$1.exe" \
            -D "JDK_INTERNAL_NAME=jaccessinspector$1" \
            -D "JDK_FTYPE=0x01L", \
*** 94,112 ****
  
    define SetupWalker
    # Parameter 1 File name suffix
    # Parameter 2 ACCESSBRIDGE_ARCH_ -D suffix
  
!     $$(eval $$(call SetupNativeCompilation,BUILD_JACCESSWALKER$1, \
        SRC := $(TOPDIR)/jaccesswalker $(TOPDIR)/common \
            $(TOPDIR)/toolscommon $(TOPDIR)/bridge, \
        CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
        LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
        LIBS := advapi32.lib comctl32.lib gdi32.lib user32.lib, \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jaccesswalker$1, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
-       PROGRAM := jaccesswalker$1, \
        VERSIONINFO_RESOURCE := $(TOPDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
        RC_FLAGS := $$(RC_FLAGS) \
            -D "JDK_FNAME=jaccesswalker$1.exe" \
            -D "JDK_INTERNAL_NAME=jaccesswalker$1" \
            -D "JDK_FTYPE=0x01L", \
--- 96,115 ----
  
    define SetupWalker
    # Parameter 1 File name suffix
    # Parameter 2 ACCESSBRIDGE_ARCH_ -D suffix
  
!     $$(eval $$(call SetupNativeCompilation, BUILD_JACCESSWALKER$1, \
!       NAME := jaccesswalker$1, \
!       TYPE := EXECUTABLE, \
        SRC := $(TOPDIR)/jaccesswalker $(TOPDIR)/common \
            $(TOPDIR)/toolscommon $(TOPDIR)/bridge, \
        CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
        LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
        LIBS := advapi32.lib comctl32.lib gdi32.lib user32.lib, \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/jdk.accessibility/jaccesswalker$1, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/jdk.accessibility, \
        VERSIONINFO_RESOURCE := $(TOPDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
        RC_FLAGS := $$(RC_FLAGS) \
            -D "JDK_FNAME=jaccesswalker$1.exe" \
            -D "JDK_INTERNAL_NAME=jaccesswalker$1" \
            -D "JDK_FTYPE=0x01L", \