jdk-sandbox: make/lib/Awt2dLibraries.gmk@7c224ec572d0 (annotated)

12317 9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	1	#
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	2	# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
12317 9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	3	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	4	#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	5	# This code is free software; you can redistribute it and/or modify it
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	6	# under the terms of the GNU General Public License version 2 only, as
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	7	# published by the Free Software Foundation. Oracle designates this
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	8	# particular file as subject to the "Classpath" exception as provided
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	9	# by Oracle in the LICENSE file that accompanied this code.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	10	#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	11	# This code is distributed in the hope that it will be useful, but WITHOUT
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	12	# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	13	# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	14	# version 2 for more details (a copy is included in the LICENSE file that
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	15	# accompanied this code).
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	16	#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	17	# You should have received a copy of the GNU General Public License version
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	18	# 2 along with this work; if not, write to the Free Software Foundation,
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	19	# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	20	#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	21	# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	22	# or visit www.oracle.com if you need additional information or have any
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	23	# questions.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	24	#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	25
47314 743814386712 8188814: Simplify IncludeCustomExtension ihse parents: 47217 diff changeset	26	$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries-pre.gmk))
39504 96c700e62710 8003593: build-infra: Paths to optional platform-specific files should not be hardwired to src/closed erikj parents: 39025 diff changeset	27
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	28	WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib
12317 9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	29
26191 a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	30	################################################################################
12317 9670c1610c53 7074397: Build infrastructure changes (makefile re-write) ohair parents: diff changeset	31
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	32	BUILD_LIBMLIB_SRC := $(TOPDIR)/src/java.desktop/share/native/libmlib_image \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	33	$(TOPDIR)/src/java.desktop/share/native/common/awt/medialib
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	34	BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	35	$(addprefix -I, $(BUILD_LIBMLIB_SRC)) \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	36	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libmlib_image
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	37
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	38	BUILD_LIBMLIB_LDLIBS :=
13164 72c5d01a857d 7181504: Update of latest build-infra Makefiles erikj parents: 12892 diff changeset	39
13702 efd6a05935b2 7197849: Update new build-infra makefiles ohair parents: 13164 diff changeset	40	BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
efd6a05935b2 7197849: Update new build-infra makefiles ohair parents: 13164 diff changeset	41
efd6a05935b2 7197849: Update new build-infra makefiles ohair parents: 13164 diff changeset	42	ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	43	BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	44	endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	45
13164 72c5d01a857d 7181504: Update of latest build-infra Makefiles erikj parents: 12892 diff changeset	46	ifneq ($(OPENJDK_TARGET_OS), windows)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	47	BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	48	endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	49
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	50	$(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	51	NAME := mlib_image, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	52	SRC := $(BUILD_LIBMLIB_SRC), \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	53	EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	54	OPTIMIZATION := HIGHEST, \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	55	CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	56	$(BUILD_LIBMLIB_CFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	57	LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	58	$(call SET_SHARED_LIBRARY_ORIGIN), \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	59	LIBS := $(BUILD_LIBMLIB_LDLIBS) \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	60	$(JDKLIB_LIBS), \
35276 50b3cdcef339 8145596: Enable debug symbols for all libraries ihse parents: 35241 diff changeset	61	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	62
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	63	$(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java)
13164 72c5d01a857d 7181504: Update of latest build-infra Makefiles erikj parents: 12892 diff changeset	64
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	65	TARGETS += $(BUILD_LIBMLIB_IMAGE)
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	66
26191 a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	67	################################################################################
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	68
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	69	ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	70
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	71	LIBMLIB_IMAGE_V_SRC := $(TOPDIR)/src/java.desktop/share/native/libmlib_image \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	72	$(TOPDIR)/src/java.desktop/unix/native/libmlib_image \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	73	$(TOPDIR)/src/java.desktop/share/native/common/awt/medialib \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	74	$(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	75	#
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	76	LIBMLIB_IMAGE_V_CFLAGS := $(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	77	$(addprefix -I, $(LIBMLIB_IMAGE_V_SRC)) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	78	#
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	79
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	80	BUILD_LIBMLIB_IMAGE_V_EXFILES := \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	81	awt_ImagingLib.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	82	mlib_c_ImageAffine_BC.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	83	mlib_c_ImageAffine_BC_S16.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	84	mlib_c_ImageAffine_BC_U16.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	85	mlib_c_ImageAffine_BL.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	86	mlib_c_ImageAffine_BL_S16.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	87	mlib_c_ImageAffine_BL_U16.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	88	mlib_c_ImageAffine_NN.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	89	mlib_c_ImageConvClearEdge.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	90	mlib_c_ImageConvCopyEdge.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	91	mlib_c_ImageConv_f.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	92	mlib_c_ImageConvVersion.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	93	mlib_c_ImageCopy.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	94	mlib_c_ImageLookUp.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	95	mlib_c_ImageLookUp_f.c \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	96	#
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	97
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	98	LIBMLIB_IMAGE_V_CFLAGS += $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	99
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	100	$(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE_V, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	101	NAME := mlib_image_v, \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	102	SRC := $(LIBMLIB_IMAGE_V_SRC), \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	103	EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	104	OPTIMIZATION := HIGHEST, \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	105	CFLAGS := -xarch=sparcvis \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	106	$(LIBMLIB_IMAGE_V_CFLAGS) \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	107	$(CFLAGS_JDKLIB), \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	108	LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	109	$(call SET_SHARED_LIBRARY_ORIGIN), \
49241 de4b3a04feae 8199606: Set -lc as global LIBS on solstudio ihse parents: 49239 diff changeset	110	LIBS := -ljava -ljvm $(BUILD_LIBMLIB_LDLIBS), \
35276 50b3cdcef339 8145596: Enable debug symbols for all libraries ihse parents: 35241 diff changeset	111	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	112
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	113	$(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	114
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	115	TARGETS += $(BUILD_LIBMLIB_IMAGE_V)
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	116
3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	117	endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	118
26191 a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	119	################################################################################
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	120
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	121	LIBAWT_DIRS := $(TOPDIR)/src/java.desktop/share/native/libawt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	122	$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	123	$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	124	$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	125	#
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	126
26225 3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834 simonis parents: 26191 diff changeset	127	ifeq ($(OPENJDK_TARGET_OS), aix)
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	128	LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
26225 3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834 simonis parents: 26191 diff changeset	129	endif
3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834 simonis parents: 26191 diff changeset	130
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	131	ifeq ($(OPENJDK_TARGET_OS), windows)
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	132	LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/awt/utility
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	133	endif
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	134
26225 3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834 simonis parents: 26191 diff changeset	135	ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	136	LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
14231 a0c23c1c010f 8000992: Update new build-infra makefiles ohair parents: 13702 diff changeset	137	endif
13164 72c5d01a857d 7181504: Update of latest build-infra Makefiles erikj parents: 12892 diff changeset	138
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	139	ifeq ($(OPENJDK_TARGET_OS), macosx)
26751 70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common prr parents: 26741 diff changeset	140	LIBAWT_EXFILES += initIDs.c awt/image/cvutils/img_colors.c
22597 7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX simonis parents: 22595 diff changeset	141	endif
7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX simonis parents: 22595 diff changeset	142
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	143	LIBAWT_CFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	144	$(addprefix -I, $(shell find $(LIBAWT_DIRS) -type d)) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	145	$(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	146	$(addprefix -I, $(BUILD_LIBMLIB_IMAGE_SRC)) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	147	#
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	148
26225 3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834 simonis parents: 26191 diff changeset	149	LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	150
13164 72c5d01a857d 7181504: Update of latest build-infra Makefiles erikj parents: 12892 diff changeset	151	ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	152	LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	153	LIBAWT_CFLAGS += -xarch=sparcvis
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	154
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	155	LIBAWT_CFLAGS += $(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	156	LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib
26751 70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common prr parents: 26741 diff changeset	157	LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	158
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	159	ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	160	LIBAWT_ASFLAGS = -P -xarch=v9a
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	161	else
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	162	LIBAWT_ASFLAGS = -P -xarch=v8plusa
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	163	endif
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	164	else
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	165	LIBAWT_EXCLUDES += \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	166	$(TOPDIR)/src/java.desktop/unix/native/libawt/awt/medialib \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	167	$(TOPDIR)/src/java.desktop/unix/native/libawt/java2d/loops \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	168	$(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	169	#
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	170	endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	171
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	172	ifneq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	173	LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	174	endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	175
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	176	ifeq ($(OPENJDK_TARGET_OS), windows)
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	177	LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	178	$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	179	$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	180	# Why does libawt need java.base headers?
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	181	LIBAWT_CFLAGS += -I$(TOPDIR)/src/java.desktop/share/native/common/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	182	-I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	183	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	184	-I$(TOPDIR)/src/java.desktop/windows/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	185	-I$(TOPDIR)/src/java.desktop/share/native/include \
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	186	-I$(SUPPORT_OUTPUTDIR)/headers/java.base \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	187	#
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	188	LIBAWT_EXFILES += \
26751 70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common prr parents: 26741 diff changeset	189	java2d/d3d/D3DShaderGen.c \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common prr parents: 26741 diff changeset	190	awt/image/cvutils/img_colors.c \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	191	#
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	192
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	193	LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	194	ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	195	LIBAWT_CFLAGS += -DMLIB_OS64BIT
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	196	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	197
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	198	LIBAWT_RC_FLAGS ?= -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	199	LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	200	endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	201
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	202	ifeq ($(OPENJDK_TARGET_OS), linux)
49440 396ea30afbd5 8200178: Remove mapfiles for JDK native libraries ihse parents: 49263 diff changeset	203	# FIXME: This is probably not what we want to do, but keep it now for compatibility.
396ea30afbd5 8200178: Remove mapfiles for JDK native libraries ihse parents: 49263 diff changeset	204	LIBAWT_CFLAGS += $(EXPORT_ALL_SYMBOLS)
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	205	endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	206
35711 d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	207	# Turn off all warnings for debug_mem.c This is needed because the specific warning
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	208	# about initializing a declared 'extern' cannot be turned off individually. Only
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	209	# applies to debug builds.
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	210	ifeq ($(TOOLCHAIN_TYPE), gcc)
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	211	BUILD_LIBAWT_debug_mem.c_CFLAGS := -w
43082 cf17b8a17dc0 8140266: Performance loss between jdk8 and jdk9 on Maskfill serb parents: 42747 diff changeset	212	# This option improves performance of MaskFill in Java2D by 20% for some gcc
cf17b8a17dc0 8140266: Performance loss between jdk8 and jdk9 on Maskfill serb parents: 42747 diff changeset	213	LIBAWT_CFLAGS += -fgcse-after-reload
35711 d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	214	endif
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	215
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	216	$(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	217	NAME := awt, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	218	SRC := $(LIBAWT_DIRS), \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	219	EXCLUDES := $(LIBAWT_EXCLUDES), \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	220	EXCLUDE_FILES := $(LIBAWT_EXFILES), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	221	OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	222	CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
29374 f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis ihse parents: 29006 diff changeset	223	DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis ihse parents: 29006 diff changeset	224	format-nonliteral parentheses, \
30434 6b881118c93b 8074859: Turn on warnings as error ihse parents: 30325 diff changeset	225	DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \
29374 f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis ihse parents: 29006 diff changeset	226	DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
30434 6b881118c93b 8074859: Turn on warnings as error ihse parents: 30325 diff changeset	227	DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	228	ASFLAGS := $(LIBAWT_ASFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	229	LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	230	LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	231	LDFLAGS_windows := -delayload:user32.dll -delayload:gdi32.dll \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	232	-delayload:shell32.dll -delayload:winmm.dll \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	233	-delayload:winspool.drv -delayload:imm32.dll \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	234	-delayload:ole32.dll -delayload:comdlg32.dll \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	235	-delayload:comctl32.dll -delayload:shlwapi.dll, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	236	LIBS_unix := -ljvm -ljava $(LIBM), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	237	LIBS_linux := $(LIBDL), \
49241 de4b3a04feae 8199606: Set -lc as global LIBS on solstudio ihse parents: 49239 diff changeset	238	LIBS_solaris := $(LIBDL), \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	239	LIBS_aix := $(LIBDL),\
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	240	LIBS_macosx := -lmlib_image \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	241	-framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	242	-framework OpenGL \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	243	-framework JavaNativeFoundation \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	244	-framework JavaRuntimeSupport \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	245	-framework ApplicationServices \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	246	-framework AudioToolbox, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	247	LIBS_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	248	imm32.lib ole32.lib uuid.lib shell32.lib \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	249	comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	250	delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	251	VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	252	RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	253	-D "JDK_FNAME=awt.dll" \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	254	-D "JDK_INTERNAL_NAME=awt" \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	255	-D "JDK_FTYPE=0x2L", \
35276 50b3cdcef339 8145596: Enable debug symbols for all libraries ihse parents: 35241 diff changeset	256	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	257
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	258	$(BUILD_LIBAWT): $(call FindLib, java.base, java)
13164 72c5d01a857d 7181504: Update of latest build-infra Makefiles erikj parents: 12892 diff changeset	259
72c5d01a857d 7181504: Update of latest build-infra Makefiles erikj parents: 12892 diff changeset	260	ifeq ($(OPENJDK_TARGET_OS), macosx)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	261	$(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
13164 72c5d01a857d 7181504: Update of latest build-infra Makefiles erikj parents: 12892 diff changeset	262	endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles erikj parents: 12892 diff changeset	263
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	264	TARGETS += $(BUILD_LIBAWT)
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	265
26191 a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	266	################################################################################
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	267
21130 0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	268	ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	269	ifeq ($(ENABLE_HEADLESS_ONLY), false)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	270
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	271	LIBAWT_XAWT_DIRS := \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	272	$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	273	$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	274	$(TOPDIR)/src/java.desktop/share/native/common/awt/utility \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	275	$(TOPDIR)/src/java.desktop/share/native/common/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	276	$(TOPDIR)/src/java.desktop/share/native/common/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	277	$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	278	$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	279	#
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	280
36953 d707077d2f74 8153727: AIX jdk build broken after 8145174 stuefe parents: 36907 diff changeset	281	ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris aix), )
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	282	LIBAWT_XAWT_DIRS += $(TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
36880 3a05117c7611 8151770: 9-client windows builds fail on windows since make file change for 8145174 erikj parents: 36869 diff changeset	283	endif
3a05117c7611 8151770: 9-client windows builds fail on windows since make file change for 8145174 erikj parents: 36869 diff changeset	284
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	285	LIBAWT_XAWT_EXCLUDES := medialib
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	286
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	287	LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	288	-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	289	-I$(TOPDIR)/src/java.desktop/share/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	290	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	291	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	292	-I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	293	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	294	-I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	295	-I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	296	-I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	297	-I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	298	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	299	$(LIBJAVA_HEADER_FLAGS)
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	300	#
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	301
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	302	LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
21130 0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	303	-DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
47507 5a270d2dfa5d 8170681: Remove fontconfig header files from JDK source tree prr parents: 47314 diff changeset	304	$(FONTCONFIG_CFLAGS) \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	305	$(CUPS_CFLAGS)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	306
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	307	ifeq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	308	LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	309	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	310
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	311	ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	312	ifeq ($(DISABLE_XRENDER), true)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	313	LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	314	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	315	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	316
49241 de4b3a04feae 8199606: Set -lc as global LIBS on solstudio ihse parents: 49239 diff changeset	317	LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	318
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	319	ifeq ($(OPENJDK_TARGET_OS), linux)
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	320	LIBAWT_XAWT_LIBS += -lpthread
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	321	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	322
35711 d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	323	ifeq ($(TOOLCHAIN_TYPE), gcc)
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	324	# Turn off all warnings for the following files since they contain warnings
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	325	# that cannot be turned of individually.
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	326	# redefining a macro
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	327	BUILD_LIBAWT_XAWT_gtk2_interface.c_CFLAGS := -w
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	328	# comparison between pointer and integer
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	329	BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	330	# initializing a declared 'extern'
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	331	BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	332	endif
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	333
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	334	$(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	335	NAME := awt_xawt, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	336	SRC := $(LIBAWT_XAWT_DIRS), \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	337	EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	338	OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	339	CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	340	$(X_CFLAGS), \
37529 868c7195632c 8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build simonis parents: 36110 diff changeset	341	WARNINGS_AS_ERRORS_xlc := false, \
29374 f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis ihse parents: 29006 diff changeset	342	DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \
42194 4c928df88d20 8160146: Resolve disabled GCC warning 'deprecated-declarations' for libawt_xawt aghaisas parents: 41132 diff changeset	343	unused-result maybe-uninitialized format \
48766 2c4d1993b5f9 8196985: Disable new warnings from GCC 7.3 in jdk libraries erikj parents: 48751 diff changeset	344	format-security int-to-pointer-cast parentheses \
2c4d1993b5f9 8196985: Disable new warnings from GCC 7.3 in jdk libraries erikj parents: 48751 diff changeset	345	implicit-fallthrough, \
29374 f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis ihse parents: 29006 diff changeset	346	DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis ihse parents: 29006 diff changeset	347	E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	348	LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	349	$(call SET_SHARED_LIBRARY_ORIGIN) \
27944 c6d5edd39016 8066752: Remove space after -L on linker lines erikj parents: 27799 diff changeset	350	-L$(INSTALL_LIBRARIES_HERE), \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	351	LIBS := $(X_LIBS) $(LIBAWT_XAWT_LIBS), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	352	RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	353	-D "JDK_FNAME=xawt.dll" \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	354	-D "JDK_INTERNAL_NAME=xawt" \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	355	-D "JDK_FTYPE=0x2L", \
35276 50b3cdcef339 8145596: Enable debug symbols for all libraries ihse parents: 35241 diff changeset	356	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	357
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	358	$(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	359
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	360	$(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	361
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	362	TARGETS += $(BUILD_LIBAWT_XAWT)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	363
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	364	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	365	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	366
26191 a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	367	################################################################################
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	368
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	369	LIBLCMS_SRC := $(TOPDIR)/src/java.desktop/share/native/liblcms
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	370	LIBLCMS_CPPFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	371	-I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	372	-I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	373	$(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	374	#
33285 5b20fc9010b7 8086092: More palette improvements prr parents: 32872 diff changeset	375	# The fast floor code loses precision.
5b20fc9010b7 8086092: More palette improvements prr parents: 32872 diff changeset	376	LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR
24540 41aa84a568f3 8042159: Allow using a system-installed lcms2 omajid parents: 23592 diff changeset	377
41aa84a568f3 8042159: Allow using a system-installed lcms2 omajid parents: 23592 diff changeset	378	ifeq ($(USE_EXTERNAL_LCMS), true)
41aa84a568f3 8042159: Allow using a system-installed lcms2 omajid parents: 23592 diff changeset	379	# If we're using an external library, we'll just need the wrapper part.
42352 4036fe6d110d 8039103: "explicitly" is misspelled as "explicitely" in configure scripts ihse parents: 42340 diff changeset	380	# By including it explicitly, all other files will be excluded.
24540 41aa84a568f3 8042159: Allow using a system-installed lcms2 omajid parents: 23592 diff changeset	381	BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
41aa84a568f3 8042159: Allow using a system-installed lcms2 omajid parents: 23592 diff changeset	382	else
41aa84a568f3 8042159: Allow using a system-installed lcms2 omajid parents: 23592 diff changeset	383	BUILD_LIBLCMS_INCLUDE_FILES :=
41aa84a568f3 8042159: Allow using a system-installed lcms2 omajid parents: 23592 diff changeset	384	# If we're using the bundled library, we'll need to include it in the
41aa84a568f3 8042159: Allow using a system-installed lcms2 omajid parents: 23592 diff changeset	385	# include path explicitly. Otherwise the system headers will be used.
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	386	LIBLCMS_CPPFLAGS += $(addprefix -I, $(LIBLCMS_SRC))
24540 41aa84a568f3 8042159: Allow using a system-installed lcms2 omajid parents: 23592 diff changeset	387	endif
41aa84a568f3 8042159: Allow using a system-installed lcms2 omajid parents: 23592 diff changeset	388
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	389	$(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	390	NAME := lcms, \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	391	SRC := $(LIBLCMS_SRC), \
24540 41aa84a568f3 8042159: Allow using a system-installed lcms2 omajid parents: 23592 diff changeset	392	INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	393	OPTIMIZATION := HIGHEST, \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	394	CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
30434 6b881118c93b 8074859: Turn on warnings as error ihse parents: 30325 diff changeset	395	$(LIBLCMS_CPPFLAGS) \
24540 41aa84a568f3 8042159: Allow using a system-installed lcms2 omajid parents: 23592 diff changeset	396	$(LCMS_CFLAGS), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	397	CFLAGS_solaris := -xc99=no_lib, \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	398	CFLAGS_windows := -DCMS_IS_WINDOWS_, \
39550 8d587cab45d2 8160294: Some client libraries cannot be built with GCC 6 ysuenaga parents: 39025 diff changeset	399	DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \
29374 f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis ihse parents: 29006 diff changeset	400	DISABLED_WARNINGS_clang := tautological-compare, \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis ihse parents: 29006 diff changeset	401	DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
42747 807791cafb87 8170954: non-ASCII characters in lcms and harfbuzz break Windows builds on some locales dbuck parents: 42352 diff changeset	402	DISABLED_WARNINGS_microsoft := 4819, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	403	LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	404	$(call SET_SHARED_LIBRARY_ORIGIN), \
27944 c6d5edd39016 8066752: Remove space after -L on linker lines erikj parents: 27799 diff changeset	405	LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	406	LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	407	LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	408	LIBS_linux := $(LIBM), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	409	LIBS_macosx := $(LIBM), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	410	LIBS_aix := $(LIBM),\
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	411	LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
35276 50b3cdcef339 8145596: Enable debug symbols for all libraries ihse parents: 35241 diff changeset	412	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	413
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	414	TARGETS += $(BUILD_LIBLCMS)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	415
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	416	$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	417
26191 a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	418	################################################################################
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	419
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	420	LIBJAVAJPEG_SRC += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	421
49440 396ea30afbd5 8200178: Remove mapfiles for JDK native libraries ihse parents: 49263 diff changeset	422	# "DISABLED_WARNINGS_gcc := clobbered" rationale:
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	423	# Suppress gcc warnings like "variable might be clobbered by 'longjmp'
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	424	# or 'vfork'": this warning indicates that some variable is placed to
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	425	# a register by optimized compiler and it's value might be lost on longjmp().
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	426	# Recommended way to avoid such warning is to declare the variable as
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	427	# volatile to prevent the optimization. However, this approach does not
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	428	# work because we have to declare all variables as volatile in result.
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	429
25103 4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	430	ifeq ($(USE_EXTERNAL_LIBJPEG), true)
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	431	LIBJPEG_LIBS := -ljpeg
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	432	BUILD_LIBJAVAJPEG_INCLUDE_FILES := \
33647 2665054d3864 8139932: Typo in makefile changes for 8043805 [Allow using a system-installed libjpeg] omajid parents: 33518 diff changeset	433	imageioJPEG.c \
25103 4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	434	jpegdecoder.c
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	435	BUILD_LIBJAVAJPEG_HEADERS :=
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	436	else
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	437	LIBJPEG_LIBS :=
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	438	BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	439	BUILD_LIBJAVAJPEG_HEADERS := $(addprefix -I, $(LIBJAVAJPEG_SRC))
25103 4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	440	endif
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	441
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	442	$(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	443	NAME := javajpeg, \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	444	SRC := $(LIBJAVAJPEG_SRC), \
25103 4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	445	INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	446	OPTIMIZATION := HIGHEST, \
31159 6f5c7d192b2d 8081447: System JPEG builds include in-tree jpeglib.h, resulting in build failure andrew parents: 31157 diff changeset	447	CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	448	$(LIBJAVA_HEADER_FLAGS) \
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	449	-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
48766 2c4d1993b5f9 8196985: Disable new warnings from GCC 7.3 in jdk libraries erikj parents: 48751 diff changeset	450	DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \
33305 ed708a0e3482 8140223: fix the build with a toolchain with a linker defaulting to ld --as-needed erikj parents: 33285 diff changeset	451	LDFLAGS := $(LDFLAGS_JDKLIB) \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	452	$(call SET_SHARED_LIBRARY_ORIGIN), \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	453	LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	454	LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
35276 50b3cdcef339 8145596: Enable debug symbols for all libraries ihse parents: 35241 diff changeset	455	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	456
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	457	$(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	458
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	459	TARGETS += $(BUILD_LIBJAVAJPEG)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	460
26191 a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	461	################################################################################
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	462
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	463	# Mac and Windows only use the native AWT lib, do not build libawt_headless
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	464	ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
29006 0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking prr parents: 29002 diff changeset	465
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	466	LIBAWT_HEADLESS_DIRS := $(TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	467	$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	468	$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	469	$(TOPDIR)/src/java.desktop/share/native/common/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	470	$(TOPDIR)/src/java.desktop/share/native/common/font \
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	471	#
29006 0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking prr parents: 29002 diff changeset	472
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	473	LIBAWT_HEADLESS_EXCLUDES := medialib
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	474	LIBAWT_HEADLESS_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	475	$(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	476	-I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	477	-I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	478	-I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	479	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	480	-I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	481	-I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	482	-I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	483	-I$(TOPDIR)/src/java.desktop/share/native/common/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	484	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	485	-I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	486	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	487	$(LIBJAVA_HEADER_FLAGS) \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	488	#
29006 0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking prr parents: 29002 diff changeset	489
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	490	$(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	491	NAME := awt_headless, \
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	492	SRC := $(LIBAWT_HEADLESS_DIRS), \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	493	EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	494	OPTIMIZATION := LOW, \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	495	CFLAGS := $(CFLAGS_JDKLIB) \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	496	-DHEADLESS=true \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	497	-DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	498	$(CUPS_CFLAGS) \
47507 5a270d2dfa5d 8170681: Remove fontconfig header files from JDK source tree prr parents: 47314 diff changeset	499	$(FONTCONFIG_CFLAGS) \
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	500	$(X_CFLAGS) \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	501	$(LIBAWT_HEADLESS_CFLAGS), \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	502	DISABLED_WARNINGS_xlc := 1506-356, \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	503	DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	504	LDFLAGS := $(LDFLAGS_JDKLIB) \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	505	$(call SET_SHARED_LIBRARY_ORIGIN), \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	506	LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	507	LIBS_unix := -lawt -ljvm -ljava, \
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	508	LIBS_linux := $(LIBM) $(LIBDL), \
49241 de4b3a04feae 8199606: Set -lc as global LIBS on solstudio ihse parents: 49239 diff changeset	509	LIBS_solaris := $(LIBM) $(LIBDL) $(LIBCXX), \
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	510	))
29006 0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking prr parents: 29002 diff changeset	511
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	512	# AIX warning explanation:
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	513	# 1506-356 : (W) Compilation unit is empty.
2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	514	# This happens during the headless build
37529 868c7195632c 8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build simonis parents: 36110 diff changeset	515
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	516	$(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
29006 0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking prr parents: 29002 diff changeset	517
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	518	TARGETS += $(BUILD_LIBAWT_HEADLESS)
29006 0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking prr parents: 29002 diff changeset	519
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking prr parents: 29002 diff changeset	520	endif
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking prr parents: 29002 diff changeset	521
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking prr parents: 29002 diff changeset	522	################################################################################
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking prr parents: 29002 diff changeset	523
49234 3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	524	ifeq ($(FREETYPE_TO_USE), system)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	525	LIBFREETYPE_CFLAGS := $(FREETYPE_CFLAGS)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	526	LIBFREETYPE_LIBS := $(FREETYPE_LIBS)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	527	else
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	528	LIBFREETYPE_SRC := $(TOPDIR)/src/java.desktop/share/native/libfreetype
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	529	BUILD_LIBFREETYPE_HEADERS := $(addprefix -I, $(LIBFREETYPE_SRC)/include)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	530	LIBFREETYPE_CFLAGS := $(BUILD_LIBFREETYPE_HEADERS)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	531	ifeq ($(OPENJDK_TARGET_OS), windows)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	532	LIBFREETYPE_LIBS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfreetype/freetype.lib
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	533	else
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	534	LIBFREETYPE_LIBS := -lfreetype
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	535	endif
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	536
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	537	$(eval $(call SetupJdkLibrary, BUILD_LIBFREETYPE, \
49234 3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	538	NAME := freetype, \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	539	SRC := $(LIBFREETYPE_SRC)/src, \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	540	OPTIMIZATION := HIGHEST, \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	541	CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFREETYPE_HEADERS) \
49440 396ea30afbd5 8200178: Remove mapfiles for JDK native libraries ihse parents: 49263 diff changeset	542	-DFT2_BUILD_LIBRARY $(EXPORT_ALL_SYMBOLS), \
49234 3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	543	DISABLED_WARNINGS_solstudio := \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	544	E_STATEMENT_NOT_REACHED \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	545	E_END_OF_LOOP_CODE_NOT_REACHED, \
49566 7c224ec572d0 8201267: Disable warnings for VS2017 to enable building erikj parents: 49539 diff changeset	546	DISABLED_WARNINGS_microsoft := 4267 4244 4312, \
49234 3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	547	LDFLAGS := $(LDFLAGS_JDKLIB) \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	548	$(call SET_SHARED_LIBRARY_ORIGIN), \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	549	))
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	550
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	551	TARGETS += $(BUILD_LIBFREETYPE)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	552	endif
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	553
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	554	###########################################################################
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	555
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	556	LIBFONTMANAGER_SRC := $(TOPDIR)/src/java.desktop/share/native/libfontmanager \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	557	$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	558	LIBFONTMANAGER_CFLAGS := \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	559	$(addprefix -I, $(shell $(FIND) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	560	$(LIBFONTMANAGER_SRC) \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	561	$(TOPDIR)/src/java.desktop/share/native/libawt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	562	$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	563	$(TOPDIR)/src/java.desktop/share/native/common \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	564	$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common -type d)) \
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	565	-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	566	$(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	567	#
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	568
34414 e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	569	#### Begin harfbuzz configuration
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	570
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	571	HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	572
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	573	ifneq ($(OPENJDK_TARGET_OS), windows)
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	574	HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	575	-DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	576	endif
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	577	ifneq (, $(findstring $(OPENJDK_TARGET_OS), linux macosx))
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	578	HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	579	endif
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	580	ifeq ($(OPENJDK_TARGET_OS), solaris)
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	581	HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	582	endif
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	583	ifeq ($(OPENJDK_TARGET_OS), macosx)
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	584	HARFBUZZ_CFLAGS += -DHAVE_CORETEXT
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	585	endif
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	586	ifneq ($(OPENJDK_TARGET_OS), macosx)
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	587	LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	588	endif
34432 958d65712d3e 8144616: Problem building OpenJDK/harfbuzz on jprt prr parents: 34414 diff changeset	589	# hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
958d65712d3e 8144616: Problem building OpenJDK/harfbuzz on jprt prr parents: 34414 diff changeset	590	LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc
34414 e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	591
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	592	LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	593
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	594	#### End harfbuzz configuration
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258 prr parents: 33647 diff changeset	595
49234 3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	596	LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	597	BUILD_LIBFONTMANAGER_FONTLIB += $(LIBFREETYPE_LIBS)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	598
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	599	LIBFONTMANAGER_OPTIMIZATION := HIGH
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	600
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	601	ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	602	LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	603	X11TextRenderer.c
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	604	LIBFONTMANAGER_OPTIMIZATION := HIGHEST
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	605	LIBFONTMANAGER_CFLAGS += -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows
21130 0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	606	else ifeq ($(OPENJDK_TARGET_OS), macosx)
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	607	LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	608	X11TextRenderer.c \
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	609	fontpath.c \
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	610	lcdglyph.c
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	611	else
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	612	LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	613	lcdglyph.c
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	614	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	615
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	616	LIBFONTMANAGER_CFLAGS += $(FONT_HEADERS) $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	617
35711 d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	618	ifeq ($(TOOLCHAIN_TYPE), gcc)
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	619	# Turn off all warnings for sunFont.c. This is needed because the specific warning
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	620	# about discarding 'const' qualifier cannot be turned off individually.
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	621	BUILD_LIBFONTMANAGER_sunFont.c_CFLAGS := -w
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	622	# Turn off aliasing with GCC for ExtensionSubtables.cpp
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	623	BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	624	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	625
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	626	$(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	627	NAME := fontmanager, \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	628	SRC := $(LIBFONTMANAGER_SRC), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	629	EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	630	AccelGlyphCache.c, \
29931 64e274ed6567 8077824: Introduce DefineNativeToolchain to handle toolchain configurations erikj parents: 29734 diff changeset	631	TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	632	CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	633	CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	634	OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	635	CFLAGS_windows = -DCC_NOEX, \
37529 868c7195632c 8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build simonis parents: 36110 diff changeset	636	WARNINGS_AS_ERRORS_xlc := false, \
35711 d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	637	DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \
48766 2c4d1993b5f9 8196985: Disable new warnings from GCC 7.3 in jdk libraries erikj parents: 48751 diff changeset	638	type-limits missing-field-initializers implicit-fallthrough, \
35711 d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	639	DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	640	maybe-uninitialized, \
30434 6b881118c93b 8074859: Turn on warnings as error ihse parents: 30325 diff changeset	641	DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
6b881118c93b 8074859: Turn on warnings as error ihse parents: 30325 diff changeset	642	tautological-constant-out-of-range-compare int-to-pointer-cast, \
35711 d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	643	DISABLED_WARNINGS_C_solstudio = \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	644	E_INTEGER_OVERFLOW_DETECTED \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	645	E_ARG_INCOMPATIBLE_WITH_ARG_L \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	646	E_ENUM_VAL_OVERFLOWS_INT_MAX, \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	647	DISABLED_WARNINGS_CXX_solstudio := \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	648	truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager erikj parents: 35276 diff changeset	649	hidevf w_novirtualdescr arrowrtn2, \
48274 51772bf1fb0c 8188836: Upgrade to Harfbuzz 1.7.1 in JDK 10 prr parents: 48040 diff changeset	650	DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
48731 c832897a3a23 8196509: Linux UI applications broken by the build change for JDK-8196218 prr parents: 48730 diff changeset	651	LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	652	$(call SET_SHARED_LIBRARY_ORIGIN), \
27944 c6d5edd39016 8066752: Remove space after -L on linker lines erikj parents: 27799 diff changeset	653	LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	654	LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	655	LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
49533 0eaddc72d8f4 8199608: Clean up LDFLAGS for libfontmanager ihse parents: 49523 diff changeset	656	LIBS_aix := -lawt_headless, \
0eaddc72d8f4 8199608: Clean up LDFLAGS for libfontmanager ihse parents: 49523 diff changeset	657	LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \
0eaddc72d8f4 8199608: Clean up LDFLAGS for libfontmanager ihse parents: 49523 diff changeset	658	-framework CoreGraphics, \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	659	LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	660	$(WIN_AWT_LIB), \
35276 50b3cdcef339 8145596: Enable debug symbols for all libraries ihse parents: 35241 diff changeset	661	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	662
48040 26f1193f1348 8192876: MacOS build fails intermittently after JDK-8139653 erikj parents: 48032 diff changeset	663	$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
26f1193f1348 8192876: MacOS build fails intermittently after JDK-8139653 erikj parents: 48032 diff changeset	664
48731 c832897a3a23 8196509: Linux UI applications broken by the build change for JDK-8196218 prr parents: 48730 diff changeset	665	ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
48040 26f1193f1348 8192876: MacOS build fails intermittently after JDK-8139653 erikj parents: 48032 diff changeset	666	$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
26f1193f1348 8192876: MacOS build fails intermittently after JDK-8139653 erikj parents: 48032 diff changeset	667	endif
26f1193f1348 8192876: MacOS build fails intermittently after JDK-8139653 erikj parents: 48032 diff changeset	668
49533 0eaddc72d8f4 8199608: Clean up LDFLAGS for libfontmanager ihse parents: 49523 diff changeset	669	ifeq ($(OPENJDK_TARGET_OS), macosx)
49539 af97dd04d913 8201221: JDK-8199608 introduced a build race on macosx erikj parents: 49533 diff changeset	670	$(BUILD_LIBFONTMANAGER): $(call FindLib, java.desktop, awt_lwawt)
49533 0eaddc72d8f4 8199608: Clean up LDFLAGS for libfontmanager ihse parents: 49523 diff changeset	671	endif
0eaddc72d8f4 8199608: Clean up LDFLAGS for libfontmanager ihse parents: 49523 diff changeset	672
49234 3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	673	ifeq ($(FREETYPE_TO_USE), bundled)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	674	$(BUILD_LIBFONTMANAGER): $(BUILD_LIBFREETYPE)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	675	endif
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree prr parents: 49106 diff changeset	676
48040 26f1193f1348 8192876: MacOS build fails intermittently after JDK-8139653 erikj parents: 48032 diff changeset	677	TARGETS += $(BUILD_LIBFONTMANAGER)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	678
26191 a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	679	################################################################################
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	680
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	681	ifeq ($(OPENJDK_TARGET_OS), windows)
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	682	LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	683	LIBJAWT_CFLAGS := -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	684	-I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	685	-I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	686	-I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	687	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	688	-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	689	-I$(TOPDIR)/src/java.desktop/windows/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	690	-I$(TOPDIR)/src/java.desktop/share/native/include \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	691	$(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	692	#
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	693
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	694	ifeq ($(OPENJDK_TARGET_CPU), x86)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	695	KERNEL32_LIB := kernel32.lib
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	696	endif
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	697	$(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	698	NAME := jawt, \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	699	SRC := $(LIBJAWT_SRC), \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	700	INCLUDE_FILES := $(LIBJAWT_INCLUDE_FILES), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	701	OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	702	CFLAGS := $(CXXFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	703	-EHsc -DUNICODE -D_UNICODE \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	704	$(LIBJAWT_CFLAGS), \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	705	LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	706	LIBS := $(JDKLIB_LIBS) $(KERNEL32_LIB) advapi32.lib $(WIN_AWT_LIB), \
35276 50b3cdcef339 8145596: Enable debug symbols for all libraries ihse parents: 35241 diff changeset	707	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	708
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	709	$(BUILD_LIBJAWT): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	710
45781 0491f891667c 8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows erikj parents: 43806 diff changeset	711	$(eval $(call SetupCopyFiles, COPY_JAWT_LIB, \
49263 78af880eec61 8199749: Debug symbols are not copied to exploded image on Mac erikj parents: 49261 diff changeset	712	FILES := $(BUILD_LIBJAWT_IMPORT_LIBRARY), \
45781 0491f891667c 8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows erikj parents: 43806 diff changeset	713	DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
0491f891667c 8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows erikj parents: 43806 diff changeset	714	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	715
45781 0491f891667c 8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows erikj parents: 43806 diff changeset	716	$(COPY_JAWT_LIB): $(BUILD_LIBJAWT)
0491f891667c 8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows erikj parents: 43806 diff changeset	717
0491f891667c 8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows erikj parents: 43806 diff changeset	718	TARGETS += $(COPY_JAWT_LIB)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	719
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	720	else # OPENJDK_TARGET_OS not windows
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	721
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	722	ifeq ($(OPENJDK_TARGET_OS), macosx)
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	723	LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libjawt
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	724	else
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	725	LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	726	endif
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	727	LIBJAWT_CFLAGS := \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	728	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	729	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	730	-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	731	-I$(TOPDIR)/src/java.desktop/share/native/include \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	732	$(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	733	#
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	734
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	735	ifeq ($(OPENJDK_TARGET_OS), macosx)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	736	JAWT_LIBS := -lawt_lwawt
21130 0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	737	else
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	738	JAWT_LIBS :=
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	739	ifneq ($(OPENJDK_TARGET_OS), solaris)
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	740	JAWT_LIBS += -lawt
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	741	endif
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	742	ifeq ($(ENABLE_HEADLESS_ONLY), false)
21130 0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	743	JAWT_LIBS += -lawt_xawt
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	744	else
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	745	JAWT_LIBS += -lawt_headless
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	746	HEADLESS_CFLAG += -DHEADLESS
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit dholmes parents: 20901 diff changeset	747	endif
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	748	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	749
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	750	$(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	751	NAME := jawt, \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	752	SRC := $(LIBJAWT_SRC), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	753	INCLUDE_FILES := $(JAWT_FILES), \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	754	OPTIMIZATION := LOW, \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	755	CFLAGS := $(CFLAGS_JDKLIB) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	756	$(LIBJAWT_CFLAGS), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	757	CFLAGS_linux := $(HEADLESS_CFLAG), \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	758	CFLAGS_macosx := $(LIBJAWT_CFLAGS_macosx), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	759	LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	760	$(call SET_SHARED_LIBRARY_ORIGIN), \
27944 c6d5edd39016 8066752: Remove space after -L on linker lines erikj parents: 27799 diff changeset	761	LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
34695 7a6cc9982d22 8142907: Integration of minor fixes from the build-infra project ihse parents: 34432 diff changeset	762	LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	763	LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	764	LIBS_solaris := $(X_LIBS) -lXrender, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	765	LIBS_macosx := -framework Cocoa, \
35276 50b3cdcef339 8145596: Enable debug symbols for all libraries ihse parents: 35241 diff changeset	766	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	767
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	768	ifeq ($(ENABLE_HEADLESS_ONLY), false)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	769	$(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	770	else
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	771	$(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	772	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	773
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	774	ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	775	$(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	776	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	777
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	778	endif # OPENJDK_TARGET_OS
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	779
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	780	TARGETS += $(BUILD_LIBJAWT)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	781
26191 a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	782	################################################################################
12892 3ef14bab6254 7170079: Adjustments to build-infra makefiles erikj parents: 12317 diff changeset	783
41132 2a3c61e80af0 8163102: Fix headless only configuration option erikj parents: 40205 diff changeset	784	ifeq ($(ENABLE_HEADLESS_ONLY), false)
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	785
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	786	LIBSPLASHSCREEN_DIRS := \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	787	$(TOPDIR)/src/java.desktop/share/native/libjavajpeg \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	788	$(TOPDIR)/src/java.desktop/share/native/libsplashscreen \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	789	#
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	790
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	791	ifeq ($(USE_EXTERNAL_LIBGIF), true)
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	792	GIFLIB_LIBS := -lgif
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	793	LIBSPLASHSCREEN_EXCLUDES := giflib
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	794	else
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	795	LIBSPLASHSCREEN_CFLAGS += -I$(TOPDIR)/src/java.desktop/share/native/libsplashscreen/giflib
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	796	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	797
25103 4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	798	ifeq ($(USE_EXTERNAL_LIBJPEG), true)
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	799	LIBJPEG_LIBS := -ljpeg
25103 4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	800	else
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	801	LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	802	LIBJPEG_CFLAGS := -I$(TOPDIR)/src/java.desktop/share/native/libjavajpeg
25103 4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	803	endif
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg omajid parents: 24566 diff changeset	804
23305 e7d0093bfc6c 8035341: Allow using a system installed libpng omajid parents: 23292 diff changeset	805	ifeq ($(USE_EXTERNAL_LIBPNG), false)
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	806	LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/share/native/libsplashscreen/libpng
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	807	else
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	808	LIBSPLASHSCREEN_EXCLUDES += libpng
23305 e7d0093bfc6c 8035341: Allow using a system installed libpng omajid parents: 23292 diff changeset	809	endif
e7d0093bfc6c 8035341: Allow using a system installed libpng omajid parents: 23292 diff changeset	810
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	811	ifneq ($(OPENJDK_TARGET_OS), macosx)
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	812	LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsplashscreen
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	813	else
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	814	LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	815	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	816
36953 d707077d2f74 8153727: AIX jdk build broken after 8145174 stuefe parents: 36907 diff changeset	817	ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris aix), )
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	818	LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
36869 f8ef78f4157d 8145174: HiDPI splash screen support on Linux rchamyal parents: 36110 diff changeset	819	endif
36880 3a05117c7611 8151770: 9-client windows builds fail on windows since make file change for 8145174 erikj parents: 36869 diff changeset	820
36907 c3d8383e3efb 8145173: HiDPI splash screen support on Windows rchamyal parents: 36880 diff changeset	821	ifeq ($(OPENJDK_TARGET_OS), windows)
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	822	LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/windows/native/common/awt/systemscale
42340 bf1c934665a9 8056215: AWT source dirs should only point to java2d, not below ihse parents: 42194 diff changeset	823	endif
30325 1472b22475f2 8078245: AARCH64: JDK fails to build due to undefined symbol in libpng enevill parents: 29931 diff changeset	824	LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	825	$(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	826	$(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	827	#
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	828
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	829	ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	830	LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	831	LIBSPLASHSCREEN_CFLAGS += -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	832
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	833	BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	834	BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	835	BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	836	BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	837	BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	838	BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	839	BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	840
20901 70f69e624fc9 8026888: Licensee build failure due to wrong libs being called erikj parents: 20899 diff changeset	841	else ifeq ($(OPENJDK_TARGET_OS), windows)
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called erikj parents: 20899 diff changeset	842	LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	843	else
20901 70f69e624fc9 8026888: Licensee build failure due to wrong libs being called erikj parents: 20899 diff changeset	844	LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	845	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	846
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	847	LIBSPLASHSCREEN_LIBS :=
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	848
48751 54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	849	ifeq ($(USE_EXTERNAL_LIBZ), false)
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	850	LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.base/share/native/libzip/zlib
48751 54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	851	else
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	852	ifeq ($(OPENJDK_TARGET_OS), macosx)
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	853	ifeq ($(USE_EXTERNAL_LIBPNG), false)
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	854	# When building our own libpng and using an external libz, we need to
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	855	# inject our own libz.h to tweak the exported ZLIB_VERNUM macro. See
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	856	# $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen/libpng/zlib.h
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	857	# for details.
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	858	LIBSPLASHSCREEN_CFLAGS += -iquote $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen/libpng
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	859	endif
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	860	endif
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	861	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	862
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	863	ifeq ($(OPENJDK_TARGET_OS), macosx)
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	864	LIBSPLASHSCREEN_LIBS += \
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	865	$(LIBM) -lpthread -liconv -losxapp \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	866	-framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	867	-framework Foundation \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	868	-framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	869	-framework JavaNativeFoundation
20901 70f69e624fc9 8026888: Licensee build failure due to wrong libs being called erikj parents: 20899 diff changeset	870	else ifeq ($(OPENJDK_TARGET_OS), windows)
36907 c3d8383e3efb 8145173: HiDPI splash screen support on Windows rchamyal parents: 36880 diff changeset	871	LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
23592 35b16ae6b4f4 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris erikj parents: 23310 diff changeset	872	else
39844 a3cc7e551a48 8149115: [hidpi] Linux: display-wise scaling factor should probably be taken into account ssadetsky parents: 39550 diff changeset	873	LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl
20901 70f69e624fc9 8026888: Licensee build failure due to wrong libs being called erikj parents: 20899 diff changeset	874	endif
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	875
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	876	$(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	877	NAME := splashscreen, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	878	SRC := $(LIBSPLASHSCREEN_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	879	EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	880	EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	881	OPTIMIZATION := LOW, \
23305 e7d0093bfc6c 8035341: Allow using a system installed libpng omajid parents: 23292 diff changeset	882	CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
48751 54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	883	$(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
48766 2c4d1993b5f9 8196985: Disable new warnings from GCC 7.3 in jdk libraries erikj parents: 48751 diff changeset	884	DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \
2c4d1993b5f9 8196985: Disable new warnings from GCC 7.3 in jdk libraries erikj parents: 48751 diff changeset	885	maybe-uninitialized shift-negative-value implicit-fallthrough, \
29374 f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis ihse parents: 29006 diff changeset	886	DISABLED_WARNINGS_clang := incompatible-pointer-types, \
32408 97230ec16697 8134408: Disable warnings for jdk libraries triggered by SS12u4 erikj parents: 31159 diff changeset	887	DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \
97230ec16697 8134408: Disable warnings for jdk libraries triggered by SS12u4 erikj parents: 31159 diff changeset	888	E_STATEMENT_NOT_REACHED, \
30502 50552a5900a2 8080317: Disable warning treated as error for signed/unsigned comparison in building splashscreen prr parents: 30439 diff changeset	889	DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
49239 c35ec365e329 8199483: Clean up some non-standard LDFLAGS usage ihse parents: 49234 diff changeset	890	LDFLAGS := $(LDFLAGS_JDKLIB) \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	891	$(call SET_SHARED_LIBRARY_ORIGIN), \
49239 c35ec365e329 8199483: Clean up some non-standard LDFLAGS usage ihse parents: 49234 diff changeset	892	LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
c35ec365e329 8199483: Clean up some non-standard LDFLAGS usage ihse parents: 49234 diff changeset	893	LDFLAGS_windows := -delayload:user32.dll, \
48751 54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	894	LIBS := $(JDKLIB_LIBS) $(LIBSPLASHSCREEN_LIBS) $(LIBZ_LIBS) \
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9 erikj parents: 48731 diff changeset	895	$(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(PNG_LIBS), \
33518 3f1644328d06 8141290: AIX: fix build after '8140661: Rename LDFLAGS_SUFFIX to LIBS' simonis parents: 33406 diff changeset	896	LIBS_aix := -liconv, \
35276 50b3cdcef339 8145596: Enable debug symbols for all libraries ihse parents: 35241 diff changeset	897	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	898
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	899	TARGETS += $(BUILD_LIBSPLASHSCREEN)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	900
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	901	ifeq ($(OPENJDK_TARGET_OS), macosx)
49261 d5c43e9f08fb 8199745: JDK-8199668 introduced a build race on macosx erikj parents: 49244 diff changeset	902	$(BUILD_LIBSPLASHSCREEN): $(call FindLib, java.desktop, osxapp)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	903	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	904
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	905	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	906
26191 a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	907	################################################################################
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	908
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	909	ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	910
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	911	LIBAWT_LWAWT_DIRS := \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	912	$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	913	$(TOPDIR)/src/java.desktop/unix/native/common/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	914	$(TOPDIR)/src/java.desktop/share/native/common/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	915	$(TOPDIR)/src/java.desktop/share/native/common/java2d \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	916	#
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	917
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	918	LIBAWT_LWAWT_CFLAGS := \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	919	$(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	920	-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	921	-I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	922	-I$(TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	923	-I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	924	-I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	925	-I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	926	-I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	927	-I$(TOPDIR)/src/java.desktop/macosx/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	928	-I$(TOPDIR)/src/java.desktop/share/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	929	-I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	930	-I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	931	-I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	932	-I$(TOPDIR)/src/java.desktop/unix/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	933	-I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	934	-I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	935	-I$(TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	936	-I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	937	$(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	938	#
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	939
26741 bc80bcd0765a 8056213: Clean up unix/native/common/sun/awt prr parents: 26611 diff changeset	940	LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	941	LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	942
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	943	$(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	944	NAME := awt_lwawt, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	945	SRC := $(LIBAWT_LWAWT_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	946	INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	947	EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \
3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	948	EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	949	OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	950	CFLAGS := $(CFLAGS_JDKLIB) \
20901 70f69e624fc9 8026888: Licensee build failure due to wrong libs being called erikj parents: 20899 diff changeset	951	$(X_CFLAGS) \
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called erikj parents: 20899 diff changeset	952	$(X_LIBS) \
25859 3317bb8137f4 8054834: Modular Source Code chegar parents: 25563 diff changeset	953	$(LIBAWT_LWAWT_CFLAGS), \
32872 abca6234313d 8079965: Stop ignoring warnings for libawt_lwawt serb parents: 32408 diff changeset	954	DISABLED_WARNINGS_clang := incomplete-implementation enum-conversion \
29374 f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis ihse parents: 29006 diff changeset	955	deprecated-declarations objc-method-access bitwise-op-parentheses \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis ihse parents: 29006 diff changeset	956	incompatible-pointer-types parentheses-equality extra-tokens, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	957	LDFLAGS := $(LDFLAGS_JDKLIB) \
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	958	$(call SET_SHARED_LIBRARY_ORIGIN) \
27944 c6d5edd39016 8066752: Remove space after -L on linker lines erikj parents: 27799 diff changeset	959	-L$(INSTALL_LIBRARIES_HERE), \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	960	LIBS := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	961	-framework Accelerate \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	962	-framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	963	-framework AudioToolbox \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	964	-framework Carbon \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	965	-framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	966	-framework Security \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	967	-framework ExceptionHandling \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	968	-framework JavaNativeFoundation \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	969	-framework JavaRuntimeSupport \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	970	-framework OpenGL \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	971	-framework QuartzCore -ljava, \
35276 50b3cdcef339 8145596: Enable debug symbols for all libraries ihse parents: 35241 diff changeset	972	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	973
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	974	TARGETS += $(BUILD_LIBAWT_LWAWT)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	975
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	976	$(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	977
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	978	$(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	979
49261 d5c43e9f08fb 8199745: JDK-8199668 introduced a build race on macosx erikj parents: 49244 diff changeset	980	$(BUILD_LIBAWT_LWAWT): $(call FindLib, java.desktop, osxapp)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	981
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	982	$(BUILD_LIBAWT_LWAWT): $(call FindLib, java.base, java)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	983
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	984	endif
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	985
26191 a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	986	################################################################################
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	987
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	988	ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	989
49244 995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable ihse parents: 49241 diff changeset	990	$(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \
49070 d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE ihse parents: 48766 diff changeset	991	NAME := osxui, \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	992	SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxui, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	993	OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	994	CFLAGS := $(CFLAGS_JDKLIB) \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	995	-I$(TOPDIR)/src/java.desktop/macosx/native/libosxui \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	996	-I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	997	-I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	998	-I$(TOPDIR)/src/java.base/share/native/libjava \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47216 diff changeset	999	-I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	1000	-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
49523 69c6eb97297f 8196724: Change macosx deployment target to 10.9 erikj parents: 49513 diff changeset	1001	DISABLED_WARNINGS_clang := deprecated-declarations, \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1002	LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1003	$(call SET_SHARED_LIBRARY_ORIGIN) \
34695 7a6cc9982d22 8142907: Integration of minor fixes from the build-infra project ihse parents: 34432 diff changeset	1004	-Wl$(COMMA)-rpath$(COMMA)@loader_path \
27944 c6d5edd39016 8066752: Remove space after -L on linker lines erikj parents: 27799 diff changeset	1005	-L$(INSTALL_LIBRARIES_HERE), \
33406 4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS ihse parents: 33305 diff changeset	1006	LIBS := -lawt -losxapp -lawt_lwawt \
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1007	-framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1008	-framework Carbon \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1009	-framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1010	-framework JavaNativeFoundation \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1011	-framework JavaRuntimeSupport \
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1012	-ljava -ljvm, \
35276 50b3cdcef339 8145596: Enable debug symbols for all libraries ihse parents: 35241 diff changeset	1013	))
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1014
27565 729f9700483a 8049367: Modular Run-Time Images chegar parents: 26751 diff changeset	1015	TARGETS += $(BUILD_LIBOSXUI)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1016
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1017	$(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1018
49261 d5c43e9f08fb 8199745: JDK-8199668 introduced a build race on macosx erikj parents: 49244 diff changeset	1019	$(BUILD_LIBOSXUI): $(call FindLib, java.desktop, osxapp)
20547 453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1020
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1021	$(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1022
453837141fac 8001931: The new build system whitespace cleanup ihse parents: 20203 diff changeset	1023	endif
26191 a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	1024
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	1025	################################################################################
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	1026
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure erikj parents: 25993 diff changeset	1027	# Hook to include the corresponding custom file, if present.
47314 743814386712 8188814: Simplify IncludeCustomExtension ihse parents: 47217 diff changeset	1028	$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries.gmk))

author	erikj
	Tue, 10 Apr 2018 22:37:01 +0200
changeset 49566	7c224ec572d0
parent 49539	af97dd04d913
child 49681	4beba2c2a329
child 49693	fa23ea24dade
child 56421	92bea2b7732a
permissions	-rw-r--r--