jdk/make/lib/Awt2dLibraries.gmk
author prr
Wed, 18 Jun 2014 13:14:15 -0700
changeset 25144 e2bf17cee34b
parent 25141 453d3b457f59
parent 25086 f5f41ed620d5
child 25563 248400a88627
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
22649
f70b08c1593c 8033532: Freetype include statement must come before X11 include
ihse
parents: 22607
diff changeset
     2
# Copyright (c) 2011, 2014, 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
22963
a28e6f0b511b 8034191: Move relevant parts of build system to new closed repo
ihse
parents: 22649
diff changeset
    26
# Hook to include the corresponding custom file, if present.
a28e6f0b511b 8034191: Move relevant parts of build system to new closed repo
ihse
parents: 22649
diff changeset
    27
$(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries.gmk))
a28e6f0b511b 8034191: Move relevant parts of build system to new closed repo
ihse
parents: 22649
diff changeset
    28
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
    29
WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    30
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    31
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    32
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    33
BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    34
BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    35
    -I$(BUILD_LIBMLIB_SRC) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    36
    -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/medialib
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    37
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    38
BUILD_LIBMLIB_LDLIBS :=
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
    39
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
    40
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    41
BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    42
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    43
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    44
  BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    45
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    46
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    47
ifneq ($(OPENJDK_TARGET_OS), windows)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    48
  BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    49
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    50
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    51
$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    52
    LIBRARY := mlib_image, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    53
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    54
    SRC := $(BUILD_LIBMLIB_SRC), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    55
    EXCLUDE_FILES := awt_ImagingLib.c mlib_c_ImageBlendTable.c, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    56
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    57
    OPTIMIZATION := HIGHEST, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    58
    CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    59
        $(BUILD_LIBMLIB_CFLAGS), \
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), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    63
    LDFLAGS_SUFFIX := $(BUILD_LIBMLIB_LDLIBS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    64
        $(LDFLAGS_JDKLIB_SUFFIX), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    65
    LDFLAGS_SUFFIX_solaris := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    66
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
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", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    71
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image, \
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
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    74
$(BUILD_LIBMLIB_IMAGE): $(BUILD_LIBJAVA)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    75
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    76
BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    77
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    78
##########################################################################################
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
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    82
  BUILD_LIBMLIB_IMAGE_V_FILES := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    83
      mlib_v_ImageLookUp.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    84
      mlib_ImageCreate.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    85
      mlib_ImageAffine.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    86
      mlib_ImageConvMxN.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    87
      mlib_ImageConvKernelConvert.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    88
      mlib_sys.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    89
      mlib_ImageLookUp_64.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    90
      mlib_ImageLookUp_Bit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    91
      mlib_ImageColorTrue2Index.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    92
      mlib_c_ImageThresh1_U8.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    93
      mlib_v_ImageLookUpS16S16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    94
      mlib_v_ImageLookUpS16S32Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    95
      mlib_v_ImageLookUpS16U16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    96
      mlib_v_ImageLookUpS16U8Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    97
      mlib_v_ImageLookUpS32S16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    98
      mlib_v_ImageLookUpS32S32Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    99
      mlib_v_ImageLookUpS32U16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   100
      mlib_v_ImageLookUpS32U8Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   101
      mlib_v_ImageLookUpSIS16S16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   102
      mlib_v_ImageLookUpSIS16S32Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   103
      mlib_v_ImageLookUpSIS16U16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   104
      mlib_v_ImageLookUpSIS16U8Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   105
      mlib_v_ImageLookUpSIS32S16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   106
      mlib_v_ImageLookUpSIS32S32Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   107
      mlib_v_ImageLookUpSIS32U16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   108
      mlib_v_ImageLookUpSIS32U8Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   109
      mlib_v_ImageLookUpSIU16S16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   110
      mlib_v_ImageLookUpSIU16S32Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   111
      mlib_v_ImageLookUpSIU16U16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   112
      mlib_v_ImageLookUpSIU16U8Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   113
      mlib_v_ImageLookUpSIU8S16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   114
      mlib_v_ImageLookUpSIU8S32Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   115
      mlib_v_ImageLookUpSIU8U16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   116
      mlib_v_ImageLookUpSIU8U8Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   117
      mlib_v_ImageLookUpU16S16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   118
      mlib_v_ImageLookUpU16S32Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   119
      mlib_v_ImageLookUpU16U16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   120
      mlib_v_ImageLookUpU16U8Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   121
      mlib_v_ImageLookUpU8S16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   122
      mlib_v_ImageLookUpU8S32Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   123
      mlib_v_ImageLookUpU8U16Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   124
      mlib_v_ImageLookUpU8U8Func.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   125
      mlib_v_ImageAffineIndex_BC.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   126
      mlib_v_ImageAffine_BC.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   127
      mlib_v_ImageAffine_BC_S16.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   128
      mlib_v_ImageAffine_BC_U16.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   129
      mlib_v_ImageAffine_BL.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   130
      mlib_v_ImageAffine_BL_S16.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   131
      mlib_v_ImageAffine_BL_U16.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   132
      mlib_v_ImageAffine_NN.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   133
      mlib_v_ImageFilters.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   134
      mlib_ImageAffineEdge.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   135
      mlib_ImageAffine_BC_D64.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   136
      mlib_ImageAffine_BC_F32.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   137
      mlib_ImageAffine_BC_S32.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   138
      mlib_ImageAffine_BL_D64.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   139
      mlib_ImageAffine_BL_F32.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   140
      mlib_ImageAffine_BL_S32.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   141
      mlib_ImageAffine_NN.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   142
      mlib_ImageAffine_NN_Bit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   143
      mlib_ImageFilters.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   144
      mlib_ImageScanPoly.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   145
      mlib_ImageConv_8nw.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   146
      mlib_ImageConv_8ext.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   147
      mlib_ImageConv_16nw.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   148
      mlib_ImageConv_16ext.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   149
      mlib_ImageConv_u16nw.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   150
      mlib_ImageConv_u16ext.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   151
      mlib_ImageConv_32nw.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   152
      mlib_ImageConv_F32nw.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   153
      mlib_ImageConvMxN_Fp.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   154
      mlib_ImageConvMxN_ext.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   155
      mlib_ImageConv_D64nw.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   156
      mlib_ImageClipping.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   157
      mlib_ImageConvCopyEdge_Bit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   158
      mlib_ImageConvClearEdge_Bit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   159
      mlib_ImageConv2x2_f.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   160
      mlib_ImageConvClearEdge_Fp.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   161
      mlib_v_ImageConvMxN_8.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   162
      mlib_v_ImageConvClearEdge.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   163
      mlib_v_ImageConvCopyEdge.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   164
      mlib_v_ImageConvMxN_8ext.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   165
      mlib_v_ImageConvVersion.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   166
      mlib_v_ImageConv_8nw.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   167
      mlib_ImageConvCopyEdge_Fp.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   168
      mlib_v_ImageChannelInsert_1.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   169
      mlib_v_ImageChannelExtract_43.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   170
      mlib_v_ImageChannelExtract_1.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   171
      mlib_ImageCopy_Bit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   172
      mlib_v_ImageCopy_f.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   173
      mlib_ImageUtils.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   174
      mlib_ImageDivTables.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   175
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   176
  BUILD_LIBMLIB_V_CFLAGS := $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   177
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   178
  $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   179
      LIBRARY := mlib_image_v, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   180
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   181
      SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   182
          $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   183
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   184
      INCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   185
      OPTIMIZATION := HIGHEST, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   186
      CFLAGS := -xarch=sparcvis \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   187
          $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   188
          $(BUILD_LIBMLIB_V_CFLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   189
          $(CFLAGS_JDKLIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   190
      MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   191
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   192
          $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   193
          $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   194
      LDFLAGS_SUFFIX_solaris := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   195
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image_v, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   196
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   197
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   198
  $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   199
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   200
  BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   201
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
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   204
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   205
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   206
LIBAWT_DIRS := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   207
    $(JDK_TOPDIR)/src/share/native/sun/awt \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   208
    $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   209
    $(JDK_TOPDIR)/src/share/native/sun/awt/image \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   210
    $(JDK_TOPDIR)/src/share/native/sun/awt/image/gif \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   211
    $(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   212
    $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   213
    $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   214
    $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   215
    $(JDK_TOPDIR)/src/share/native/sun/java2d \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   216
    $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   217
    $(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   218
    $(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   219
    $(JDK_TOPDIR)/src/share/native/sun/awt/image \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   220
    $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   221
    $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   222
    $(JDK_TOPDIR)/src/share/native/sun/font
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   223
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   224
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   225
  LIBAWT_DIRS += \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   226
      $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   227
      $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   228
      $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   229
else ifneq ($(OPENJDK_TARGET_OS), macosx)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   230
  LIBAWT_DIRS += \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   231
      $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   232
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   233
22597
7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents: 22595
diff changeset
   234
ifeq ($(OPENJDK_TARGET_OS), aix)
7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents: 22595
diff changeset
   235
  LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting
7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents: 22595
diff changeset
   236
endif
7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents: 22595
diff changeset
   237
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   238
LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   239
    $(X_CFLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   240
    $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   241
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   242
LIBAWT_FILES := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   243
    gifdecoder.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   244
    imageInitIDs.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   245
    img_globals.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   246
    SurfaceData.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   247
    Region.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   248
    BufImgSurfaceData.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   249
    Disposer.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   250
    Trace.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   251
    GraphicsPrimitiveMgr.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   252
    Blit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   253
    BlitBg.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   254
    ScaledBlit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   255
    FillRect.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   256
    FillSpans.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   257
    FillParallelogram.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   258
    DrawParallelogram.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   259
    DrawLine.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   260
    DrawRect.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   261
    DrawPolygons.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   262
    DrawPath.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   263
    FillPath.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   264
    ProcessPath.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   265
    MaskBlit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   266
    MaskFill.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   267
    TransformHelper.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   268
    AlphaMath.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   269
    AlphaMacros.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   270
    AnyByte.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   271
    ByteBinary1Bit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   272
    ByteBinary2Bit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   273
    ByteBinary4Bit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   274
    ByteIndexed.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   275
    ByteGray.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   276
    Index8Gray.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   277
    Index12Gray.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   278
    AnyShort.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   279
    Ushort555Rgb.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   280
    Ushort565Rgb.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   281
    Ushort4444Argb.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   282
    Ushort555Rgbx.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   283
    UshortGray.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   284
    UshortIndexed.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   285
    Any3Byte.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   286
    ThreeByteBgr.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   287
    AnyInt.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   288
    IntArgb.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   289
    IntArgbPre.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   290
    IntArgbBm.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   291
    IntRgb.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   292
    IntBgr.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   293
    IntRgbx.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   294
    Any4Byte.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   295
    FourByteAbgr.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   296
    FourByteAbgrPre.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   297
    BufferedMaskBlit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   298
    BufferedRenderPipe.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   299
    ShapeSpanIterator.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   300
    SpanClipRenderer.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   301
    awt_ImageRep.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   302
    awt_ImagingLib.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   303
    awt_Mlib.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   304
    awt_parseImage.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   305
    DataBufferNative.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   306
    dither.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   307
    debug_assert.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   308
    debug_mem.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   309
    debug_trace.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   310
    debug_util.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   311
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   312
ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris linux aix))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   313
  LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   314
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   315
22597
7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents: 22595
diff changeset
   316
ifeq ($(OPENJDK_TARGET_OS), aix)
7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents: 22595
diff changeset
   317
  LIBAWT_FILES += porting_aix.c
7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents: 22595
diff changeset
   318
endif
7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents: 22595
diff changeset
   319
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   320
ifeq ($(OPENJDK_TARGET_OS), macosx)
24566
a43e10e7f3a6 8003900: X11 dependencies should be removed from Mac OS X build.
ddehaven
parents: 24552
diff changeset
   321
  LIBAWT_FILES += awt_LoadLibrary.c
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   322
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   323
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   324
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   325
  LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   326
  LIBAWT_CFLAGS += -xarch=sparcvis
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   327
  LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   328
  LIBAWT_CFLAGS += \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   329
      -I$(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   330
      -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/medialib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   331
      -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   332
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   333
  LIBAWT_DIRS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   334
      $(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   335
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   336
  LIBAWT_FILES += \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   337
      vis_FuncArray.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   338
      java2d_Mlib.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   339
      mlib_ImageCreate.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   340
      mlib_ImageZoom_NN.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   341
      mlib_ImageCopy_Bit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   342
      mlib_sys.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   343
      mlib_v_ImageClear.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   344
      mlib_v_ImageClear_f.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   345
      mlib_v_ImageConstXor.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   346
      mlib_v_ImageCopy.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   347
      mlib_v_ImageCopy_f.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   348
      mlib_v_ImageXor.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   349
      mlib_v_ImageZoom_NN_f.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   350
      vis_Interp.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   351
      vis_AlphaMacros.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   352
      vis_AlphaMaskBlit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   353
      vis_AlphaMaskFill.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   354
      vis_ByteGray.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   355
      vis_ByteGray_FromRgb.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   356
      vis_ByteGray_Mask.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   357
      vis_ByteIndexed.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   358
      vis_DrawLine.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   359
      vis_FourByteAbgr.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   360
      vis_IntArgb.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   361
      vis_IntArgbPre.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   362
      vis_IntArgbPre_Mask.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   363
      vis_IntBgr.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   364
      vis_IntRgb.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   365
      vis_IntRgbx.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   366
      vis_SrcMaskFill.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   367
      vis_SrcOverMaskBlit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   368
      vis_SrcOverMaskFill.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   369
      vis_FourByteAbgrPre.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   370
      vis_GlyphList.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   371
      vis_GlyphListXor.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   372
      vis_IntArgbBm.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   373
      vis_ThreeByteBgr.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   374
      vis_UshortGray.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   375
      vis_UshortGray_FromRgb.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   376
      vis_XorBlit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   377
      mlib_v_ImageCopy_blk.s
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   378
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   379
  ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   380
    LIBAWT_ASFLAGS = -P -xarch=v9a
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   381
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   382
    LIBAWT_ASFLAGS = -P -xarch=v8plusa
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   383
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   384
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   385
  LIBAWT_FILES += MapAccelFunc.c
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   386
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   387
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   388
ifneq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   389
  LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   390
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   391
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   392
LIBAWT_LANG := C
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   393
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   394
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   395
  LIBAWT_FILES += AccelGlyphCache.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   396
      ShaderList.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   397
      CmdIDList.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   398
      Hashtable.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   399
      GDIHashtable.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   400
      Devices.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   401
      ObjectList.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   402
      GDIBlitLoops.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   403
      GDIRenderer.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   404
      GDIWindowSurfaceData.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   405
      WindowsFlags.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   406
      WPrinterJob.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   407
      awt_%.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   408
      D3DBlitLoops.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   409
      D3DBufImgOps.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   410
      D3DContext.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   411
      D3DGlyphCache.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   412
      D3DGraphicsDevice.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   413
      D3DMaskBlit.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   414
      D3DMaskCache.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   415
      D3DMaskFill.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   416
      D3DPipelineManager.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   417
      D3DPaints.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   418
      D3DRenderer.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   419
      D3DRenderQueue.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   420
      D3DResourceManager.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   421
      D3DSurfaceData.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   422
      D3DTextRenderer.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   423
      D3DVertexCacher.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   424
      ShellFolder2.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   425
      ThemeReader.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   426
      ComCtl32Util.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   427
      DllUtil.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   428
      initIDs.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   429
      MouseInfo.cpp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   430
      rect.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   431
      OGLBlitLoops.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   432
      OGLBufImgOps.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   433
      OGLContext.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   434
      OGLFuncs.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   435
      OGLMaskBlit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   436
      OGLMaskFill.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   437
      OGLPaints.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   438
      OGLRenderQueue.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   439
      OGLRenderer.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   440
      OGLSurfaceData.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   441
      OGLTextRenderer.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   442
      OGLVertexCache.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   443
      WGLGraphicsConfig.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   444
      WGLSurfaceData.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   445
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   446
  LIBAWT_LANG := C++
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   447
  LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   448
  ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   449
    LIBAWT_CFLAGS += -DMLIB_OS64BIT
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   450
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   451
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   452
  ifdef OPENJDK
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   453
    LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/windows/resource/icons"
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   454
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   455
    LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   456
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   457
  LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/native/sun/windows/awt.rc
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   458
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   459
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   460
ifeq ($(MILESTONE), internal)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   461
  LIBAWT_CFLAGS += -DINTERNAL_BUILD
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   462
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   463
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   464
LIBAWT_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt/mapfile-vers
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   465
ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   466
  LIBAWT_MAPFILE :=
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   467
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   468
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   469
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   470
    LIBRARY := awt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   471
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   472
    SRC := $(LIBAWT_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   473
    INCLUDE_FILES := $(LIBAWT_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   474
    LANG := $(LIBAWT_LANG), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   475
    OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   476
    CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   477
    ASFLAGS := $(LIBAWT_ASFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   478
    MAPFILE := $(LIBAWT_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   479
    LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   480
    LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   481
    LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   482
    LDFLAGS_SUFFIX_aix :=-ljvm $(LIBM) $(LIBDL) -ljava -lm,\
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   483
    LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   484
        -framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   485
        -framework OpenGL \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   486
        -framework JavaNativeFoundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   487
        -framework JavaRuntimeSupport \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   488
        -framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   489
        -framework AudioToolbox \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   490
        -ljava, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   491
    LDFLAGS_SUFFIX_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   492
        imm32.lib ole32.lib uuid.lib shell32.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   493
        comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   494
        delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   495
        -DELAYLOAD:user32.dll -DELAYLOAD:gdi32.dll \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   496
        -DELAYLOAD:shell32.dll -DELAYLOAD:winmm.dll \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   497
        -DELAYLOAD:winspool.drv -DELAYLOAD:imm32.dll \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   498
        -DELAYLOAD:ole32.dll -DELAYLOAD:comdlg32.dll \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   499
        -DELAYLOAD:comctl32.dll -DELAYLOAD:shlwapi.dll, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   500
    VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   501
    RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   502
        -D "JDK_FNAME=awt.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   503
        -D "JDK_INTERNAL_NAME=awt" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   504
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   505
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   506
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   507
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   508
$(BUILD_LIBAWT): $(BUILD_LIBJAVA)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   509
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   510
ifeq ($(OPENJDK_TARGET_OS), macosx)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   511
  $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   512
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   513
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   514
BUILD_LIBRARIES += $(BUILD_LIBAWT)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   515
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   516
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   517
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   518
ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   519
  ifndef BUILD_HEADLESS_ONLY
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   520
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   521
    LIBAWT_XAWT_DIRS := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   522
        $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   523
        $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   524
        $(JDK_TOPDIR)/src/share/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   525
        $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   526
        $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   527
        $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   528
        $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   529
        $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   530
        $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   531
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   532
    LIBAWT_XAWT_CFLAGS := -DXAWT -DXAWT_HACK \
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   533
        -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   534
        $(CUPS_CFLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   535
        $(foreach dir, $(LIBAWT_XAWT_DIRS), -I$(dir)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   536
        -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   537
        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   538
        -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   539
        -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   540
        -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   541
        -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   542
        -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   543
        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   544
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   545
    ifeq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   546
      LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   547
    endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   548
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   549
    ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   550
      ifeq ($(DISABLE_XRENDER), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   551
        LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   552
      endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   553
    endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   554
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   555
    ifeq ($(MILESTONE), internal)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   556
      LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   557
    endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   558
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   559
    LIBAWT_XAWT_FILES := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   560
        XlibWrapper.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   561
        XWindow.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   562
        XToolkit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   563
        X11Color.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   564
        X11SurfaceData.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   565
        awt_GraphicsEnv.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   566
        awt_InputMethod.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   567
        robot_common.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   568
        awt_Robot.c \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   569
        list.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   570
        multiVis.c \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   571
        initIDs.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   572
        awt_util.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   573
        awt_Desktop.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   574
        awt_UNIXToolkit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   575
        X11FontScaler_md.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   576
        X11TextRenderer_md.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   577
        fontpath.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   578
        awt_Insets.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   579
        awt_Event.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   580
        X11Renderer.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   581
        X11PMBlitLoops.c \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   582
        OGLBlitLoops.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   583
        OGLBufImgOps.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   584
        OGLContext.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   585
        OGLFuncs.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   586
        OGLMaskBlit.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   587
        OGLMaskFill.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   588
        OGLPaints.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   589
        OGLRenderQueue.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   590
        OGLRenderer.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   591
        OGLSurfaceData.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   592
        OGLTextRenderer.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   593
        OGLVertexCache.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   594
        GLXGraphicsConfig.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   595
        GLXSurfaceData.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   596
        AccelGlyphCache.c \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   597
        awt_Font.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   598
        multi_font.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   599
        awt_AWTEvent.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   600
        awt_DrawingSurface.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   601
        jawt.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   602
        CUPSfuncs.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   603
        debug_assert.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   604
        debug_mem.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   605
        debug_trace.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   606
        debug_util.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   607
        gnome_interface.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   608
        gtk2_interface.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   609
        swing_GTKEngine.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   610
        swing_GTKStyle.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   611
        rect.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   612
        sun_awt_X11_GtkFileDialogPeer.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   613
        XRSurfaceData.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   614
        XRBackendNative.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   615
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   616
    LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   617
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   618
    ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   619
      # To match old build, add this to LDFLAGS instead of suffix.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   620
      LIBAWT_XAWT_LDFLAGS += -lpthread
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   621
    endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   622
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   623
    $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   624
        LIBRARY := awt_xawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   625
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   626
        SRC := $(LIBAWT_XAWT_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   627
        INCLUDE_FILES := $(LIBAWT_XAWT_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   628
        LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   629
        OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   630
        CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   631
            $(X_CFLAGS), \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   632
        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   633
        LDFLAGS := $(LDFLAGS_JDKLIB) \
23592
35b16ae6b4f4 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23310
diff changeset
   634
            $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   635
            $(call SET_SHARED_LIBRARY_ORIGIN) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   636
            $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   637
        LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   638
        VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   639
        RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   640
            -D "JDK_FNAME=xawt.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   641
            -D "JDK_INTERNAL_NAME=xawt" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   642
            -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   643
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_xawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   644
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   645
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   646
    $(BUILD_LIBAWT_XAWT): $(BUILD_LIBJAVA)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   647
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   648
    $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   649
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   650
    BUILD_LIBRARIES += $(BUILD_LIBAWT_XAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   651
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   652
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   653
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   654
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   655
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   656
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   657
LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   658
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   659
ifeq ($(USE_EXTERNAL_LCMS), true)
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   660
  # 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
   661
  # By including it explicitely, all other files will be excluded.
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   662
  BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   663
  BUILD_LIBLCMS_HEADERS :=
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   664
else
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   665
  BUILD_LIBLCMS_INCLUDE_FILES :=
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   666
  # 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
   667
  # include path explicitly. Otherwise the system headers will be used.
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   668
  BUILD_LIBLCMS_HEADERS := -I$(LIBLCMS_DIR)
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   669
endif
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   670
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   671
# TODO: Update awt lib path when awt is converted
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   672
$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   673
    LIBRARY := lcms, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   674
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   675
    SRC := $(LIBLCMS_DIR), \
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   676
    INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   677
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   678
    OPTIMIZATION := HIGHEST, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   679
    CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   680
        $(SHARED_LIBRARY_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   681
        -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   682
        -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   683
        $(BUILD_LIBLCMS_HEADERS) \
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   684
        $(LCMS_CFLAGS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   685
    CFLAGS_solaris := -xc99=no_lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   686
    CFLAGS_windows := -DCMS_IS_WINDOWS_, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   687
    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   688
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   689
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   690
    LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   691
    LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   692
    LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   693
    LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   694
    LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   695
    LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   696
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   697
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   698
        -D "JDK_FNAME=lcms.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   699
        -D "JDK_INTERNAL_NAME=lcms" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   700
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   701
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   702
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   703
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   704
BUILD_LIBRARIES += $(BUILD_LIBLCMS)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   705
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   706
$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   707
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   708
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   709
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   710
BUILD_LIBJAVAJPEG_DIR := $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   711
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   712
ifdef OPENJDK
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   713
  BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   714
else
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   715
  BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   716
  BUILD_LIBJAVAJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   717
  BUILD_LIBJAVAJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJAVAJPEG_CLOSED_SRC)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   718
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   719
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   720
BUILD_LIBJAVAJPEG_REORDER :=
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   721
ifeq ($(OPENJDK_TARGET_OS), solaris)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   722
  ifneq ($(OPENJDK_TARGET_CPU), x86_64)
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   723
    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
   724
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   725
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   726
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   727
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   728
# Suppress gcc warnings like "variable might be clobbered by 'longjmp'
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   729
# or 'vfork'": this warning indicates that some variable is placed to
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   730
# 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
   731
# 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
   732
# volatile to prevent the optimization. However, this approach does not
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   733
# 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
   734
#ifndef CROSS_COMPILE_ARCH
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   735
#  CC_43_OR_NEWER := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   736
#      $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   737
#          \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   738
#  ifeq ($(CC_43_OR_NEWER), 1)
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   739
#    BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   740
#  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   741
#endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   742
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   743
ifeq ($(USE_EXTERNAL_LIBJPEG), true)
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   744
  LIBJPEG_LIBS := -ljpeg
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   745
  BUILD_LIBJAVAJPEG_INCLUDE_FILES := \
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   746
      imageIOJPEG.c \
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   747
      jpegdecoder.c
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   748
  BUILD_LIBJAVAJPEG_HEADERS :=
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   749
else
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   750
  LIBJPEG_LIBS :=
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   751
  BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   752
  BUILD_LIBJAVAJPEG_HEADERS := -I$(BUILD_LIBJAVAJPEG_DIR)
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   753
endif
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   754
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   755
$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   756
    LIBRARY := javajpeg, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   757
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   758
    SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   759
        $(BUILD_LIBJAVAJPEG_DIR), \
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   760
    INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   761
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   762
    OPTIMIZATION := HIGHEST, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   763
    CFLAGS := $(CFLAGS_JDKLIB) \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   764
        $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   765
        $(BUILD_LIBJAVAJPEG_HEADERS), \
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   766
    MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   767
    LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   768
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   769
    LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   770
    LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   771
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   772
    RC_FLAGS := $(RC_FLAGS) \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   773
        -D "JDK_FNAME=javajpeg.dll" \
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   774
        -D "JDK_INTERNAL_NAME=javajpeg" \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   775
        -D "JDK_FTYPE=0x2L", \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   776
    REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   777
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   778
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   779
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   780
$(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   781
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   782
BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   783
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   784
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   785
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   786
ifndef OPENJDK
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   787
  FONT_HEADERS := -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   788
  BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   789
  LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   790
else
20899
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20896
diff changeset
   791
  FONT_HEADERS := $(FREETYPE_CFLAGS)
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   792
  BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers.openjdk
20899
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20896
diff changeset
   793
  BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   794
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   795
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   796
LIBFONTMANAGER_OPTIMIZATION := HIGH
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   797
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   798
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   799
  LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   800
      X11TextRenderer.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   801
  LIBFONTMANAGER_OPTIMIZATION := HIGHEST
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   802
else ifeq ($(OPENJDK_TARGET_OS), macosx)
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   803
  LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   804
      X11TextRenderer.c \
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   805
      fontpath.c \
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   806
      lcdglyph.c
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   807
else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   808
  LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   809
      lcdglyph.c
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
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   812
BUILD_LIBFONTMANAGER_CFLAGS_COMMON := \
22649
f70b08c1593c 8033532: Freetype include statement must come before X11 include
ihse
parents: 22607
diff changeset
   813
    $(FONT_HEADERS) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   814
    $(X_CFLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   815
    -DLE_STANDALONE -DHEADLESS \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   816
    -I$(JDK_TOPDIR)/src/share/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   817
    -I$(JDK_TOPDIR)/src/share/native/sun/font/layout \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   818
    -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   819
    -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   820
    -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   821
    -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   822
    -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   823
    -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   824
    -I$(JDK_TOPDIR)/src/share/native/sun/java2d
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   825
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   826
# Turn off aliasing with GCC for ExtensionSubtables.cpp
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   827
ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   828
  BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
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
24198
41b2f3e923b8 8042208: Build fails on Solaris using devkit when X isn't installed
erikj
parents: 23592
diff changeset
   831
# Libfontmanager doesn't actually need X_LIBS to link, but if building
41b2f3e923b8 8042208: Build fails on Solaris using devkit when X isn't installed
erikj
parents: 23592
diff changeset
   832
# on a Solaris machine without X installed, using a devkit, linking
41b2f3e923b8 8042208: Build fails on Solaris using devkit when X isn't installed
erikj
parents: 23592
diff changeset
   833
# to libawt_xawt will fail without the -L parameters from X_LIBS. Filter
41b2f3e923b8 8042208: Build fails on Solaris using devkit when X isn't installed
erikj
parents: 23592
diff changeset
   834
# out the -R parameters since they aren't needed.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   835
$(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   836
    LIBRARY := fontmanager, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   837
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   838
    SRC := $(JDK_TOPDIR)/src/share/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   839
        $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   840
    EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   841
        AccelGlyphCache.c, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   842
    LANG := C++, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   843
    CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   844
    CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   845
    OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   846
    CFLAGS_windows = -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   847
        -DCC_NOEX, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   848
    MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   849
    LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   850
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   851
    LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   852
    LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
24198
41b2f3e923b8 8042208: Build fails on Solaris using devkit when X isn't installed
erikj
parents: 23592
diff changeset
   853
    LDFLAGS_SUFFIX_solaris := $(filter-out -R%, $(X_LIBS)) \
41b2f3e923b8 8042208: Build fails on Solaris using devkit when X isn't installed
erikj
parents: 23592
diff changeset
   854
        -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   855
    LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt $(LIBM) $(LIBCXX) -ljava -ljvm,\
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   856
    LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   857
        -ljava -ljvm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   858
    LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   859
        $(WIN_AWT_LIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   860
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   861
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   862
        -D "JDK_FNAME=fontmanager.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   863
        -D "JDK_INTERNAL_NAME=fontmanager" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   864
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   865
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfontmanager, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   866
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   867
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   868
$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   869
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   870
ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   871
  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_XAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   872
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   873
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   874
BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   875
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   876
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   877
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   878
ifndef OPENJDK
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   879
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   880
  #ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   881
  #  ifeq ("$(CC_VER_MAJOR)", "3")
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   882
  #    OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   883
  #  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   884
  #endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   885
  #
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   886
  # The resulting size of the t2k lib file is (at least on linux) dependant on the order of
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   887
  # the input .o files. Because of this the new build will differ in size to the old build.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   888
  BUILD_LIBT2K_CFLAGS_COMMON := -I$(JDK_TOPDIR)/src/share/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   889
      -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   890
      -I$(JDK_TOPDIR)/src/closed/share/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   891
      -I$(JDK_TOPDIR)/src/share/share/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   892
      -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   893
      -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   894
      -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   895
      -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   896
      -I$(JDK_TOPDIR)/src/share/native/sun/java2d
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   897
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   898
  $(eval $(call SetupNativeCompilation,BUILD_LIBT2K, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   899
      LIBRARY := t2k, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   900
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   901
      SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   902
          $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   903
          $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k/ttHints, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   904
      EXCLUDE_FILES := orion.c, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   905
      LANG := C++, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   906
      OPTIMIZATION := HIGH, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   907
      CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   908
      CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   909
      CFLAGS_windows = -DCC_NOEX, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   910
      CXXFLAGS_windows = -DCC_NOEX, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
   911
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libt2k/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   912
      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   913
          $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   914
      LDFLAGS_windows := user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   915
      LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   916
      LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   917
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   918
      RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   919
          -D "JDK_FNAME=t2k.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   920
          -D "JDK_INTERNAL_NAME=t2k" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   921
          -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   922
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libt2k, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   923
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   924
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   925
  # t2k is linked against fontmanager
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   926
  $(BUILD_LIBT2K): $(BUILD_LIBFONTMANAGER)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   927
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   928
  BUILD_LIBRARIES += $(BUILD_LIBT2K)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   929
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   930
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   931
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   932
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   933
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   934
  ifeq ($(OPENJDK_TARGET_CPU), x86)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   935
    KERNEL32_LIB := kernel32.lib
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   936
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   937
  $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   938
      LIBRARY := jawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   939
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   940
      SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   941
      INCLUDE_FILES := jawt.cpp, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   942
      LANG := C++, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   943
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   944
      CFLAGS := $(CXXFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   945
          -EHsc -DUNICODE -D_UNICODE \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   946
          -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   947
          -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   948
          -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   949
          -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   950
          -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   951
      LDFLAGS := $(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   952
          advapi32.lib $(WIN_AWT_LIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   953
      LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   954
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   955
      RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   956
          -D "JDK_FNAME=jawt.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   957
          -D "JDK_INTERNAL_NAME=jawt" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   958
          -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   959
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   960
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   961
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   962
  $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   963
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   964
  $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   965
	$(ECHO) Copying $(@F)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   966
	$(CP) $(JDK_OUTPUTDIR)/objs/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   967
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   968
  BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   969
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   970
else # OPENJDK_TARGET_OS not windows
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   971
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   972
  ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   973
    JAWT_FILES := jawt.m
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   974
    JAWT_LIBS := -lawt_lwawt
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   975
  else
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   976
    JAWT_FILES := jawt.c
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   977
    JAWT_LIBS :=
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   978
    ifneq ($(OPENJDK_TARGET_OS), solaris)
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   979
      JAWT_LIBS += -lawt
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   980
    endif
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   981
    ifndef BUILD_HEADLESS_ONLY
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   982
      JAWT_LIBS += -lawt_xawt
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   983
    else
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   984
      JAWT_LIBS += -lawt_headless
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   985
      HEADLESS_CFLAG += -DHEADLESS
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   986
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   987
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   988
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   989
  $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   990
      LIBRARY := jawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   991
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   992
      SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   993
          $(JDK_TOPDIR)/src/macosx/native/sun/awt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   994
      INCLUDE_FILES := $(JAWT_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   995
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   996
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   997
      CFLAGS := $(CFLAGS_JDKLIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   998
      CFLAGS_linux := $(HEADLESS_CFLAG), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   999
      CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
  1000
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1001
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1002
          $(call SET_SHARED_LIBRARY_ORIGIN), \
23592
35b16ae6b4f4 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23310
diff changeset
  1003
      LDFLAGS_solaris := $(X_LIBS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1004
      LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
  1005
      LDFLAGS_SUFFIX_aix := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1006
      LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1007
      LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1008
          -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1009
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1010
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1011
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1012
  ifndef BUILD_HEADLESS_ONLY
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1013
    $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1014
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1015
    $(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
  1016
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1017
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1018
  ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1019
    $(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
  1020
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1021
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1022
endif # OPENJDK_TARGET_OS
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_LIBRARIES += $(BUILD_LIBJAWT)
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
##########################################################################################
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
ifndef OPENJDK
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1029
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1030
  BUILD_LIBKCMS_EXCLUDE_FILES :=
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1031
  ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1032
    BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1033
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1034
    BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1035
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1036
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1037
  BUILD_LIBKCMS_FLAGS := $(CFLAGS_JDKLIB)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1038
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1039
  ifeq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1040
    # This particular library uses a feature called PIC_CODE_SMALL (on solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1041
    # implement it like this...since it's only used here
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1042
    BUILD_LIBKCMS_FLAGS := $(patsubst -KPIC, -Kpic, $(BUILD_LIBKCMS_FLAGS))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1043
  else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1044
    BUILD_LIBKCMS_FLAGS := $(patsubst -fPIC, -fpic, $(BUILD_LIBKCMS_FLAGS))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1045
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1046
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1047
  $(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1048
      LIBRARY := kcms, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1049
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1050
      SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1051
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1052
      EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1053
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1054
      CFLAGS := $(BUILD_LIBKCMS_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1055
          -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1056
      CFLAGS_linux := -Wno-missing-field-initializers, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
  1057
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libkcms/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1058
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1059
          $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1060
      LDFLAGS_SUFFIX_linux := -lc -lpthread, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1061
      LDFLAGS_SUFFIX_solaris := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1062
      LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1063
      LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1064
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1065
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1066
      RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1067
          -D "JDK_FNAME=kcms.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1068
          -D "JDK_INTERNAL_NAME=kcms" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1069
          -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1070
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkcms, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1071
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1072
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1073
  $(BUILD_LIBKCMS): $(BUILD_LIBJAVA)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1074
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1075
  BUILD_LIBRARIES += $(BUILD_LIBKCMS)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1076
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1077
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1078
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1079
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1080
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1081
ifndef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1082
  ifeq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1083
    ifneq ($(OPENJDK_TARGET_CPU), x86_64)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1084
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1085
      ifeq ($(shell if test "$(OS_VERSION_MAJOR)" -eq 5 -a "$(OS_VERSION_MINOR)" -le 10; then $(ECHO) ok; fi), ok)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1086
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1087
        SUNWJDGA_MAPFILE :=
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1088
        ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
  1089
          SUNWJDGA_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdga/mapfile-vers
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1090
        endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1091
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1092
        $(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1093
            LIBRARY := sunwjdga, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1094
            OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1095
            SRC := $(JDK_TOPDIR)/src/solaris/native/sun/jdga, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1096
            LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1097
            OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1098
            CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1099
                -I$(JDK_TOPDIR)/src/share/javavm/export \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1100
                -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
23592
35b16ae6b4f4 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23310
diff changeset
  1101
                $(X_CFLAGS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1102
            MAPFILE := $(SUNWJDGA_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1103
            LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1104
                $(call SET_SHARED_LIBRARY_ORIGIN), \
23592
35b16ae6b4f4 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23310
diff changeset
  1105
            LDFLAGS_SUFFIX := $(X_LIBS) -ldga -lX11 $(LIBDL) -lc, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1106
            OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1107
            DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1108
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1109
        BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1110
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1111
      endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1112
    endif
17957
1a51992c6097 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17735
diff changeset
  1113
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1114
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1115
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1116
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1117
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1118
ifeq ($(BUILD_HEADLESS), true)
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
  1119
  # Mac and Windows only use the native AWT lib, do not build libawt_headless
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
  1120
  ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1121
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1122
    LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/share/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1123
        $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1124
        $(JDK_TOPDIR)/src/solaris/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1125
        $(JDK_TOPDIR)/src/solaris/native/sun/awt \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1126
        $(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1127
        $(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1128
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1129
    ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1130
      LIBAWT_HEADLESS_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/font
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1131
    endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1132
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1133
    LIBAWT_HEADLESS_CFLAGS := -DHEADLESS=true \
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
  1134
        -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1135
        $(CUPS_CFLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1136
        $(X_CFLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1137
        -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1138
        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1139
        -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1140
        -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1141
        -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1142
        -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1143
        -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1144
        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1145
        $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1146
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1147
    LIBAWT_HEADLESS_FILES := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1148
        awt_Font.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1149
        HeadlessToolkit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1150
        fontpath.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1151
        VDrawingArea.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1152
        X11Color.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1153
        X11Renderer.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1154
        X11PMBlitLoops.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1155
        X11SurfaceData.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1156
        X11FontScaler_md.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1157
        X11TextRenderer_md.c \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1158
        OGLBlitLoops.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1159
        OGLBufImgOps.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1160
        OGLContext.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1161
        OGLFuncs.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1162
        OGLMaskBlit.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1163
        OGLMaskFill.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1164
        OGLPaints.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1165
        OGLRenderQueue.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1166
        OGLRenderer.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1167
        OGLSurfaceData.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1168
        OGLTextRenderer.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1169
        OGLVertexCache.c \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1170
        GLXGraphicsConfig.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1171
        GLXSurfaceData.c \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1172
        AccelGlyphCache.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1173
        CUPSfuncs.c
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  1174
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1175
    LIBAWT_HEADLESS_REORDER :=
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1176
    ifeq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1177
      ifneq ($(OPENJDK_TARGET_CPU), x86_64)
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
  1178
        LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1179
      endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1180
    endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1181
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1182
    $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1183
        LIBRARY := awt_headless, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1184
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1185
        SRC := $(LIBAWT_HEADLESS_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1186
        INCLUDE_FILES := $(LIBAWT_HEADLESS_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1187
        LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1188
        OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1189
        CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS), \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
  1190
        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1191
        LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1192
            $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1193
        LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
23592
35b16ae6b4f4 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23310
diff changeset
  1194
        LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1195
        LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1196
        REORDER := $(LIBAWT_HEADLESS_REORDER), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1197
        LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
  1198
        LDFLAGS_SUFFIX_aix := -ljvm -lawt -ljava,\
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1199
        LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1200
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1201
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1202
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1203
    $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1204
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1205
    BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1206
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1207
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1208
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1209
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1210
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1211
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1212
ifndef BUILD_HEADLESS_ONLY
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1213
  LIBSPLASHSCREEN_DIRS := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1214
    $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1215
    $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1216
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1217
  ifeq ($(USE_EXTERNAL_LIBGIF), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1218
    GIFLIB_LDFLAGS := -lgif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1219
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1220
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1221
    GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1222
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1223
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
  1224
  ifeq ($(USE_EXTERNAL_LIBJPEG), true)
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
  1225
    LIBJPEG_LDFLAGS := -ljpeg
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
  1226
  else
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
  1227
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
  1228
    LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
  1229
  endif
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
  1230
23305
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
  1231
  ifeq ($(USE_EXTERNAL_LIBPNG), false)
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
  1232
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/libpng
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
  1233
    LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
  1234
  endif
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
  1235
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1236
  ifneq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1237
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1238
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1239
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1240
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1241
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1242
  LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1243
      $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1244
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1245
  ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1246
    LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
25086
f5f41ed620d5 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24710
diff changeset
  1247
        $(LIBSPLASHSCREEN_CFLAGS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1248
    LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1249
    LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1250
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1251
    LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1252
    LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1253
    LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1254
    LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1255
    LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1256
    LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1257
    LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1258
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
  1259
  else ifeq ($(OPENJDK_TARGET_OS), windows)
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
  1260
    LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1261
  else
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
  1262
    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1263
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1264
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1265
  LIBSPLASHSCREEN_LDFLAGS_SUFFIX :=
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1266
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1267
  ifneq ($(USE_EXTERNAL_LIBZ), true)
24710
c019dc4104b2 8044725: Bug in zlib 1.2.5 prevents inflation of some gzipped files
sherman
parents: 24566
diff changeset
  1268
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1269
    LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1270
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1271
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1272
  ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1273
    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1274
        -framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1275
        -framework Foundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1276
        -framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1277
        -framework JavaNativeFoundation
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
  1278
  else ifeq ($(OPENJDK_TARGET_OS), windows)
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
  1279
    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
23592
35b16ae6b4f4 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23310
diff changeset
  1280
  else
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
  1281
    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
  1282
  endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1283
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1284
  $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1285
      LIBRARY := splashscreen, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1286
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1287
      SRC := $(LIBSPLASHSCREEN_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1288
      EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1289
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1290
      OPTIMIZATION := LOW, \
23305
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
  1291
      CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
  1292
                $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS), \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
  1293
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1294
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1295
          $(call SET_SHARED_LIBRARY_ORIGIN), \
23305
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
  1296
      LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
  1297
                        $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(PNG_LIBS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1298
      LDFLAGS_SUFFIX_solaris := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1299
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1300
      RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1301
          -D "JDK_FNAME=splashscreen.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1302
          -D "JDK_INTERNAL_NAME=splashscreen" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1303
          -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1304
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsplashscreen, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1305
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1306
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1307
  BUILD_LIBRARIES += $(LIBSPLASHSCREEN)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1308
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1309
  ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1310
    $(LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1311
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1312
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1313
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1314
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1315
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1316
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1317
ifndef OPENJDK
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1318
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1319
  LIBDCPR_SRC_DIRS := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1320
      $(JDK_TOPDIR)/src/closed/share/native/sun/dc/doe \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1321
      $(JDK_TOPDIR)/src/closed/share/native/sun/dc/path \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1322
      $(JDK_TOPDIR)/src/closed/share/native/sun/dc/pr \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1323
      $(JDK_TOPDIR)/src/closed/share/native/sun/dc/util
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1324
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1325
  LIBDCPR_CFLAGS := $(foreach dir, $(LIBDCPR_SRC_DIRS), -I$(dir)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1326
      -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1327
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1328
  $(eval $(call SetupNativeCompilation,BUILD_LIBDCPR, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1329
      LIBRARY := dcpr, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1330
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1331
      SRC := $(LIBDCPR_SRC_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1332
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1333
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1334
      CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1335
          $(LIBDCPR_CFLAGS), \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21130
diff changeset
  1336
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdcpr/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1337
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1338
          $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1339
      LDFLAGS_SUFFIX := $(LIBM) $(LDFLAGS_JDKLIB_SUFFIX), \
23291
e97e8471b683 8034227: JDK9 Windows build failure in libdcpr
prr
parents: 22607
diff changeset
  1340
      LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1341
      LDFLAGS_SUFFIX_posix := -lm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1342
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1343
      RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1344
          -D "JDK_FNAME=dcpr.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1345
          -D "JDK_INTERNAL_NAME=dcpr" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1346
          -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1347
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdcpr, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1348
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1349
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1350
  $(BUILD_LIBDCPR): $(BUILD_LIBJAVA)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1351
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1352
  BUILD_LIBRARIES += $(BUILD_LIBDCPR)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1353
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1354
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1355
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1356
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1357
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1358
ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1359
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1360
  LIBAWT_LWAWT_FILES := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1361
      awt.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1362
      ApplicationDelegate.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1363
      CFRetainedResource.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1364
      CGLGraphicsConfig.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1365
      CGLSurfaceData.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1366
      CGLLayer.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1367
      CGraphicsConfig.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1368
      CGraphicsDevice.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1369
      CGraphicsEnv.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1370
      CCharToGlyphMapper.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1371
      CSystemColors.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1372
      AWTFont.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1373
      CGGlyphOutlines.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1374
      CGGlyphImages.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1375
      CoreTextSupport.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1376
      AWTStrike.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1377
      InitIDs.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1378
      AWTEvent.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1379
      AWTView.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1380
      AWTWindow.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1381
      AWTSurfaceLayers.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1382
      CCursorManager.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1383
      CClipboard.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1384
      CDataTransferer.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1385
      CDragSource.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1386
      CDragSourceContextPeer.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1387
      CDropTarget.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1388
      CDropTargetContextPeer.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1389
      CInputMethod.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1390
      CDesktopPeer.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1391
      OSVersion.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1392
      DnDUtilities.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1393
      CFileDialog.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1394
      CImage.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1395
      CMenu.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1396
      CMenuBar.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1397
      CMenuComponent.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1398
      CMenuItem.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1399
      CPopupMenu.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1400
      CRobot.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1401
      CTrayIcon.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1402
      CWrapper.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1403
      JavaAccessibilityAction.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1404
      JavaAccessibilityUtilities.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1405
      JavaComponentAccessibility.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1406
      JavaTextAccessibility.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1407
      LWCToolkit.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1408
      GeomUtilities.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1409
      CPrinterJob.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1410
      PrintModel.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1411
      PrinterSurfaceData.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1412
      PrinterView.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1413
      QuartzSurfaceData.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1414
      QuartzRenderer.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1415
      CTextPipe.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1416
      ImageSurfaceData.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1417
      awt_DrawingSurface.m \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1418
      \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1419
      OGLBlitLoops.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1420
      OGLBufImgOps.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1421
      OGLContext.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1422
      OGLFuncs.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1423
      OGLMaskBlit.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1424
      OGLMaskFill.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1425
      OGLPaints.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1426
      OGLRenderQueue.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1427
      OGLRenderer.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1428
      OGLSurfaceData.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1429
      OGLTextRenderer.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1430
      OGLVertexCache.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1431
      AccelGlyphCache.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1432
      CUPSfuncs.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1433
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1434
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1435
  LIBAWT_LWAWT_DIRS := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1436
      $(JDK_TOPDIR)/src/macosx/native/sun/awt \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1437
      $(JDK_TOPDIR)/src/macosx/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1438
      $(JDK_TOPDIR)/src/macosx/native/sun/java2d/opengl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1439
      $(JDK_TOPDIR)/src/solaris/native/sun/awt \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1440
      $(JDK_TOPDIR)/src/share/native/sun/font \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1441
      $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1442
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1443
  $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1444
      LIBRARY := awt_lwawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1445
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1446
      SRC := $(LIBAWT_LWAWT_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1447
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1448
      INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1449
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1450
      CFLAGS := $(CFLAGS_JDKLIB) \
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
  1451
          $(X_CFLAGS) \
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
  1452
          $(X_LIBS) \
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
  1453
          $(foreach dir, $(LIBAWT_LWAWT_DIRS), -I$(dir)) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1454
          -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1455
          -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1456
          -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1457
          -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1458
          -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1459
          -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1460
          -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
25086
f5f41ed620d5 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24710
diff changeset
  1461
          -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1462
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1463
          $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1464
      LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1465
          -framework Accelerate \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1466
          -framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1467
          -framework AudioToolbox \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1468
          -framework Carbon \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1469
          -framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1470
          -framework Security \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1471
          -framework ExceptionHandling \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1472
          -framework JavaNativeFoundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1473
          -framework JavaRuntimeSupport \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1474
          -framework OpenGL \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1475
          -framework QuartzCore -ljava, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1476
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_lwawt, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1477
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1478
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1479
  BUILD_LIBRARIES += $(BUILD_LIBAWT_LWAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1480
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1481
  $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1482
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1483
  $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1484
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1485
  $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBOSXAPP)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1486
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1487
  $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBJAVA)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1488
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1489
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1490
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1491
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1492
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1493
ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1494
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1495
  $(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1496
      LIBRARY := osxui, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1497
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1498
      SRC := $(JDK_TOPDIR)/src/macosx/native/com/apple/laf, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1499
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1500
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1501
      CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1502
          -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1503
          -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
25086
f5f41ed620d5 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24710
diff changeset
  1504
          -I$(JDK_TOPDIR)/src/macosx/native/sun/awt, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1505
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1506
          $(call SET_SHARED_LIBRARY_ORIGIN) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1507
          -Xlinker -rpath -Xlinker @loader_path, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1508
      LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1509
          -framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1510
          -framework Carbon \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1511
          -framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1512
          -framework JavaNativeFoundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1513
          -framework JavaRuntimeSupport \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1514
          -ljava -ljvm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1515
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxui, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1516
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1517
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1518
  BUILD_LIBRARIES += $(BUILD_LIBOSXUI)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1519
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1520
  $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1521
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1522
  $(BUILD_LIBOSXUI): $(BUILD_LIBOSXAPP)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1523
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1524
  $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1525
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1526
  #$(BUILD_LIBOSXUI): $(BUILD_LIBJAVA)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1527
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1528
endif