jdk/make/lib/Awt2dLibraries.gmk
author omajid
Fri, 06 Nov 2015 17:27:27 -0500
changeset 33647 2665054d3864
parent 33518 3f1644328d06
child 34414 e496a8d8fc8a
permissions -rw-r--r--
8139932: Typo in makefile changes for 8043805 [Allow using a system-installed libjpeg] Reviewed-by: erikj, omajid, prr Contributed-by: Matthias Klose <doko@ubuntu.com>
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
     2
# Copyright (c) 2011, 2015, 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
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
    26
WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    27
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
    28
################################################################################
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    30
BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
    31
    $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    32
BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    33
    $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
    34
    -I$(JDK_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
    35
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    36
BUILD_LIBMLIB_LDLIBS :=
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
    37
BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    38
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    39
BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    40
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    41
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    42
  BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    43
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    44
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    45
ifneq ($(OPENJDK_TARGET_OS), windows)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    46
  BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    47
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    48
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    49
$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    50
    LIBRARY := mlib_image, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    51
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
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), \
31157
25a62bb54efa 8081295: Build failed with GCC 5.1.1
ysuenaga
parents: 30502
diff changeset
    57
    DISABLED_WARNINGS_gcc := parentheses array-bounds, \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
    58
    DISABLED_WARNINGS_clang := parentheses, \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
    59
    DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    60
    MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    61
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    62
        $(call SET_SHARED_LIBRARY_ORIGIN), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
    63
    LIBS := $(BUILD_LIBMLIB_LDLIBS) \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
    64
        $(JDKLIB_LIBS), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
    65
    LIBS_solaris := -lc, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    66
    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    67
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    68
        -D "JDK_FNAME=mlib_image.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    69
        -D "JDK_INTERNAL_NAME=mlib_image" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    70
        -D "JDK_FTYPE=0x2L", \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
    71
    OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    72
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    73
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
    74
