make/gensrc/Gensrc-java.desktop.gmk

*** 26,40 ****
  include GensrcCommonJdk.gmk
  
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, gensrc/Gensrc-java.desktop.gmk))
  
! ifneq ($(OPENJDK_TARGET_OS), windows)
    include GensrcIcons.gmk
  endif
  
! ifneq ($(filter $(OPENJDK_TARGET_OS), linux solaris aix), )
    include GensrcX11Wrappers.gmk
  endif
  
  include GensrcSwing.gmk
  
--- 26,40 ----
  include GensrcCommonJdk.gmk
  
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, gensrc/Gensrc-java.desktop.gmk))
  
! ifneq ($(call isTargetOs, windows), true)
    include GensrcIcons.gmk
  endif
  
! ifeq ($(call isTargetOs, linux solaris aix), true)
    include GensrcX11Wrappers.gmk
  endif
  
  include GensrcSwing.gmk
  
*** 50,74 ****
      $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources \
      $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources \
      $(TOPDIR)/src/java.desktop/share/classes/sun/print/resources \
      #
  
! ifeq ($(OPENJDK_TARGET_OS), macosx)
    PROP_SRC_DIRS += \
        $(TOPDIR)/src/java.desktop/macosx/classes/com/apple/laf/resources \
        $(TOPDIR)/src/java.desktop/macosx/classes/sun/awt/resources \
        #
  endif
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
    PROP_SRC_DIRS += \
        $(TOPDIR)/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources \
        $(TOPDIR)/src/java.desktop/windows/classes/sun/awt/windows \
        #
  endif
  
! ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
    PROP_SRC_DIRS += $(TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources
  endif
  
  $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
      SRC_DIRS := $(PROP_SRC_DIRS), \
--- 50,74 ----
      $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources \
      $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources \
      $(TOPDIR)/src/java.desktop/share/classes/sun/print/resources \
      #
  
! ifeq ($(call isTargetOs, macosx), true)
    PROP_SRC_DIRS += \
        $(TOPDIR)/src/java.desktop/macosx/classes/com/apple/laf/resources \
        $(TOPDIR)/src/java.desktop/macosx/classes/sun/awt/resources \
        #
  endif
  
! ifeq ($(call isTargetOs, windows), true)
    PROP_SRC_DIRS += \
        $(TOPDIR)/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/resources \
        $(TOPDIR)/src/java.desktop/windows/classes/sun/awt/windows \
        #
  endif
  
! ifneq ($(call isTargetOs, windows macosx), true)
    PROP_SRC_DIRS += $(TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources
  endif
  
  $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
      SRC_DIRS := $(PROP_SRC_DIRS), \