jdk9-dev-ALT Cdiff jdk/make/lib/Awt2dLibraries.gmk

jdk/make/lib/Awt2dLibraries.gmk


*** 29,39 ****
  
  BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
      $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib
  BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
      $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \
!     -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libmlib_image
  
  BUILD_LIBMLIB_LDLIBS :=
  BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers
  
  BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
--- 29,39 ----
  
  BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
      $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib
  BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
      $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \
!     -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libmlib_image
  
  BUILD_LIBMLIB_LDLIBS :=
  BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers
  
  BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
*** 142,154 ****
  endif
  
  ################################################################################
  
  LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
!     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \
      $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
!     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
      #
  
  ifeq ($(OPENJDK_TARGET_OS), aix)
    LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
  endif
--- 142,154 ----
  endif
  
  ################################################################################
  
  LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
!     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
      $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
!     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/sun/awt \
      #
  
  ifeq ($(OPENJDK_TARGET_OS), aix)
    LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
  endif
*** 209,219 ****
    LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
    # Why does libawt need java.base headers?
    LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
!       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \
        -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
        -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \
        #
    LIBAWT_EXFILES += \
--- 209,219 ----
    LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
    # Why does libawt need java.base headers?
    LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
!       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/sun/java2d/opengl \
        -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
        -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \
        #
    LIBAWT_EXFILES += \
*** 296,331 ****
  
  ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
    ifndef BUILD_HEADLESS_ONLY
  
      LIBAWT_XAWT_DIRS := \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt_xawt \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/utility \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/x11 \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
          #
  
      LIBAWT_XAWT_EXCLUDES := medialib
  
      LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \
          -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
          -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \
          $(LIBJAVA_HEADER_FLAGS)
          #
  
      LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
          -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
--- 296,331 ----
  
  ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
    ifndef BUILD_HEADLESS_ONLY
  
      LIBAWT_XAWT_DIRS := \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/utility \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/sun/java2d/opengl \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/sun/java2d/x11 \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/sun/awt \
          #
  
      LIBAWT_XAWT_EXCLUDES := medialib
  
      LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \
          -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
          -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/sun/java2d \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsunwjdga \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/sun/font \
          $(LIBJAVA_HEADER_FLAGS)
          #
  
      LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
          -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
*** 512,529 ****
  DESKTOP_LIBRARIES += $(BUILD_LIBJAVAJPEG)
  
  ################################################################################
  
  LIBFONTMANAGER_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \
!     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libfontmanager
  LIBFONTMANAGER_CFLAGS := \
      $(addprefix -I, $(shell $(FIND) \
        $(LIBFONTMANAGER_SRC) \
        $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
!       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \
        $(JDK_TOPDIR)/src/java.desktop/share/native/common \
!       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common -type d)) \
      -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
      $(LIBJAVA_HEADER_FLAGS) \
      #
  
  ifndef OPENJDK
--- 512,529 ----
  DESKTOP_LIBRARIES += $(BUILD_LIBJAVAJPEG)
  
  ################################################################################
  
  LIBFONTMANAGER_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \
!     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager
  LIBFONTMANAGER_CFLAGS := \
      $(addprefix -I, $(shell $(FIND) \
        $(LIBFONTMANAGER_SRC) \
        $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
!       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
        $(JDK_TOPDIR)/src/java.desktop/share/native/common \
!       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common -type d)) \
      -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
      $(LIBJAVA_HEADER_FLAGS) \
      #
  
  ifndef OPENJDK
*** 540,550 ****
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
        X11TextRenderer.c
    LIBFONTMANAGER_OPTIMIZATION := HIGHEST
!   LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/windows
  else ifeq ($(OPENJDK_TARGET_OS), macosx)
    LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
        X11TextRenderer.c \
        fontpath.c \
        lcdglyph.c
--- 540,550 ----
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
        X11TextRenderer.c
    LIBFONTMANAGER_OPTIMIZATION := HIGHEST
