< prev index next >

make/lib/Awt2dLibraries.gmk

Print this page
rev 13458 : 8170681: Remove fontconfig header files from JDK source tree
Reviewed-by: serb, erikj


 511 BUILD_LIBRARIES += $(BUILD_LIBAWT)
 512 
 513 ##########################################################################################
 514 
 515 ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
 516   ifndef BUILD_HEADLESS_ONLY
 517 
 518     LIBAWT_XAWT_DIRS := \
 519         $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
 520         $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
 521         $(JDK_TOPDIR)/src/share/native/sun/font \
 522         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
 523         $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
 524         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
 525         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
 526         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \
 527         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \
 528 
 529     LIBAWT_XAWT_CFLAGS := -DXAWT -DXAWT_HACK \
 530         -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \

 531         $(CUPS_CFLAGS) \
 532         $(foreach dir, $(LIBAWT_XAWT_DIRS), -I$(dir)) \
 533         -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
 534         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
 535         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
 536         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
 537         -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
 538         -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
 539         -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
 540         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga
 541 
 542     ifeq ($(OPENJDK_TARGET_OS), solaris)
 543       LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
 544     endif
 545 
 546     ifeq ($(OPENJDK_TARGET_OS), linux)
 547       ifndef OPENJDK
 548         include $(JDK_TOPDIR)/make/closed/xawt.gmk
 549       endif
 550 


 755 ##########################################################################################
 756 
 757 ifeq ($(BUILD_HEADLESS), true)
 758   # Mac and Windows only use the native AWT lib, do not build libawt_headless
 759   ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
 760 
 761     LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/share/native/sun/font \
 762         $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
 763         $(JDK_TOPDIR)/src/solaris/native/sun/font \
 764         $(JDK_TOPDIR)/src/solaris/native/sun/awt \
 765         $(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
 766         $(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
 767 
 768     ifeq ($(OPENJDK_TARGET_OS), macosx)
 769       LIBAWT_HEADLESS_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/font
 770     endif
 771 
 772     LIBAWT_HEADLESS_CFLAGS := -DHEADLESS=true \
 773         -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
 774         $(CUPS_CFLAGS) \

 775         $(X_CFLAGS) \
 776         -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
 777         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
 778         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
 779         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
 780         -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
 781         -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
 782         -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
 783         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
 784         $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
 785 
 786     LIBAWT_HEADLESS_FILES := \
 787         awt_Font.c \
 788         HeadlessToolkit.c \
 789         fontpath.c \
 790         VDrawingArea.c \
 791         X11Color.c \
 792         X11Renderer.c \
 793         X11PMBlitLoops.c \
 794         X11SurfaceData.c \




 511 BUILD_LIBRARIES += $(BUILD_LIBAWT)
 512 
 513 ##########################################################################################
 514 
 515 ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
 516   ifndef BUILD_HEADLESS_ONLY
 517 
 518     LIBAWT_XAWT_DIRS := \
 519         $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
 520         $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
 521         $(JDK_TOPDIR)/src/share/native/sun/font \
 522         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
 523         $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
 524         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
 525         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
 526         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \
 527         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \
 528 
 529     LIBAWT_XAWT_CFLAGS := -DXAWT -DXAWT_HACK \
 530         -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
 531         $(FONTCONFIG_CFLAGS) \
 532         $(CUPS_CFLAGS) \
 533         $(foreach dir, $(LIBAWT_XAWT_DIRS), -I$(dir)) \
 534         -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
 535         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
 536         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
 537         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
 538         -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
 539         -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
 540         -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
 541         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga
 542 
 543     ifeq ($(OPENJDK_TARGET_OS), solaris)
 544       LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
 545     endif
 546 
 547     ifeq ($(OPENJDK_TARGET_OS), linux)
 548       ifndef OPENJDK
 549         include $(JDK_TOPDIR)/make/closed/xawt.gmk
 550       endif
 551 


 756 ##########################################################################################
 757 
 758 ifeq ($(BUILD_HEADLESS), true)
 759   # Mac and Windows only use the native AWT lib, do not build libawt_headless
 760   ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
 761 
 762     LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/share/native/sun/font \
 763         $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
 764         $(JDK_TOPDIR)/src/solaris/native/sun/font \
 765         $(JDK_TOPDIR)/src/solaris/native/sun/awt \
 766         $(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
 767         $(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
 768 
 769     ifeq ($(OPENJDK_TARGET_OS), macosx)
 770       LIBAWT_HEADLESS_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/font
 771     endif
 772 
 773     LIBAWT_HEADLESS_CFLAGS := -DHEADLESS=true \
 774         -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
 775         $(CUPS_CFLAGS) \
 776         $(FONTCONFIG_CFLAGS) \
 777         $(X_CFLAGS) \
 778         -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
 779         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
 780         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
 781         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
 782         -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
 783         -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
 784         -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
 785         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
 786         $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
 787 
 788     LIBAWT_HEADLESS_FILES := \
 789         awt_Font.c \
 790         HeadlessToolkit.c \
 791         fontpath.c \
 792         VDrawingArea.c \
 793         X11Color.c \
 794         X11Renderer.c \
 795         X11PMBlitLoops.c \
 796         X11SurfaceData.c \


< prev index next >