$(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    75
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
    76
TARGETS += $(BUILD_LIBMLIB_IMAGE)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    77
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
    78
################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    79
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    80
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    81
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    82
  LIBMLIB_IMAGE_V_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    83
      $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
    84
      $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
    85
      $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    86
      #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    87
  LIBMLIB_IMAGE_V_CFLAGS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    88
      $(addprefix -I, $(LIBMLIB_IMAGE_V_SRC)) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    89
      #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    90
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    91
  BUILD_LIBMLIB_IMAGE_V_EXFILES := \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    92
      awt_ImagingLib.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    93
      mlib_c_ImageAffine_BC.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    94
      mlib_c_ImageAffine_BC_S16.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    95
      mlib_c_ImageAffine_BC_U16.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    96
      mlib_c_ImageAffine_BL.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    97
      mlib_c_ImageAffine_BL_S16.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    98
      mlib_c_ImageAffine_BL_U16.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    99
      mlib_c_ImageAffineIndex_BC.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   100
      mlib_c_ImageAffineIndex_BL.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   101
      mlib_c_ImageAffine_NN.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   102
      mlib_c_ImageBlendTable.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   103
      mlib_c_ImageConvClearEdge.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   104
      mlib_c_ImageConvCopyEdge.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   105
      mlib_c_ImageConv_f.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   106
      mlib_c_ImageConvVersion.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   107
      mlib_c_ImageCopy.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   108
      mlib_c_ImageLookUp.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   109
      mlib_c_ImageLookUp_f.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   110
      mlib_v_ImageChannelExtract.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   111
      mlib_v_ImageChannelExtract_f.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   112
      mlib_v_ImageChannelInsert_34.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   113
      mlib_v_ImageChannelInsert.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   114
      mlib_v_ImageConvIndex3_8_16nw.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   115
      mlib_v_ImageConvIndex3_8_8nw.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   116
      mlib_v_ImageCopy.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   117
      mlib_v_ImageCopy_blk.s \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   118
      #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   119
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   120
  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
   121
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   122
  $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   123
      LIBRARY := mlib_image_v, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   124
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   125
      SRC := $(LIBMLIB_IMAGE_V_SRC), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   126
      EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   127
      OPTIMIZATION := HIGHEST, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   128
      CFLAGS := -xarch=sparcvis \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   129
          $(LIBMLIB_IMAGE_V_CFLAGS) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   130
          $(CFLAGS_JDKLIB), \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   131
      DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   132
      MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   133
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   134
          $(call SET_SHARED_LIBRARY_ORIGIN), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   135
      LIBS := -ljava -ljvm -lc $(BUILD_LIBMLIB_LDLIBS), \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   136
      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image_v, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   137
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   138
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   139
  $(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   140
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   141
  TARGETS += $(BUILD_LIBMLIB_IMAGE_V)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   142
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   143
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   144
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   145
################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   146
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   147
LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   148
    $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   149
    $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   150
    $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   151
    #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   152
26225
3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 26191
diff changeset
   153
ifeq ($(OPENJDK_TARGET_OS), aix)
3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 26191
diff changeset
   154
  LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 26191
diff changeset
   155
endif
3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 26191
diff changeset
   156
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   157
ifeq ($(OPENJDK_TARGET_OS), windows)
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   158
  LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   159
else
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   160
  LIBAWT_EXFILES := java2d/ShaderList.c
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   161
endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   162
26225
3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 26191
diff changeset
   163
ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   164
  LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   165
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   166
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   167
ifeq ($(OPENJDK_TARGET_OS), macosx)
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   168
  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
   169
endif
7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents: 22595
diff changeset
   170
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   171
LIBAWT_CFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   172
    $(addprefix -I, $(shell find $(LIBAWT_DIRS) -type d)) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   173
    $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   174
    $(addprefix -I, $(BUILD_LIBMLIB_IMAGE_SRC)) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   175
    #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   176
26225
3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 26191
diff changeset
   177
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
   178
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   179
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   180
  LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   181
  LIBAWT_CFLAGS += -xarch=sparcvis
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   182
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   183
  LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   184
  LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   185
  LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   186
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   187
  ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   188
    LIBAWT_ASFLAGS = -P -xarch=v9a
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   189
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   190
    LIBAWT_ASFLAGS = -P -xarch=v8plusa
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   191
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   192
else
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   193
  LIBAWT_EXCLUDES += \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   194
      $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/awt/medialib \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   195
      $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d/loops \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   196
      $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   197
      #
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   198
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   199
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   200
ifneq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   201
  LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   202
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   203
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   204
ifeq ($(OPENJDK_TARGET_OS), windows)
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   205
  LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   206
      $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   207
  # Why does libawt need java.base headers?
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   208
  LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   209
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   210
      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   211
      -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   212
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   213
      -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   214
      #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   215
  LIBAWT_EXFILES += \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   216
      java2d/d3d/D3DShaderGen.c \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   217
      awt/image/cvutils/img_colors.c \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   218
      #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   219
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   220
  LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   221
  ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   222
    LIBAWT_CFLAGS += -DMLIB_OS64BIT
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   223
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   224
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   225
  ifdef OPENJDK
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   226
    LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons"
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   227
  else
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   228
    LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons"
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   229
  endif
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   230
  LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   231
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   232
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   233
LIBAWT_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt/mapfile-vers
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   234
ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   235
  LIBAWT_MAPFILE :=
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   236
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   237
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   238
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   239
    LIBRARY := awt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   240
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   241
    SRC := $(LIBAWT_DIRS), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   242
    EXCLUDES := $(LIBAWT_EXCLUDES), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   243
    EXCLUDE_FILES := $(LIBAWT_EXFILES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   244
    OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   245
    CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   246
    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
   247
        format-nonliteral parentheses, \
30434
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   248
    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
   249
    DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
30434
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   250
    DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   251
    WARNINGS_AS_ERRORS_gcc := false, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   252
    ASFLAGS := $(LIBAWT_ASFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   253
    MAPFILE := $(LIBAWT_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   254
    LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   255
    LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   256
    LDFLAGS_windows := -delayload:user32.dll -delayload:gdi32.dll \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   257
        -delayload:shell32.dll -delayload:winmm.dll \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   258
        -delayload:winspool.drv -delayload:imm32.dll \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   259
        -delayload:ole32.dll -delayload:comdlg32.dll \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   260
        -delayload:comctl32.dll -delayload:shlwapi.dll, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   261
    LIBS_unix := -ljvm -ljava $(LIBM), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   262
    LIBS_linux :=  $(LIBDL), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   263
    LIBS_solaris := $(LIBDL) -lc, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   264
    LIBS_aix := $(LIBDL),\
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   265
    LIBS_macosx := -lmlib_image \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   266
        -framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   267
        -framework OpenGL \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   268
        -framework JavaNativeFoundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   269
        -framework JavaRuntimeSupport \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   270
        -framework ApplicationServices \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   271
        -framework AudioToolbox, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   272
    LIBS_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   273
        imm32.lib ole32.lib uuid.lib shell32.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   274
        comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   275
        delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   276
    VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   277
    RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   278
        -D "JDK_FNAME=awt.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   279
        -D "JDK_INTERNAL_NAME=awt" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   280
        -D "JDK_FTYPE=0x2L", \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   281
    OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   282
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   283
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   284
$(BUILD_LIBAWT): $(call FindLib, java.base, java)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   285
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   286
ifeq ($(OPENJDK_TARGET_OS), macosx)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   287
  $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   288
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   289
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   290
TARGETS += $(BUILD_LIBAWT)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   291
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   292
################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   293
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   294
ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   295
  ifndef BUILD_HEADLESS_ONLY
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   296
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   297
    LIBAWT_XAWT_DIRS := \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   298
        $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   299
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   300
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   301
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   302
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   303
        $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   304
        $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/x11 \
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   305
        $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   306
        #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   307
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   308
    LIBAWT_XAWT_EXCLUDES := medialib
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   309
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   310
    LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   311
        -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   312
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   313
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   314
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   315
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   316
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   317
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   318
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   319
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   320
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   321
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsunwjdga \
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   322
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   323
        $(LIBJAVA_HEADER_FLAGS)
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   324
        #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   325
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   326
    LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   327
        -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   328
        $(CUPS_CFLAGS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   329
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   330
    ifeq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   331
      LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   332
    endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   333
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   334
    ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   335
      ifeq ($(DISABLE_XRENDER), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   336
        LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   337
      endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   338
    endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   339
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   340
    LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   341
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   342
    ifeq ($(OPENJDK_TARGET_OS), linux)
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   343
      LIBAWT_XAWT_LIBS += -lpthread
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   344
    endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   345
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   346
    $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   347
        LIBRARY := awt_xawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   348
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   349
        SRC := $(LIBAWT_XAWT_DIRS), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   350
        EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   351
        OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   352
        CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   353
            $(X_CFLAGS), \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   354
        DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   355
            deprecated-declarations unused-result maybe-uninitialized format \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   356
            format-security int-to-pointer-cast parentheses, \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   357
        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
   358
            E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
30434
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   359
        WARNINGS_AS_ERRORS_gcc := false, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   360
        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   361
        LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   362
            $(call SET_SHARED_LIBRARY_ORIGIN) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   363
            $(call SET_SHARED_LIBRARY_ORIGIN,/..) \
27944
c6d5edd39016 8066752: Remove space after -L on linker lines
erikj
parents: 27799
diff changeset
   364
            -L$(INSTALL_LIBRARIES_HERE), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   365
        LIBS :=  $(X_LIBS) $(LIBAWT_XAWT_LIBS), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   366
        VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   367
        RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   368
            -D "JDK_FNAME=xawt.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   369
            -D "JDK_INTERNAL_NAME=xawt" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   370
            -D "JDK_FTYPE=0x2L", \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   371
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_xawt, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   372
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   373
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   374
    $(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   375
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   376
    $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   377
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   378
    TARGETS += $(BUILD_LIBAWT_XAWT)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   379
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   380
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   381
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   382
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   383
################################################################################
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   384
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   385
LIBLCMS_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/liblcms
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   386
LIBLCMS_CPPFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   387
    -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   388
    -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   389
    $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   390
    #
33285
5b20fc9010b7 8086092: More palette improvements
prr
parents: 32872
diff changeset
   391
# The fast floor code loses precision.
5b20fc9010b7 8086092: More palette improvements
prr
parents: 32872
diff changeset
   392
LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   393
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   394
ifeq ($(USE_EXTERNAL_LCMS), true)
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   395
  # If we're using an external library, we'll just need the wrapper part.
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   396
  # By including it explicitely, all other files will be excluded.
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   397
  BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   398
else
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   399
  BUILD_LIBLCMS_INCLUDE_FILES :=
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   400
  # 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
   401
  # include path explicitly. Otherwise the system headers will be used.
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   402
  LIBLCMS_CPPFLAGS += $(addprefix -I, $(LIBLCMS_SRC))
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   403
endif
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   404
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   405
$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   406
    LIBRARY := lcms, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   407
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   408
    SRC := $(LIBLCMS_SRC), \
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   409
    INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   410
    OPTIMIZATION := HIGHEST, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   411
    CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
30434
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   412
        $(LIBLCMS_CPPFLAGS) \
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   413
        $(LCMS_CFLAGS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   414
    CFLAGS_solaris := -xc99=no_lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   415
    CFLAGS_windows := -DCMS_IS_WINDOWS_, \
30434
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   416
    DISABLED_WARNINGS_gcc := format-nonliteral type-limits, \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   417
    DISABLED_WARNINGS_clang := tautological-compare, \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   418
    DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   419
    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   420
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   421
        $(call SET_SHARED_LIBRARY_ORIGIN), \
27944
c6d5edd39016 8066752: Remove space after -L on linker lines
erikj
parents: 27799
diff changeset
   422
    LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   423
    LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   424
    LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   425
    LIBS_linux := $(LIBM), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   426
    LIBS_macosx := $(LIBM), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   427
    LIBS_solaris := -lc, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   428
    LIBS_aix := $(LIBM),\
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   429
    LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   430
    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   431
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   432
        -D "JDK_FNAME=lcms.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   433
        -D "JDK_INTERNAL_NAME=lcms" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   434
        -D "JDK_FTYPE=0x2L", \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   435
    OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/liblcms, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   436
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   437
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   438
TARGETS += $(BUILD_LIBLCMS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   439
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   440
$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   441
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   442
################################################################################
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   443
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   444
ifdef OPENJDK
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   445
  BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   446
else
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   447
  BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   448
  LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libjavajpeg
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   449
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   450
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   451
LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   452
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   453
BUILD_LIBJAVAJPEG_REORDER :=
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   454
ifeq ($(OPENJDK_TARGET_OS), solaris)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   455
  ifneq ($(OPENJDK_TARGET_CPU), x86_64)
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   456
    BUILD_LIBJAVAJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   457
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   458
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   459
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   460
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   461
# Suppress gcc warnings like "variable might be clobbered by 'longjmp'
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   462
# or 'vfork'": this warning indicates that some variable is placed to
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   463
# 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
   464
# 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
   465
# volatile to prevent the optimization. However, this approach does not
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   466
# 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
   467
#ifndef CROSS_COMPILE_ARCH
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   468
#  CC_43_OR_NEWER := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   469
#      $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   470
#          \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   471
#  ifeq ($(CC_43_OR_NEWER), 1)
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   472
#    BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   473
#  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   474
#endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   475
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   476
ifeq ($(USE_EXTERNAL_LIBJPEG), true)
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   477
  LIBJPEG_LIBS := -ljpeg
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   478
  BUILD_LIBJAVAJPEG_INCLUDE_FILES := \
33647
2665054d3864 8139932: Typo in makefile changes for 8043805 [Allow using a system-installed libjpeg]
omajid
parents: 33518
diff changeset
   479
      imageioJPEG.c \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   480
      jpegdecoder.c
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   481
  BUILD_LIBJAVAJPEG_HEADERS :=
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   482
else
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   483
  LIBJPEG_LIBS :=
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   484
  BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   485
  BUILD_LIBJAVAJPEG_HEADERS := $(addprefix -I, $(LIBJAVAJPEG_SRC))
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   486
endif
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   487
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   488
$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   489
    LIBRARY := javajpeg, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   490
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   491
    SRC := $(LIBJAVAJPEG_SRC), \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   492
    INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   493
    OPTIMIZATION := HIGHEST, \
31159
6f5c7d192b2d 8081447: System JPEG builds include in-tree jpeglib.h, resulting in build failure
andrew
parents: 31157
diff changeset
   494
    CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   495
        $(LIBJAVA_HEADER_FLAGS) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   496
        -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
31157
25a62bb54efa 8081295: Build failed with GCC 5.1.1
ysuenaga
parents: 30502
diff changeset
   497
    DISABLED_WARNINGS_gcc := clobbered parentheses array-bounds, \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   498
    DISABLED_WARNINGS_clang := logical-op-parentheses, \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   499
    DISABLED_WARNINGS_microsoft := 4267, \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   500
    MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
33305
ed708a0e3482 8140223: fix the build with a toolchain with a linker defaulting to ld --as-needed
erikj
parents: 33285
diff changeset
   501
    LDFLAGS := $(LDFLAGS_JDKLIB) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   502
        $(call SET_SHARED_LIBRARY_ORIGIN), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   503
    LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   504
    LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   505
    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   506
    RC_FLAGS := $(RC_FLAGS) \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   507
        -D "JDK_FNAME=javajpeg.dll" \
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   508
        -D "JDK_INTERNAL_NAME=javajpeg" \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   509
        -D "JDK_FTYPE=0x2L", \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   510
    REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   511
    OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjavajpeg, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   512
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   513
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   514
$(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   515
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   516
TARGETS += $(BUILD_LIBJAVAJPEG)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   517
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   518
################################################################################
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   519
29006
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   520
ifeq ($(BUILD_HEADLESS), true)
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   521
  # Mac and Windows only use the native AWT lib, do not build libawt_headless
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   522
  ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   523
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   524
    LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   525
        $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   526
        $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   527
        $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/x11 \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   528
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   529
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   530
        #
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   531
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   532
    LIBAWT_HEADLESS_EXCLUDES := medialib
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   533
    LIBAWT_HEADLESS_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   534
        $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   535
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   536
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   537
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   538
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   539
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   540
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   541
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   542
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   543
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   544
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsunwjdga/ \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   545
        $(LIBJAVA_HEADER_FLAGS) \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   546
        #
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   547
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   548
    LIBAWT_HEADLESS_REORDER :=
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   549
    ifeq ($(OPENJDK_TARGET_OS), solaris)
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   550
      ifneq ($(OPENJDK_TARGET_CPU), x86_64)
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   551
        LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   552
      endif
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   553
    endif
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   554
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   555
    $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   556
        LIBRARY := awt_headless, \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   557
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   558
        SRC := $(LIBAWT_HEADLESS_DIRS), \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   559
        EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   560
        OPTIMIZATION := LOW, \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   561
        CFLAGS := $(CFLAGS_JDKLIB) \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   562
            -DHEADLESS=true \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   563
            -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   564
            $(CUPS_CFLAGS) \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   565
            $(X_CFLAGS) \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   566
            $(LIBAWT_HEADLESS_CFLAGS), \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   567
        DISABLED_WARNINGS_gcc := maybe-uninitialized int-to-pointer-cast, \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   568
        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
   569
            E_EMPTY_TRANSLATION_UNIT, \
29006
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   570
        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   571
        LDFLAGS := $(LDFLAGS_JDKLIB) \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   572
            $(call SET_SHARED_LIBRARY_ORIGIN), \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   573
        LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   574
        LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   575
        LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   576
        REORDER := $(LIBAWT_HEADLESS_REORDER), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   577
        LIBS_unix := -lawt -ljvm -ljava, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   578
        LIBS_linux := -lm $(LIBDL), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   579
        LIBS_solaris := -lm $(LIBDL) $(LIBCXX) -lc, \
29006
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   580
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_headless, \
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   581
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   582
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   583
    $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   584
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   585
    TARGETS += $(BUILD_LIBAWT_HEADLESS)
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   586
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   587
  endif
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   588
endif
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   589
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   590
################################################################################
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   591
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   592
LIBFONTMANAGER_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   593
    $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   594
LIBFONTMANAGER_CFLAGS := \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   595
    $(addprefix -I, $(shell $(FIND) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   596
      $(LIBFONTMANAGER_SRC) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   597
      $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   598
      $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   599
      $(JDK_TOPDIR)/src/java.desktop/share/native/common \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   600
      $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common -type d)) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   601
    -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   602
    $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   603
    #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   604
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   605
ifndef OPENJDK
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   606
  LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   607
  BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   608
  LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   609
else
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   610
  LIBFONTMANAGER_CFLAGS += $(FREETYPE_CFLAGS)
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   611
  BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers.openjdk
20899
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20896
diff changeset
   612
  BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   613
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   614
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   615
LIBFONTMANAGER_OPTIMIZATION := HIGH
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   616
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   617
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   618
  LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   619
      X11TextRenderer.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   620
  LIBFONTMANAGER_OPTIMIZATION := HIGHEST
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   621
  LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   622
else ifeq ($(OPENJDK_TARGET_OS), macosx)
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   623
  LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   624
      X11TextRenderer.c \
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   625
      fontpath.c \
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   626
      lcdglyph.c
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   627
else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   628
  LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   629
      lcdglyph.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   630
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   631
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   632
LIBFONTMANAGER_CFLAGS += $(FONT_HEADERS) $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   633
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   634
# Turn off aliasing with GCC for ExtensionSubtables.cpp
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   635
ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   636
  BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   637
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   638
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   639
$(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   640
    LIBRARY := fontmanager, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   641
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   642
    SRC := $(LIBFONTMANAGER_SRC), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   643
    EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   644
        AccelGlyphCache.c, \
29931
64e274ed6567 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29734
diff changeset
   645
    TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   646
    CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   647
    CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   648
    OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   649
    CFLAGS_windows = -DCC_NOEX, \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   650
    DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast reorder \
30434
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   651
        delete-non-virtual-dtor type-limits, \
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   652
    DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   653
        tautological-constant-out-of-range-compare int-to-pointer-cast, \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   654
    DISABLED_WARNINGS_solstudio := truncwarn, \
30439
8f2f69320a3a 8080013: OpenJDK windows build fails due to warning in libfontmanager
ihse
parents: 30434
diff changeset
   655
    DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146, \
30434
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   656
    WARNINGS_AS_ERRORS_gcc := false, \
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   657
    WARNINGS_AS_ERRORS_solstudio := false, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   658
    MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   659
    LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   660
        $(call SET_SHARED_LIBRARY_ORIGIN), \
27944
c6d5edd39016 8066752: Remove space after -L on linker lines
erikj
parents: 27799
diff changeset
   661
    LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   662
    LDFLAGS_macosx := -undefined dynamic_lookup, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   663
    LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   664
    LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   665
    LIBS_linux := -lc, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   666
    LIBS_solaris := -lawt_headless -lc, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   667
    LIBS_aix := -lawt_headless,\
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   668
    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
   669
        $(WIN_AWT_LIB), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   670
    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   671
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   672
        -D "JDK_FNAME=fontmanager.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   673
        -D "JDK_INTERNAL_NAME=fontmanager" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   674
        -D "JDK_FTYPE=0x2L", \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   675
    OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfontmanager, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   676
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   677
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   678
$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   679
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   680
ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
29002
613ae4804312 8071710: [solaris] libfontmanager should be linked against headless awt library
prr
parents: 28537
diff changeset
   681
  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   682
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   683
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   684
TARGETS += $(BUILD_LIBFONTMANAGER)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   685
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   686
################################################################################
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   687
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   688
ifeq ($(OPENJDK_TARGET_OS), windows)
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   689
  LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   690
  LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   691
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   692
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   693
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   694
      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   695
      -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   696
      -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   697
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   698
      $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   699
      #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   700
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   701
  ifeq ($(OPENJDK_TARGET_CPU), x86)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   702
    KERNEL32_LIB := kernel32.lib
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   703
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   704
  $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   705
      LIBRARY := jawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   706
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   707
      SRC := $(LIBJAWT_SRC), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   708
      INCLUDE_FILES := $(LIBJAWT_INCLUDE_FILES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   709
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   710
      CFLAGS := $(CXXFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   711
          -EHsc -DUNICODE -D_UNICODE \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   712
          $(LIBJAWT_CFLAGS), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   713
      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   714
      LIBS := $(JDKLIB_LIBS) $(KERNEL32_LIB) advapi32.lib $(WIN_AWT_LIB), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   715
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   716
      RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   717
          -D "JDK_FNAME=jawt.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   718
          -D "JDK_INTERNAL_NAME=jawt" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   719
          -D "JDK_FTYPE=0x2L", \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   720
      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   721
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   722
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   723
  $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   724
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   725
  $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   726
	$(ECHO) Copying $(@F)
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   727
	$(CP) $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   728
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   729
  TARGETS += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   730
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   731
else # OPENJDK_TARGET_OS not windows
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   732
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   733
  ifeq ($(OPENJDK_TARGET_OS), macosx)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   734
    LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjawt
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   735
  else
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   736
    LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   737
  endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   738
  LIBJAWT_CFLAGS := \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   739
      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   740
      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   741
      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   742
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   743
      $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   744
      #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   745
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   746
  ifeq ($(OPENJDK_TARGET_OS), macosx)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   747
    JAWT_LIBS := -lawt_lwawt
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   748
  else
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   749
    JAWT_LIBS :=
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   750
    ifneq ($(OPENJDK_TARGET_OS), solaris)
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   751
      JAWT_LIBS += -lawt
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   752
    endif
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   753
    ifndef BUILD_HEADLESS_ONLY
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   754
      JAWT_LIBS += -lawt_xawt
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   755
    else
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   756
      JAWT_LIBS += -lawt_headless
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   757
      HEADLESS_CFLAG += -DHEADLESS
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   758
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   759
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   760
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   761
  $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   762
      LIBRARY := jawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   763
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   764
      SRC := $(LIBJAWT_SRC), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   765
      INCLUDE_FILES := $(JAWT_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   766
      OPTIMIZATION := LOW, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   767
      CFLAGS := $(CFLAGS_JDKLIB) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   768
          $(LIBJAWT_CFLAGS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   769
      CFLAGS_linux := $(HEADLESS_CFLAG), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   770
      CFLAGS_macosx := $(LIBJAWT_CFLAGS_macosx), \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   771
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   772
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   773
          $(call SET_SHARED_LIBRARY_ORIGIN), \
27944
c6d5edd39016 8066752: Remove space after -L on linker lines
erikj
parents: 27799
diff changeset
   774
      LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   775
      LDFLAGS_macosx := -Xlinker -rpath -Xlinker @loader_path, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   776
      LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   777
      LIBS_solaris := $(X_LIBS) -lXrender, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   778
      LIBS_macosx := -framework Cocoa, \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   779
      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   780
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   781
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   782
  ifndef BUILD_HEADLESS_ONLY
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   783
    $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   784
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   785
    $(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
   786
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   787
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   788
  ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   789
    $(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
   790
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   791
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   792
endif # OPENJDK_TARGET_OS
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   793
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   794
TARGETS += $(BUILD_LIBJAWT)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   795
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   796
################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   797
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   798
ifndef BUILD_HEADLESS_ONLY
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   799
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   800
  LIBSPLASHSCREEN_DIRS := \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   801
      $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   802
      $(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   803
      #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   804
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   805
  ifeq ($(USE_EXTERNAL_LIBGIF), true)
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   806
    GIFLIB_LIBS := -lgif
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   807
    LIBSPLASHSCREEN_EXCLUDES := giflib
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   808
  else
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   809
    LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/giflib
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   810
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   811
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   812
  ifeq ($(USE_EXTERNAL_LIBJPEG), true)
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   813
    LIBJPEG_LIBS := -ljpeg
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   814
  else
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   815
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   816
    LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   817
  endif
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   818
23305
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
   819
  ifeq ($(USE_EXTERNAL_LIBPNG), false)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   820
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/libpng
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   821
  else
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   822
    LIBSPLASHSCREEN_EXCLUDES += libpng
23305
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
   823
  endif
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
   824
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   825
  ifneq ($(OPENJDK_TARGET_OS), macosx)
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
   826
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsplashscreen
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   827
  else
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   828
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   829
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   830
30325
1472b22475f2 8078245: AARCH64: JDK fails to build due to undefined symbol in libpng
enevill
parents: 29931
diff changeset
   831
  LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   832
      $(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   833
      $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   834
      #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   835
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   836
  ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   837
    LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   838
    LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   839
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   840
    BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   841
    BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   842
    BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   843
    BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   844
    BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   845
    BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   846
    BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   847
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   848
  else ifeq ($(OPENJDK_TARGET_OS), windows)
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   849
    LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   850
  else
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   851
    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   852
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   853
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   854
  LIBSPLASHSCREEN_LIBS :=
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   855
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   856
  ifneq ($(USE_EXTERNAL_LIBZ), true)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   857
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   858
    LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   859
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   860
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   861
  ifeq ($(OPENJDK_TARGET_OS), macosx)
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   862
    LIBSPLASHSCREEN_LDFLAGS := -L$(INSTALL_LIBRARIES_HERE)
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   863
    LIBSPLASHSCREEN_LIBS += \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   864
        $(LIBM) -lpthread -liconv -losxapp \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   865
        -framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   866
        -framework Foundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   867
        -framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   868
        -framework JavaNativeFoundation
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   869
  else ifeq ($(OPENJDK_TARGET_OS), windows)
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   870
    LIBSPLASHSCREEN_LDFLAGS := -delayload:user32.dll
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   871
    LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib
23592
35b16ae6b4f4 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23310
diff changeset
   872
  else
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   873
    LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
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
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   876
  $(eval $(call SetupNativeCompilation,BUILD_LIBSPLASHSCREEN, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   877
      LIBRARY := splashscreen, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   878
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   879
      SRC := $(LIBSPLASHSCREEN_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   880
      EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   881
      EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   882
      OPTIMIZATION := LOW, \
23305
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
   883
      CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   884
                $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS), \
30502
50552a5900a2 8080317: Disable warning treated as error for signed/unsigned comparison in building splashscreen
prr
parents: 30439
diff changeset
   885
      DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result maybe-uninitialized, \
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, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   890
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   891
      LDFLAGS := $(LIBSPLASHSCREEN_LDFLAGS) $(LDFLAGS_JDKLIB) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   892
          $(call SET_SHARED_LIBRARY_ORIGIN), \
33518
3f1644328d06 8141290: AIX: fix build after '8140661: Rename LDFLAGS_SUFFIX to LIBS'
simonis
parents: 33406
diff changeset
   893
      LIBS := $(JDKLIB_LIBS) $(LIBSPLASHSCREEN_LIBS) $(LIBZ) \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   894
                        $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(PNG_LIBS), \
33518
3f1644328d06 8141290: AIX: fix build after '8140661: Rename LDFLAGS_SUFFIX to LIBS'
simonis
parents: 33406
diff changeset
   895
      LIBS_aix := -liconv, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   896
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   897
      RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   898
          -D "JDK_FNAME=splashscreen.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   899
          -D "JDK_INTERNAL_NAME=splashscreen" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   900
          -D "JDK_FTYPE=0x2L", \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   901
      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsplashscreen, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   902
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   903
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   904
  TARGETS += $(BUILD_LIBSPLASHSCREEN)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   905
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   906
  ifeq ($(OPENJDK_TARGET_OS), macosx)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   907
    $(BUILD_LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   908
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   909
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   910
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   911
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   912
################################################################################
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   913
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   914
ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   915
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   916
  LIBAWT_LWAWT_DIRS := \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   917
      $(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   918
      $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   919
      $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   920
      $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   921
      #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   922
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   923
  LIBAWT_LWAWT_CFLAGS := \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   924
      $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   925
      -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   926
      -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   927
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   928
      -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   929
      -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   930
      -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   931
      -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   932
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   933
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   934
      -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   935
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   936
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   937
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   938
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   939
      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   940
      -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   941
      $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   942
      #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   943
26741
bc80bcd0765a 8056213: Clean up unix/native/common/sun/awt
prr
parents: 26611
diff changeset
   944
  LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   945
  LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   946
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   947
  $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   948
      LIBRARY := awt_lwawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   949
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   950
      SRC := $(LIBAWT_LWAWT_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   951
      INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   952
      EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   953
      EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   954
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   955
      CFLAGS := $(CFLAGS_JDKLIB) \
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   956
          $(X_CFLAGS) \
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   957
          $(X_LIBS) \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   958
          $(LIBAWT_LWAWT_CFLAGS), \
32872
abca6234313d 8079965: Stop ignoring warnings for libawt_lwawt
serb
parents: 32408
diff changeset
   959
      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
   960
          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
   961
          incompatible-pointer-types parentheses-equality extra-tokens, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   962
      LDFLAGS := $(LDFLAGS_JDKLIB) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   963
          $(call SET_SHARED_LIBRARY_ORIGIN) \
27944
c6d5edd39016 8066752: Remove space after -L on linker lines
erikj
parents: 27799
diff changeset
   964
          -L$(INSTALL_LIBRARIES_HERE), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   965
      LIBS := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   966
          -framework Accelerate \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   967
          -framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   968
          -framework AudioToolbox \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   969
          -framework Carbon \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   970
          -framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   971
          -framework Security \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   972
          -framework ExceptionHandling \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   973
          -framework JavaNativeFoundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   974
          -framework JavaRuntimeSupport \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   975
          -framework OpenGL \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   976
          -framework QuartzCore -ljava, \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   977
      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_lwawt, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   978
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   979
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   980
  TARGETS += $(BUILD_LIBAWT_LWAWT)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   981
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   982
  $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
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
  $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   985
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   986
  $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBOSXAPP)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   987
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   988
  $(BUILD_LIBAWT_LWAWT): $(call FindLib, java.base, java)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   989
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   990
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   991
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   992
################################################################################
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   993
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   994
ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   995
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   996
  $(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   997
      LIBRARY := osxui, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   998
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   999
      SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1000
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1001
      CFLAGS := $(CFLAGS_JDKLIB) \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
  1002
          -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
  1003
          -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
  1004
          -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
  1005
          -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
27736
8c9bd4be4a86 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 26751
diff changeset
  1006
          -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
  1007
          -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop,  \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1008
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1009
          $(call SET_SHARED_LIBRARY_ORIGIN) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
  1010
          -Xlinker -rpath -Xlinker @loader_path \
27944
c6d5edd39016 8066752: Remove space after -L on linker lines
erikj
parents: 27799
diff changeset
  1011
          -L$(INSTALL_LIBRARIES_HERE), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
  1012
      LIBS := -lawt -losxapp -lawt_lwawt \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1013
          -framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1014
          -framework Carbon \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1015
          -framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1016
          -framework JavaNativeFoundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1017
          -framework JavaRuntimeSupport \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1018
          -ljava -ljvm, \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
  1019
      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1020
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1021
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
  1022
  TARGETS += $(BUILD_LIBOSXUI)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1023
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1024
  $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1025
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1026
  $(BUILD_LIBOSXUI): $(BUILD_LIBOSXAPP)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1027
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1028
  $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1029
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
  1030
  #$(BUILD_LIBOSXUI): $(call FindLib, java.base, java)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1031
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1032
endif
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
  1033
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
  1034
################################################################################
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
  1035
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
  1036
# Hook to include the corresponding custom file, if present.
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
  1037
$(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries.gmk))