!   LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/sun/windows
  else ifeq ($(OPENJDK_TARGET_OS), macosx)
    LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
        X11TextRenderer.c \
        fontpath.c \
        lcdglyph.c
*** 604,619 ****
  DESKTOP_LIBRARIES += $(BUILD_LIBFONTMANAGER)
  
  ################################################################################
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
!   LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt
!   LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/windows \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
!       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d/windows \
        -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
        -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
        $(LIBJAVA_HEADER_FLAGS) \
        #
--- 604,619 ----
  DESKTOP_LIBRARIES += $(BUILD_LIBFONTMANAGER)
  
  ################################################################################
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
!   LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
!   LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/sun/windows \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
!       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/sun/java2d/windows \
        -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
        -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
        $(LIBJAVA_HEADER_FLAGS) \
        #
*** 653,668 ****
  else # OPENJDK_TARGET_OS not windows
  
    ifeq ($(OPENJDK_TARGET_OS), macosx)
      LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjawt
    else
!     LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt
    endif
    LIBJAWT_CFLAGS := \
!       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
!       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
        $(LIBJAVA_HEADER_FLAGS) \
        #
  
    ifeq ($(OPENJDK_TARGET_OS), macosx)
--- 653,668 ----
  else # OPENJDK_TARGET_OS not windows
  
    ifeq ($(OPENJDK_TARGET_OS), macosx)
      LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjawt
    else
!     LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
    endif
    LIBJAWT_CFLAGS := \
!       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/sun/awt \
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
!       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
        $(LIBJAVA_HEADER_FLAGS) \
        #
  
    ifeq ($(OPENJDK_TARGET_OS), macosx)
*** 722,734 ****
  ifeq ($(BUILD_HEADLESS), true)
    # Mac and Windows only use the native AWT lib, do not build libawt_headless
    ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
  
      LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/sun/awt \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/x11 \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
          #
  
      LIBAWT_HEADLESS_EXCLUDES := medialib
--- 722,734 ----
  ifeq ($(BUILD_HEADLESS), true)
    # Mac and Windows only use the native AWT lib, do not build libawt_headless
    ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
  
      LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/sun/awt \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/sun/awt \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/sun/java2d/opengl \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/sun/java2d/x11 \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
          #
  
      LIBAWT_HEADLESS_EXCLUDES := medialib
*** 737,751 ****
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga/ \
          $(LIBJAVA_HEADER_FLAGS) \
          #
      LIBAWT_HEADLESS_EXFILES := initIDs.c
  
      LIBAWT_HEADLESS_REORDER :=
--- 737,751 ----
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/sun/java2d \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/sun/font \
!         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsunwjdga/ \
          $(LIBJAVA_HEADER_FLAGS) \
          #
      LIBAWT_HEADLESS_EXFILES := initIDs.c
  
      LIBAWT_HEADLESS_REORDER :=
*** 817,827 ****
    else
      LIBSPLASHSCREEN_EXCLUDES += libpng
    endif
  
    ifneq ($(OPENJDK_TARGET_OS), macosx)
!     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsplashscreen
    else
      LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
    endif
  
    LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
--- 817,827 ----
    else
      LIBSPLASHSCREEN_EXCLUDES += libpng
    endif
  
    ifneq ($(OPENJDK_TARGET_OS), macosx)
!     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsplashscreen
    else
      LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
    endif
  
    LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
*** 988,998 ****
        CFLAGS := $(CFLAGS_JDKLIB) \
            -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui \
            -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/awt \
            -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
            -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
!           -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
            -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop,  \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN) \
            -Xlinker -rpath -Xlinker @loader_path, \
        LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \
--- 988,998 ----
        CFLAGS := $(CFLAGS_JDKLIB) \
            -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui \
            -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/awt \
            -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
            -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
!           -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
            -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop,  \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN) \
            -Xlinker -rpath -Xlinker @loader_path, \
        LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \