< prev index next >

make/gensrc/Gensrc-java.desktop.gmk

Print this page

        

@@ -26,15 +26,15 @@
 include GensrcCommonJdk.gmk
 
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, gensrc/Gensrc-java.desktop.gmk))
 
-ifeq ($(call isTargetOs, windows), false)
+ifneq ($(OPENJDK_TARGET_OS), windows)
   include GensrcIcons.gmk
 endif
 
-ifeq ($(call isTargetOs, linux solaris aix), true)
+ifneq ($(filter $(OPENJDK_TARGET_OS), linux solaris aix), )
   include GensrcX11Wrappers.gmk
 endif
 
 include GensrcSwing.gmk
 

@@ -50,25 +50,25 @@
     $(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)
+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 ($(call isTargetOs, windows), true)
+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 ($(call isTargetOs, windows macosx), false)
+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), \
< prev index next >