makefiles/GenerateSources.gmk
Print this page
rev 8342 : 8025673: [macosx] Disable X11 AWT toolkit
Summary: Disable but not completely remove the XAWT and headless toolkits on Mac OS X
Reviewed-by:
Contributed-by: david.dehaven@oracle.com
@@ -64,19 +64,21 @@
include gensrc/GensrcExceptions.gmk
GENSRC += $(GENSRC_EXCEPTIONS)
ifneq ($(OPENJDK_TARGET_OS), windows)
-include gensrc/GensrcIcons.gmk
-GENSRC += $(GENSRC_AWT_ICONS)
+ include gensrc/GensrcIcons.gmk
+ GENSRC += $(GENSRC_AWT_ICONS)
-ifeq ($(OPENJDK_TARGET_OS), macosx)
-GENSRC += $(GENSRC_OSX_ICONS)
-endif
-
-include gensrc/GensrcX11Wrappers.gmk
-GENSRC += $(GENSRC_X11WRAPPERS)
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+ GENSRC += $(GENSRC_OSX_ICONS)
+ endif
+
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+ include gensrc/GensrcX11Wrappers.gmk
+ GENSRC += $(GENSRC_X11WRAPPERS)
+ endif
endif
include gensrc/GensrcCLDR.gmk
GENSRC += $(GENSRC_CLDR)