jdk/makefiles/CompileNativeLibraries.gmk
author duke
Wed, 05 Jul 2017 18:46:58 +0200
changeset 16416 bcebd3fdefc9
parent 16129 744dd8193801
child 16512 024da1ae4667
child 16472 91737e09a234
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
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     2
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
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
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    26
defalt: all
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    27
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    28
include $(SPEC)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
include MakeBase.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    30
include NativeCompilation.gmk
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
# Setup the java compilers for the JDK build.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    33
include Setup.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    34
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    35
# Copy files (can now depend on $(COPY_FILES))
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    36
include CopyFiles.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    37
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14855
diff changeset
    38
# Prepare the find cache. Only used if running on windows.
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14855
diff changeset
    39
$(eval $(call FillCacheFind,$(JDK_TOPDIR)/src))
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14855
diff changeset
    40
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    41
# Build tools
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    42
include Tools.gmk
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    43
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    44
# Include the javah generated headers.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    45
CFLAGS_JDKLIB += -I$(JDK_OUTPUTDIR)/gensrc_headers
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    46
CXXFLAGS_JDKLIB += -I$(JDK_OUTPUTDIR)/gensrc_headers
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    47
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    48
# Put the libraries here. Different locations for different target apis.
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    49
ifeq ($(OPENJDK_TARGET_OS_API),posix)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    50
    INSTALL_LIBRARIES_HERE:=$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    51
else
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    52
    INSTALL_LIBRARIES_HERE:=$(JDK_OUTPUTDIR)/bin
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    53
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    54
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    55
BUILD_LIBRARIES=
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    56
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    57
# Absolute paths to lib files on windows for use in LDFLAGS. Should figure out a more
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    58
# elegant solution to this.
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    59
WIN_VERIFY_LIB := $(JDK_OUTPUTDIR)/objs/libverify/verify.lib
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    60
WIN_JAVA_LIB := $(JDK_OUTPUTDIR)/objs/libjava/java.lib
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    61
WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    62
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    63
# Use this variable to set DEBUG_SYMBOLS true on windows for all libraries, but
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    64
# not on other platforms.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    65
ifeq ($(OPENJDK_TARGET_OS), windows)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    66
    WINDOWS_ONLY := true
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    67
endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    68
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    69
#
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    70
# TODO replace with X_FLAGS / X_LIBS
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    71
#   and add them to configure
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    72
#
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    73
OPENWIN_LIB:=$(OPENWIN_HOME)/lib
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    74
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    75
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    76
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    77
BUILD_LIBFDLIBM_OPTIMIZATION:=HIGH
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    78
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    79
ifneq ($(OPENJDK_TARGET_OS), solaris)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    80
      BUILD_LIBFDLIBM_OPTIMIZATION:=NONE
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    81
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    82
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    83
ifneq ($(OPENJDK_TARGET_OS),macosx)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    84
$(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    85
                STATIC_LIBRARY:=fdlibm,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    86
                OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs,\
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    87
                SRC:=$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src,\
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    88
		LANG:=C,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    89
		OPTIMIZATION:=$(BUILD_LIBFDLIBM_OPTIMIZATION), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    90
		CFLAGS:=$(CFLAGS_JDKLIB) \
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    91
			-I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    92
		CFLAGS_windows_debug:=-DLOGGING,\
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    93
		ARFLAGS:=$(ARFLAGS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    94
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    95
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    96
else
14855
d104ff4d4bb9 8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents: 14789
diff changeset
    97
d104ff4d4bb9 8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents: 14789
diff changeset
    98
# On macosx the old build does partial (incremental) linking of fdlibm instead of
d104ff4d4bb9 8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents: 14789
diff changeset
    99
# a plain static library.
d104ff4d4bb9 8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents: 14789
diff changeset
   100
$(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   101
                LIBRARY:=fdlibm,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   102
                OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   103
                SRC:=$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   104
		LANG:=C,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   105
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   106
			-I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include,\
14524
f2953186ad92 8001460: build-infra: Linker warnings on macosx
erikj
parents: 14426
diff changeset
   107
		LDFLAGS:=-nostdlib -r -arch x86_64,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   108
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   109
14855
d104ff4d4bb9 8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents: 14789
diff changeset
   110
BUILD_LIBFDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
d104ff4d4bb9 8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents: 14789
diff changeset
   111
$(BUILD_LIBFDLIBM) : $(BUILD_LIBFDLIBM_MAC)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   112
	$(CP) -a $< $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   113
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   114
endif
14855
d104ff4d4bb9 8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents: 14789
diff changeset
   115
BUILD_LIBRARIES += $(BUILD_LIBFDLIBM)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   116
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   117
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   118
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   119
BUILD_LIBVERIFY_SRC:=check_code.c check_format.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   120
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   121
ifeq ($(OPENJDK_TARGET_OS), solaris)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   122
	ifneq ($(OPENJDK_TARGET_CPU), x86_64)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   123
		BUILD_LIBVERIFY_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   124
	endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   125
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   126
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   127
LIBVERIFY_OPTIMIZATION:=HIGH
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   128
ifneq ($(findstring $(OPENJDK_TARGET_OS),solaris linux),)
14707
511b222f99b2 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14706
diff changeset
   129
    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   130
        LIBVERIFY_OPTIMIZATION:=LOW
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   131
    endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   132
endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   133
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   134
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   135
$(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   136
		LIBRARY:=verify, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   137
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   138
		SRC:=$(JDK_TOPDIR)/src/share/native/common,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   139
		INCLUDE_FILES:=$(BUILD_LIBVERIFY_SRC),\
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   140
		LANG:=C,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   141
		OPTIMIZATION:=$(LIBVERIFY_OPTIMIZATION), \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   142
		CFLAGS:=$(CFLAGS_JDKLIB),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   143
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libverify/mapfile-vers, \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   144
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   145
			 $(call SET_SHARED_LIBRARY_ORIGIN), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   146
		LDFLAGS_SUFFIX_posix:=-ljvm -lc,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   147
		LDFLAGS_SUFFIX_windows:=jvm.lib,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   148
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   149
		RC_FLAGS:=$(RC_FLAGS) \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   150
			  -D "JDK_FNAME=verify.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   151
			  -D "JDK_INTERNAL_NAME=verify" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   152
			  -D "JDK_FTYPE=0x2L",\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   153
		REORDER:=$(BUILD_LIBVERIFY_REORDER),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   154
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libverify,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   155
		DEBUG_SYMBOLS:=true))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   156
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   157
BUILD_LIBRARIES += $(BUILD_LIBVERIFY)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   158
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   159
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   160
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   161
LIBJAVA_SRC_DIRS:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lang \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   162
		$(JDK_TOPDIR)/src/share/native/java/lang \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   163
		$(JDK_TOPDIR)/src/share/native/java/lang/ref \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   164
		$(JDK_TOPDIR)/src/share/native/java/lang/reflect \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   165
		$(JDK_TOPDIR)/src/share/native/java/io \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   166
		$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   167
		$(JDK_TOPDIR)/src/share/native/java/nio \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   168
		$(JDK_TOPDIR)/src/share/native/java/security \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   169
		$(JDK_TOPDIR)/src/share/native/common \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   170
		$(JDK_TOPDIR)/src/share/native/sun/misc \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   171
		$(JDK_TOPDIR)/src/share/native/sun/reflect \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   172
		$(JDK_TOPDIR)/src/share/native/java/util \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   173
		$(JDK_TOPDIR)/src/share/native/java/util/concurrent/atomic \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   174
		$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   175
		$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/util
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   176
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   177
ifneq ($(OPENJDK_TARGET_OS),macosx)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   178
    LIBJAVA_SRC_DIRS+=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/util/locale/provider
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   179
else
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   180
    LIBJAVA_SRC_DIRS+=$(JDK_TOPDIR)/src/macosx/native/sun/util/locale/provider
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   181
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   182
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   183
ifeq ($(OPENJDK_TARGET_OS),windows)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   184
    LIBJAVA_SRC_DIRS+=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/provider \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   185
		$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/io
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   186
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   187
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   188
LIBJAVA_CFLAGS:=$(foreach dir,$(LIBJAVA_SRC_DIRS),-I$(dir)) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   189
		  -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   190
                  -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   191
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   192
LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   193
                  -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   194
                  -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   195
                  -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"' 
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   196
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   197
ifneq (,$(JDK_UPDATE_VERSION))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   198
	LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   199
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   200
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   201
LIBJAVA_EXCLUDE_FILES:=check_code.c check_format.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   202
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   203
ifneq ($(OPENJDK_TARGET_OS),macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   204
	LIBJAVA_EXCLUDE_FILES += java_props_macosx.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   205
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   206
	BUILD_LIBJAVA_java_props_md.c_CFLAGS:=-x objective-c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   207
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   208
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   209
ifeq ($(OPENJDK_TARGET_OS),windows)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   210
        LIBJAVA_EXCLUDE_FILES += \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   211
		UNIXProcess_md.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   212
		UnixFileSystem_md.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   213
		FileSystemPreferences.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   214
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   215
	LIBJAVA_EXCLUDE_FILES += \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   216
		ProcessImpl_md.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   217
		WinNTFileSystem_md.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   218
		dirent_md.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   219
		WindowsPreferences.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   220
		sun/security/provider/WinCAPISeedGenerator.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   221
		sun/io/Win32ErrorMode.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   222
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   223
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   224
ifeq ($(OPENJDK_TARGET_OS), solaris)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   225
    ifneq ($(OPENJDK_TARGET_CPU), x86_64)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   226
        LIBJAVA_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   227
    endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   228
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   229
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   230
$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   231
		LIBRARY:=java,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   232
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   233
		SRC:=$(LIBJAVA_SRC_DIRS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   234
		EXCLUDES:=fdlibm/src zip, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   235
		EXCLUDE_FILES:=$(LIBJAVA_EXCLUDE_FILES), \
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   236
		LANG:=C,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   237
		OPTIMIZATION:=HIGH, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   238
		CFLAGS:=$(CFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   239
                        $(LIBJAVA_CFLAGS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   240
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjava/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   241
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   242
			 $(call SET_SHARED_LIBRARY_ORIGIN), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   243
		LDFLAGS_SUFFIX_posix:=-ljvm -lverify, \
14526
a9ff17998eb7 8003528: build-infra: Diffs in libjava and hotspot libs on solaris.
erikj
parents: 14525
diff changeset
   244
		LDFLAGS_SUFFIX_solaris:=-lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   245
		LDFLAGS_SUFFIX_linux:=$(LIBDL) $(BUILD_LIBFDLIBM),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   246
		LDFLAGS_SUFFIX_macosx:=-L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   247
                                         -framework CoreFoundation \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   248
                                         -framework Security -framework SystemConfiguration, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   249
		LDFLAGS_SUFFIX_windows:=-export:winFileHandleOpen -export:handleLseek \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   250
					jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   251
					shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   252
					advapi32.lib,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   253
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   254
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   255
			  -D "JDK_FNAME=java.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   256
			  -D "JDK_INTERNAL_NAME=java" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   257
			  -D "JDK_FTYPE=0x2L",\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   258
		REORDER:=$(LIBJAVA_REORDER), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   259
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjava,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   260
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   261
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   262
BUILD_LIBRARIES += $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   263
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   264
$(BUILD_LIBJAVA) : $(LIBJLI_BINARY)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   265
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   266
$(BUILD_LIBJAVA) : $(BUILD_LIBVERIFY)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   267
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   268
$(BUILD_LIBJAVA) : $(BUILD_LIBFDLIBM)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   269
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   270
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   271
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   272
BUILD_LIBMLIB_SRC:=$(JDK_TOPDIR)/src/share/native/sun/awt/medialib
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   273
BUILD_LIBMLIB_CFLAGS:=-D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   274
			-I$(BUILD_LIBMLIB_SRC) \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   275
			-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/medialib 
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   276
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   277
BUILD_LIBMLIB_LDLIBS:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   278
BUILD_LIBMLIB_IMAGE_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libmlib_image/mapfile-vers
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   279
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   280
BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   281
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   282
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   283
	BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   284
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   285
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   286
ifneq ($(OPENJDK_TARGET_OS), windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   287
	BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   288
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   289
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   290
$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   291
		LIBRARY:=mlib_image,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   292
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   293
                SRC:=$(BUILD_LIBMLIB_SRC),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   294
		EXCLUDE_FILES:=awt_ImagingLib.c mlib_c_ImageBlendTable.c,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   295
		LANG:=C,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   296
		OPTIMIZATION:=HIGHEST, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   297
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   298
                        $(BUILD_LIBMLIB_CFLAGS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   299
		MAPFILE:=$(BUILD_LIBMLIB_IMAGE_MAPFILE), \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   300
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   301
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   302
		LDFLAGS_SUFFIX:=$(BUILD_LIBMLIB_LDLIBS) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   303
				$(LDFLAGS_JDKLIB_SUFFIX),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
   304
		LDFLAGS_SUFFIX_solaris:=-lc, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   305
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   306
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   307
			  -D "JDK_FNAME=mlib_image.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   308
			  -D "JDK_INTERNAL_NAME=mlib_image" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   309
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   310
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmlib_image,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   311
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   312
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   313
$(BUILD_LIBMLIB_IMAGE) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   314
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   315
BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   316
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   317
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   318
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   319
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH),solaris-sparc)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   320
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   321
BUILD_LIBMLIB_IMAGE_V_FILES:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   322
        mlib_v_ImageLookUp.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   323
        mlib_ImageCreate.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   324
        mlib_ImageAffine.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   325
        mlib_ImageConvMxN.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   326
        mlib_ImageConvKernelConvert.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   327
        mlib_sys.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   328
        mlib_ImageLookUp_64.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   329
        mlib_ImageLookUp_Bit.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   330
        mlib_ImageColorTrue2Index.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   331
        mlib_c_ImageThresh1_U8.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   332
        mlib_v_ImageLookUpS16S16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   333
        mlib_v_ImageLookUpS16S32Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   334
        mlib_v_ImageLookUpS16U16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   335
        mlib_v_ImageLookUpS16U8Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   336
        mlib_v_ImageLookUpS32S16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   337
        mlib_v_ImageLookUpS32S32Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   338
        mlib_v_ImageLookUpS32U16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   339
        mlib_v_ImageLookUpS32U8Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   340
        mlib_v_ImageLookUpSIS16S16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   341
        mlib_v_ImageLookUpSIS16S32Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   342
        mlib_v_ImageLookUpSIS16U16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   343
        mlib_v_ImageLookUpSIS16U8Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   344
        mlib_v_ImageLookUpSIS32S16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   345
        mlib_v_ImageLookUpSIS32S32Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   346
        mlib_v_ImageLookUpSIS32U16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   347
        mlib_v_ImageLookUpSIS32U8Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   348
        mlib_v_ImageLookUpSIU16S16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   349
        mlib_v_ImageLookUpSIU16S32Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   350
        mlib_v_ImageLookUpSIU16U16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   351
        mlib_v_ImageLookUpSIU16U8Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   352
        mlib_v_ImageLookUpSIU8S16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   353
        mlib_v_ImageLookUpSIU8S32Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   354
        mlib_v_ImageLookUpSIU8U16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   355
        mlib_v_ImageLookUpSIU8U8Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   356
        mlib_v_ImageLookUpU16S16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   357
        mlib_v_ImageLookUpU16S32Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   358
        mlib_v_ImageLookUpU16U16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   359
        mlib_v_ImageLookUpU16U8Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   360
        mlib_v_ImageLookUpU8S16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   361
        mlib_v_ImageLookUpU8S32Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   362
        mlib_v_ImageLookUpU8U16Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   363
        mlib_v_ImageLookUpU8U8Func.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   364
        mlib_v_ImageAffineIndex_BC.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   365
        mlib_v_ImageAffine_BC.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   366
        mlib_v_ImageAffine_BC_S16.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   367
        mlib_v_ImageAffine_BC_U16.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   368
        mlib_v_ImageAffine_BL.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   369
        mlib_v_ImageAffine_BL_S16.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   370
        mlib_v_ImageAffine_BL_U16.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   371
        mlib_v_ImageAffine_NN.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   372
        mlib_v_ImageFilters.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   373
        mlib_ImageAffineEdge.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   374
        mlib_ImageAffine_BC_D64.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   375
        mlib_ImageAffine_BC_F32.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   376
        mlib_ImageAffine_BC_S32.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   377
        mlib_ImageAffine_BL_D64.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   378
        mlib_ImageAffine_BL_F32.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   379
        mlib_ImageAffine_BL_S32.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   380
        mlib_ImageAffine_NN.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   381
        mlib_ImageAffine_NN_Bit.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   382
        mlib_ImageFilters.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   383
        mlib_ImageScanPoly.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   384
        mlib_ImageConv_8nw.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   385
        mlib_ImageConv_8ext.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   386
        mlib_ImageConv_16nw.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   387
        mlib_ImageConv_16ext.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   388
        mlib_ImageConv_u16nw.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   389
        mlib_ImageConv_u16ext.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   390
        mlib_ImageConv_32nw.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   391
        mlib_ImageConv_F32nw.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   392
        mlib_ImageConvMxN_Fp.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   393
        mlib_ImageConvMxN_ext.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   394
        mlib_ImageConv_D64nw.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   395
        mlib_ImageClipping.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   396
        mlib_ImageConvCopyEdge_Bit.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   397
        mlib_ImageConvClearEdge_Bit.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   398
        mlib_ImageConv2x2_f.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   399
        mlib_ImageConvClearEdge_Fp.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   400
        mlib_v_ImageConvMxN_8.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   401
        mlib_v_ImageConvClearEdge.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   402
        mlib_v_ImageConvCopyEdge.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   403
        mlib_v_ImageConvMxN_8ext.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   404
        mlib_v_ImageConvVersion.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   405
        mlib_v_ImageConv_8nw.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   406
        mlib_ImageConvCopyEdge_Fp.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   407
        mlib_v_ImageChannelInsert_1.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   408
        mlib_v_ImageChannelExtract_43.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   409
        mlib_v_ImageChannelExtract_1.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   410
        mlib_ImageCopy_Bit.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   411
        mlib_v_ImageCopy_f.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   412
        mlib_ImageUtils.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   413
        mlib_ImageDivTables.c
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   414
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   415
BUILD_LIBMLIB_V_CFLAGS := $(filter-out -DMLIB_NO_LIBSUNMATH,$(BUILD_LIBMLIB_CFLAGS))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   416
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   417
$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   418
		LIBRARY:=mlib_image_v, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   419
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   420
                SRC:=$(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   421
		     $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   422
		LANG:=C,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   423
		INCLUDE_FILES:=$(BUILD_LIBMLIB_IMAGE_V_FILES),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   424
		OPTIMIZATION:=HIGHEST, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   425
		CFLAGS:=-xarch=sparcvis \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   426
                      $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   427
                      $(BUILD_LIBMLIB_V_CFLAGS) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   428
                      $(CFLAGS_JDKLIB), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   429
		MAPFILE:=$(BUILD_LIBMLIB_IMAGE_MAPFILE), \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   430
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   431
                         $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   432
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
   433
		LDFLAGS_SUFFIX_solaris:=-lc,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   434
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmlib_image_v))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   435
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   436
$(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   437
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   438
BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   439
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   440
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   441
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   442
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   443
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   444
LIBAWT_DIRS:=\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   445
	$(JDK_TOPDIR)/src/share/native/sun/awt \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   446
	$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   447
	$(JDK_TOPDIR)/src/share/native/sun/awt/image \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   448
	$(JDK_TOPDIR)/src/share/native/sun/awt/image/gif \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   449
	$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   450
	$(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   451
	$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   452
	$(JDK_TOPDIR)/src/share/native/sun/awt/utility \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   453
	$(JDK_TOPDIR)/src/share/native/sun/java2d \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   454
	$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   455
	$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   456
	$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   457
	$(JDK_TOPDIR)/src/share/native/sun/awt/image \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   458
	$(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   459
	$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   460
	$(JDK_TOPDIR)/src/share/native/sun/font
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   461
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   462
ifeq ($(OPENJDK_TARGET_OS),windows)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   463
    LIBAWT_DIRS+=\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   464
	$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   465
	$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   466
	$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d
15883
f57291ffafbf 8008073: build-infra: Need --with-dxsdk option? And awt/sound -I option additions?
erikj
parents: 15676
diff changeset
   467
    LIBAWT_CFLAGS+=-I$(DXSDK_INCLUDE_PATH)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   468
else
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   469
    LIBAWT_DIRS+=\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   470
	$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   471
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   472
15883
f57291ffafbf 8008073: build-infra: Need --with-dxsdk option? And awt/sound -I option additions?
erikj
parents: 15676
diff changeset
   473
LIBAWT_CFLAGS+=-D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   474
	$(X_CFLAGS) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   475
	$(foreach dir,$(LIBAWT_DIRS),-I$(dir))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   476
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   477
LIBAWT_FILES:=\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   478
	gifdecoder.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   479
	imageInitIDs.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   480
	img_globals.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   481
	SurfaceData.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   482
	Region.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   483
	BufImgSurfaceData.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   484
	Disposer.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   485
	Trace.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   486
	GraphicsPrimitiveMgr.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   487
	Blit.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   488
	BlitBg.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   489
	ScaledBlit.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   490
	FillRect.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   491
	FillSpans.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   492
	FillParallelogram.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   493
	DrawParallelogram.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   494
	DrawLine.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   495
	DrawRect.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   496
	DrawPolygons.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   497
	DrawPath.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   498
	FillPath.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   499
	ProcessPath.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   500
	MaskBlit.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   501
	MaskFill.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   502
	TransformHelper.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   503
	AlphaMath.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   504
	AlphaMacros.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   505
	AnyByte.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   506
	ByteBinary1Bit.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   507
	ByteBinary2Bit.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   508
	ByteBinary4Bit.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   509
	ByteIndexed.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   510
	ByteGray.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   511
	Index8Gray.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   512
	Index12Gray.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   513
	AnyShort.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   514
	Ushort555Rgb.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   515
	Ushort565Rgb.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   516
	Ushort4444Argb.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   517
	Ushort555Rgbx.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   518
	UshortGray.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   519
	UshortIndexed.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   520
	Any3Byte.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   521
	ThreeByteBgr.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   522
	AnyInt.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   523
	IntArgb.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   524
	IntArgbPre.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   525
	IntArgbBm.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   526
	IntRgb.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   527
	IntBgr.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   528
	IntRgbx.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   529
	Any4Byte.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   530
	FourByteAbgr.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   531
	FourByteAbgrPre.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   532
	BufferedMaskBlit.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   533
	BufferedRenderPipe.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   534
	ShapeSpanIterator.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   535
	SpanClipRenderer.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   536
	awt_ImageRep.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   537
	awt_ImagingLib.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   538
	awt_Mlib.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   539
	awt_parseImage.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   540
	DataBufferNative.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   541
	dither.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   542
	debug_assert.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   543
	debug_mem.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   544
	debug_trace.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   545
	debug_util.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   546
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   547
ifneq (,$(filter $(OPENJDK_TARGET_OS), solaris linux))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   548
	LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   549
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   550
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   551
ifeq ($(OPENJDK_TARGET_OS),macosx)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   552
	LIBAWT_FILES += awt_LoadLibrary.c img_colors.c
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   553
	LIBAWT_DIRS += $(JDK_TOPDIR)/src/macosx/native/com/apple/resources
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   554
	LIBAWT_FILES += awt_LoadLibrary.c MacOSXResourceBundle.m
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   555
	LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   556
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   557
	LIBAWT_MacOSXResourceBundle.m_CFLAGS:=-O0
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   558
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   559
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   560
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   561
        LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   562
        LIBAWT_CFLAGS += -xarch=sparcvis
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   563
	LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   564
        LIBAWT_CFLAGS += \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   565
            -I$(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   566
            -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/medialib \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   567
            -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   568
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   569
	LIBAWT_DIRS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   570
                       $(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   571
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   572
	LIBAWT_FILES += \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   573
                vis_FuncArray.c           \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   574
                java2d_Mlib.c             \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   575
                mlib_ImageCreate.c        \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   576
                mlib_ImageZoom_NN.c       \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   577
                mlib_ImageCopy_Bit.c      \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   578
                mlib_sys.c                \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   579
                mlib_v_ImageClear.c       \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   580
                mlib_v_ImageClear_f.c     \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   581
                mlib_v_ImageConstXor.c    \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   582
                mlib_v_ImageCopy.c        \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   583
                mlib_v_ImageCopy_f.c      \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   584
                mlib_v_ImageXor.c         \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   585
                mlib_v_ImageZoom_NN_f.c   \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   586
                vis_Interp.c              \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   587
                vis_AlphaMacros.c         \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   588
                vis_AlphaMaskBlit.c       \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   589
                vis_AlphaMaskFill.c       \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   590
                vis_ByteGray.c            \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   591
                vis_ByteGray_FromRgb.c    \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   592
                vis_ByteGray_Mask.c       \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   593
                vis_ByteIndexed.c         \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   594
                vis_DrawLine.c            \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   595
                vis_FourByteAbgr.c        \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   596
                vis_IntArgb.c             \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   597
                vis_IntArgbPre.c          \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   598
                vis_IntArgbPre_Mask.c     \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   599
                vis_IntBgr.c              \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   600
                vis_IntRgb.c              \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   601
                vis_IntRgbx.c             \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   602
                vis_SrcMaskFill.c         \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   603
                vis_SrcOverMaskBlit.c     \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   604
                vis_SrcOverMaskFill.c     \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   605
                vis_FourByteAbgrPre.c     \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   606
                vis_GlyphList.c           \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   607
                vis_GlyphListXor.c        \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   608
                vis_IntArgbBm.c           \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   609
                vis_ThreeByteBgr.c        \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   610
                vis_UshortGray.c          \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   611
                vis_UshortGray_FromRgb.c  \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   612
                vis_XorBlit.c             \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   613
                mlib_v_ImageCopy_blk.s
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   614
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   615
	ifeq ($(OPENJDK_TARGET_CPU),sparcv9)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   616
		LIBAWT_ASFLAGS=-P -xarch=v9a
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   617
	else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   618
		LIBAWT_ASFLAGS=-P -xarch=v8plusa
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   619
	endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   620
else
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   621
	LIBAWT_FILES += MapAccelFunc.c
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   622
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   623
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   624
ifneq ($(OPENJDK_TARGET_OS),solaris)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   625
	LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   626
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   627
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   628
LIBAWT_LANG:=C
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   629
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   630
ifeq ($(OPENJDK_TARGET_OS),windows)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   631
	LIBAWT_FILES += AccelGlyphCache.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   632
			ShaderList.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   633
			CmdIDList.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   634
			Hashtable.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   635
			GDIHashtable.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   636
			Devices.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   637
			ObjectList.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   638
			GDIBlitLoops.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   639
			GDIRenderer.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   640
			GDIWindowSurfaceData.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   641
			WindowsFlags.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   642
			WPrinterJob.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   643
			awt_%.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   644
			D3DBlitLoops.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   645
			D3DBufImgOps.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   646
			D3DContext.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   647
			D3DGlyphCache.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   648
			D3DGraphicsDevice.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   649
			D3DMaskBlit.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   650
			D3DMaskCache.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   651
			D3DMaskFill.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   652
			D3DPipelineManager.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   653
			D3DPaints.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   654
			D3DRenderer.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   655
			D3DRenderQueue.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   656
			D3DResourceManager.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   657
			D3DSurfaceData.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   658
			D3DTextRenderer.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   659
			D3DVertexCacher.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   660
			ShellFolder2.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   661
			ThemeReader.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   662
			ComCtl32Util.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   663
			DllUtil.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   664
			initIDs.cpp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   665
			MouseInfo.cpp \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   666
			rect.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   667
			OGLBlitLoops.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   668
			OGLBufImgOps.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   669
		        OGLContext.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   670
		        OGLFuncs.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   671
		        OGLMaskBlit.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   672
		        OGLMaskFill.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   673
		        OGLPaints.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   674
		        OGLRenderQueue.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   675
		        OGLRenderer.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   676
		        OGLSurfaceData.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   677
		        OGLTextRenderer.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   678
		        OGLVertexCache.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   679
		        WGLGraphicsConfig.c \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   680
		        WGLSurfaceData.c
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   681
	LIBAWT_LANG:=C++
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   682
	LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   683
	ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   684
		LIBAWT_CFLAGS += -DMLIB_OS64BIT
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   685
	endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   686
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   687
	ifdef OPENJDK
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   688
		LIBAWT_RC_FLAGS:=-i "$(JDK_TOPDIR)/src/windows/resource/icons"
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   689
	else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   690
		LIBAWT_RC_FLAGS:=-i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   691
	endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   692
	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
   693
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   694
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   695
ifeq ($(MILESTONE), internal)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   696
	LIBAWT_CFLAGS += -DINTERNAL_BUILD
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   697
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   698
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   699
LIBAWT_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libawt/mapfile-vers
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   700
ifeq ($(OPENJDK_TARGET_OS),linux)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   701
	LIBAWT_MAPFILE:=
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   702
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   703
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   704
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   705
		LIBRARY:=awt,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   706
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   707
		SRC:=$(LIBAWT_DIRS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   708
		INCLUDE_FILES:=$(LIBAWT_FILES),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   709
		LANG:=$(LIBAWT_LANG),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   710
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   711
		CFLAGS:=$(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   712
		ASFLAGS:=$(LIBAWT_ASFLAGS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   713
		MAPFILE:=$(LIBAWT_MAPFILE), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   714
		LDFLAGS:=$(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   715
		LDFLAGS_solaris:=-R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   716
		LDFLAGS_SUFFIX_linux:=-ljvm $(LIBM) $(LIBDL) -ljava,\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
   717
		LDFLAGS_SUFFIX_solaris:=-ljvm $(LIBM) $(LIBDL) -ljava -lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   718
		LDFLAGS_SUFFIX_macosx:=-lmlib_image -ljvm $(LIBM) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   719
				       -framework Cocoa \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   720
				       -framework OpenGL \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   721
				       -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   722
				       -framework JavaNativeFoundation \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   723
				       -framework JavaRuntimeSupport \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   724
				       -framework ApplicationServices \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   725
				       -framework AudioToolbox \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   726
				       -ljava,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   727
		LDFLAGS_SUFFIX_windows:=kernel32.lib user32.lib gdi32.lib winspool.lib \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   728
					imm32.lib ole32.lib uuid.lib shell32.lib \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   729
					comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   730
					delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   731
					-DELAYLOAD:user32.dll -DELAYLOAD:gdi32.dll \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   732
					-DELAYLOAD:shell32.dll -DELAYLOAD:winmm.dll \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   733
					-DELAYLOAD:winspool.drv -DELAYLOAD:imm32.dll \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   734
					-DELAYLOAD:ole32.dll -DELAYLOAD:comdlg32.dll \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   735
					-DELAYLOAD:comctl32.dll -DELAYLOAD:shlwapi.dll,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   736
		VERSIONINFO_RESOURCE:=$(LIBAWT_VERSIONINFO_RESOURCE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   737
		RC_FLAGS:=$(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   738
			  -D "JDK_FNAME=awt.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   739
			  -D "JDK_INTERNAL_NAME=awt" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   740
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   741
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   742
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   743
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   744
$(BUILD_LIBAWT) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   745
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   746
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   747
$(BUILD_LIBAWT) : $(BUILD_LIBMLIB_IMAGE)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   748
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   749
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   750
BUILD_LIBRARIES += $(BUILD_LIBAWT)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   751
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   752
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   753
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   754
# TODO!!
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   755
# Even though this variable as a general name, it is
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   756
# only used on macos, in fontpath.c, as prefix for where to find fonts.
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   757
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   758
# It's used for libawt_headless _and_ libawt_xawt
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   759
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   760
X11_PATH:=/usr/X11R6
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   761
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   762
ifneq ($(OPENJDK_TARGET_OS), windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   763
ifndef BUILD_HEADLESS_ONLY
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   764
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   765
LIBAWT_XAWT_DIRS:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   766
		$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   767
		$(JDK_TOPDIR)/src/share/native/sun/awt/utility \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   768
		$(JDK_TOPDIR)/src/share/native/sun/font \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   769
		$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   770
		$(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   771
		$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   772
		$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   773
		$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   774
		$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   775
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   776
LIBAWT_XAWT_CFLAGS:=-DXAWT -DXAWT_HACK \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   777
        -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   778
	$(CUPS_CFLAGS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   779
	$(foreach dir,$(LIBAWT_XAWT_DIRS),-I$(dir)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   780
	-I$(JDK_TOPDIR)/src/share/native/sun/java2d \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   781
	-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   782
	-I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   783
	-I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   784
	-I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   785
	-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   786
	-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   787
	-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   788
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   789
ifeq ($(OPENJDK_TARGET_OS),solaris)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   790
	LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   791
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   792
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   793
ifeq ($(MILESTONE),internal)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   794
	LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   795
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   796
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   797
LIBAWT_XAWT_FILES:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   798
	XlibWrapper.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   799
	XWindow.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   800
	XToolkit.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   801
	X11Color.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   802
	X11SurfaceData.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   803
	awt_GraphicsEnv.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   804
	awt_InputMethod.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   805
	robot_common.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   806
	awt_Robot.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   807
        list.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   808
        multiVis.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   809
	initIDs.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   810
	awt_util.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   811
	awt_Desktop.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   812
	awt_UNIXToolkit.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   813
	X11FontScaler_md.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   814
	X11TextRenderer_md.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   815
	fontpath.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   816
	awt_Insets.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   817
	awt_Event.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   818
	X11Renderer.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   819
	X11PMBlitLoops.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   820
	OGLBlitLoops.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   821
	OGLBufImgOps.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   822
	OGLContext.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   823
	OGLFuncs.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   824
	OGLMaskBlit.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   825
	OGLMaskFill.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   826
	OGLPaints.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   827
	OGLRenderQueue.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   828
	OGLRenderer.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   829
	OGLSurfaceData.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   830
	OGLTextRenderer.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   831
	OGLVertexCache.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   832
	GLXGraphicsConfig.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   833
	GLXSurfaceData.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   834
	AccelGlyphCache.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   835
	awt_Font.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   836
	multi_font.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   837
	awt_AWTEvent.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   838
	awt_DrawingSurface.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   839
	jawt.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   840
	CUPSfuncs.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   841
	debug_assert.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   842
	debug_mem.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   843
	debug_trace.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   844
	debug_util.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   845
	awt_Plugin.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   846
	gtk2_interface.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   847
        swing_GTKEngine.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   848
        swing_GTKStyle.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   849
        rect.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   850
	sun_awt_X11_GtkFileDialogPeer.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   851
	XRSurfaceData.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   852
	XRBackendNative.c
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   853
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   854
LIBAWT_XAWT_LDFLAGS_SUFFIX:=$(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi  -ljava -ljvm -lc
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   855
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   856
ifeq ($(OPENJDK_TARGET_OS), linux)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   857
        # To match old build, add this to LDFLAGS instead of suffix.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   858
	LIBAWT_XAWT_LDFLAGS += -lpthread
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   859
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   860
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   861
ifeq ($(OPENJDK_TARGET_OS), macosx)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   862
	LIBAWT_XAWT_LDFLAGS_SUFFIX += -lpthread
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   863
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   864
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   865
# On macosx, the shared library origin is set twice for this lib.
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   866
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   867
		LIBRARY:=awt_xawt,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   868
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   869
		SRC:=$(LIBAWT_XAWT_DIRS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   870
		INCLUDE_FILES:=$(LIBAWT_XAWT_FILES),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   871
		LANG:=C,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   872
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   873
		CFLAGS:=$(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   874
                        $(X_CFLAGS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   875
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libawt_xawt/mapfile-vers, \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   876
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   877
			 $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   878
		LDFLAGS_linux:=$(call SET_SHARED_LIBRARY_ORIGIN) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   879
			       $(call SET_SHARED_LIBRARY_ORIGIN,/..),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   880
		LDFLAGS_solaris:=-L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   881
				 -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   882
				 -R$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   883
				 -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   884
				 -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   885
			 	 $(call SET_SHARED_LIBRARY_ORIGIN) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   886
			 	 $(call SET_SHARED_LIBRARY_ORIGIN,/..),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   887
		LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_ORIGIN) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   888
				$(call SET_SHARED_LIBRARY_ORIGIN). \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   889
				$(call SET_SHARED_LIBRARY_ORIGIN) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   890
				$(call SET_SHARED_LIBRARY_ORIGIN).,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   891
		LDFLAGS_SUFFIX:=$(LIBAWT_XAWT_LDFLAGS_SUFFIX),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   892
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   893
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   894
			  -D "JDK_FNAME=xawt.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   895
			  -D "JDK_INTERNAL_NAME=xawt" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   896
			  -D "JDK_FTYPE=0x2L",\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   897
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_xawt))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   898
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   899
$(BUILD_LIBAWT_XAWT) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   900
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   901
$(BUILD_LIBAWT_XAWT) : $(BUILD_LIBAWT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   902
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   903
BUILD_LIBRARIES += $(BUILD_LIBAWT_XAWT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   904
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   905
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   906
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   907
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   908
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   909
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
   910
BUILD_LIBZIP_EXCLUDES :=
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   911
ifeq ($(USE_EXTERNAL_LIBZ),true)
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
   912
    LIBZ := -lz
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
   913
    LIBZIP_EXCLUDES += zlib-1.2.5
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   914
else
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
   915
    ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   916
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   917
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
   918
BUILD_LIBZIP_REORDER :=
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   919
ifeq ($(OPENJDK_TARGET_OS), solaris)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   920
    ifneq ($(OPENJDK_TARGET_CPU), x86_64)
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
   921
        BUILD_LIBZIP_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   922
    endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   923
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   924
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   925
ifeq ($(LIBZIP_CAN_USE_MMAP), true)
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
   926
     BUILD_LIBZIP_MMAP := -DUSE_MMAP
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   927
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   928
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   929
$(eval $(call SetupNativeCompilation,BUILD_LIBZIP,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   930
                LIBRARY:=zip,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   931
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   932
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   933
		OPTIMIZATION:=LOW, \
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
   934
		SRC:=$(JDK_TOPDIR)/src/share/native/java/util/zip,\
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
   935
		EXCLUDES:=$(LIBZIP_EXCLUDES),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   936
		CFLAGS:=$(CFLAGS_JDKLIB) \
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
   937
                        $(ZLIB_CPPFLAGS) \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   938
		        -I$(JDK_TOPDIR)/src/share/native/java/io \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   939
                        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   940
		CFLAGS_posix:=$(BUILD_LIBZIP_MMAP) -UDEBUG,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   941
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libzip/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   942
		REORDER:=$(BUILD_LIBZIP_REORDER), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   943
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   944
			 $(call SET_SHARED_LIBRARY_ORIGIN) \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   945
			 $(EXPORT_ZIP_FUNCS), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   946
		LDFLAGS_windows:=-export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   947
                                -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   948
                                $(WIN_JAVA_LIB),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   949
		LDFLAGS_SUFFIX_linux:=-ljvm -ljava $(LIBZ),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
   950
		LDFLAGS_SUFFIX_solaris:=-ljvm -ljava $(LIBZ) -lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   951
		LDFLAGS_SUFFIX_macosx:=$(LIBZ) -ljava -ljvm,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   952
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   953
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   954
			  -D "JDK_FNAME=zip.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   955
			  -D "JDK_INTERNAL_NAME=zip" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   956
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   957
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libzip,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   958
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   959
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   960
$(BUILD_LIBZIP) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   961
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   962
BUILD_LIBRARIES += $(BUILD_LIBZIP)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   963
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   964
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   965
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   966
$(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   967
		LIBRARY:=unpack, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   968
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   969
                SRC:=$(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   970
		EXCLUDE_FILES:=main.cpp,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   971
		LANG:=C++,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   972
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   973
		CFLAGS:=$(CXXFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   974
			 -DNO_ZLIB -DUNPACK_JNI -DFULL,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   975
		CFLAGS_release:=-DPRODUCT,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   976
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   977
		LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   978
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   979
		LDFLAGS_windows:=-map:$(JDK_OUTPUTDIR)/objs/unpack.map -debug \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   980
				jvm.lib $(WIN_JAVA_LIB),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   981
		LDFLAGS_SUFFIX_posix:=-ljvm $(LIBCXX) -ljava -lc,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   982
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libunpack,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   983
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   984
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   985
			  -D "JDK_FNAME=unpack.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   986
			  -D "JDK_INTERNAL_NAME=unpack" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   987
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   988
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   989
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   990
$(BUILD_LIBUNPACK) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   991
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   992
BUILD_LIBRARIES += $(BUILD_LIBUNPACK)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   993
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   994
ifeq ($(OPENJDK_TARGET_OS),windows)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   995
    $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.map: $(BUILD_LIBUNPACK)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   996
	$(ECHO) Copying $(@F)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   997
	$(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX),%.map,$<) $@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   998
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   999
    $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.pdb: $(BUILD_LIBUNPACK)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1000
	$(ECHO) Copying $(@F)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1001
	$(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX),%.pdb,$<) $@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1002
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1003
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1004
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1005
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1006
LIBATTACH_EXCLUDE_FILES:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1007
ifneq ($(OPENJDK_TARGET_OS),solaris)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1008
    LIBATTACH_EXCLUDE_FILES+=SolarisVirtualMachine.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1009
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1010
ifneq ($(OPENJDK_TARGET_OS),linux)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1011
    LIBATTACH_EXCLUDE_FILES+=LinuxVirtualMachine.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1012
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1013
ifneq ($(OPENJDK_TARGET_OS),macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1014
    LIBATTACH_EXCLUDE_FILES+=BsdVirtualMachine.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1015
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1016
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1017
$(eval $(call SetupNativeCompilation,BUILD_LIBATTACH,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1018
		LIBRARY:=attach, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1019
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1020
                SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tools/attach,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1021
		EXCLUDE_FILES:=$(LIBATTACH_EXCLUDE_FILES),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1022
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1023
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1024
		CFLAGS:=$(CFLAGS_JDKLIB),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1025
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1026
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1027
		RC_FLAGS:=$(RC_FLAGS) \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1028
			  -D "JDK_FNAME=attach.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1029
			  -D "JDK_INTERNAL_NAME=attach" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1030
			  -D "JDK_FTYPE=0x2L",\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1031
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1032
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1033
		LDFLAGS_solaris:=-ldoor,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1034
		LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1035
		LDFLAGS_SUFFIX_windows:=$(WIN_JAVA_LIB) advapi32.lib psapi.lib,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1036
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libattach,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1037
		DEBUG_SYMBOLS:=true))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1038
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1039
$(BUILD_LIBATTACH) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1040
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1041
BUILD_LIBRARIES += $(BUILD_LIBATTACH)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1042
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1043
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1044
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1045
$(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1046
		LIBRARY:=dt_socket,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1047
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1048
                SRC:=$(JDK_TOPDIR)/src/share/transport/socket \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1049
			$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1050
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1051
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1052
		CFLAGS:=$(CFLAGS_JDKLIB) -DUSE_MMAP \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1053
                        -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1054
                        -I$(JDK_TOPDIR)/src/share/transport/socket \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1055
		        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1056
                        -I$(JDK_TOPDIR)/src/share/back/export \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1057
                        -I$(JDK_TOPDIR)/src/share/back,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1058
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libdt_socket/mapfile-vers, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1059
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1060
			 $(call SET_SHARED_LIBRARY_ORIGIN), \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1061
		LDFLAGS_SUFFIX_linux:=-lpthread,\
14344
a5537423264b 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14235
diff changeset
  1062
		LDFLAGS_SUFFIX_solaris:=-lnsl -lsocket -lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1063
		LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1064
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1065
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1066
			  -D "JDK_FNAME=dt_socket.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1067
			  -D "JDK_INTERNAL_NAME=dt_socket" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1068
			  -D "JDK_FTYPE=0x2L",\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1069
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdt_socket,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1070
		DEBUG_SYMBOLS:=true))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1071
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1072
$(BUILD_LIBDT_SOCKET) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1073
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1074
BUILD_LIBRARIES += $(BUILD_LIBDT_SOCKET)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1075
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1076
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1077
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1078
ifeq ($(OPENJDK_TARGET_OS),windows)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1079
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1080
  $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SHMEM,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1081
		LIBRARY:=dt_shmem,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1082
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1083
                SRC:=$(JDK_TOPDIR)/src/share/native/com/sun/tools/jdi \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1084
			$(JDK_TOPDIR)/src/share/transport/shmem \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1085
			$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1086
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1087
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1088
		CFLAGS:=$(CFLAGS_JDKLIB) -DUSE_MMAP\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1089
                        -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1090
                        -I$(JDK_TOPDIR)/src/share/transport/shmem \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1091
		        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1092
                        -I$(JDK_TOPDIR)/src/share/back/export, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1093
		LDFLAGS:=$(LDFLAGS_JDKLIB),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1094
		LDFLAGS_windows:=-export:jdwpTransport_OnLoad,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1095
		LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1096
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1097
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1098
			  -D "JDK_FNAME=dt_shmem.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1099
			  -D "JDK_INTERNAL_NAME=dt_shmem" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1100
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1101
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdt_shmem,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1102
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1103
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1104
  BUILD_LIBRARIES += $(BUILD_LIBDT_SHMEM)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1105
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1106
endif # OPENJDK_TARGET_OS
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1107
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1108
##########################################################################################
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1109
# JDWP_LOGGING causes log messages to be compiled into the library.
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1110
$(eval $(call SetupNativeCompilation,BUILD_LIBJDWP,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1111
		LIBRARY:=jdwp, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1112
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1113
                SRC:=$(JDK_TOPDIR)/src/share/back $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1114
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1115
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1116
		CFLAGS:=$(CFLAGS_JDKLIB) -DJDWP_LOGGING\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1117
		 -I$(JDK_TOPDIR)/src/share/transport/export \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1118
                 -I$(JDK_TOPDIR)/src/share/back/export \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1119
                 -I$(JDK_TOPDIR)/src/share/npt \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1120
                 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1121
                 -I$(JDK_TOPDIR)/src/share/back \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1122
                 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1123
		 -I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1124
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjdwp/mapfile-vers, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1125
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1126
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1127
		LDFLAGS_SUFFIX_linux:=$(LIBDL),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  1128
		LDFLAGS_SUFFIX_solaris:=$(LIBDL) -lc,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1129
		LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1130
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1131
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1132
			  -D "JDK_FNAME=jdwp.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1133
			  -D "JDK_INTERNAL_NAME=jdwp" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1134
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1135
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjdwp,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1136
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1137
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1138
$(BUILD_LIBJDWP) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1139
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1140
BUILD_LIBRARIES += $(BUILD_LIBJDWP)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1141
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1142
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1143
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1144
LIBJAAS_MAPFILE:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1145
ifneq ($(OPENJDK_TARGET_OS),solaris)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1146
   LIBJAAS_EXCLUDE_FILES:=Solaris.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1147
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1148
   # only on solaris...wonder why
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1149
   LIBJAAS_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjaas/mapfile-vers
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1150
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1151
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1152
LIBJAAS_NAME:=jaas_unix
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1153
ifeq ($(OPENJDK_TARGET_OS), windows)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1154
     LIBJAAS_NAME:=jaas_nt
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1155
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1156
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1157
$(eval $(call SetupNativeCompilation,BUILD_LIBJAAS,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1158
		LIBRARY:=$(LIBJAAS_NAME),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1159
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1160
                SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/security/auth/module,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1161
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1162
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1163
		CFLAGS:=$(CFLAGS_JDKLIB),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1164
		MAPFILE:=$(LIBJAAS_MAPFILE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1165
		LDFLAGS:=$(filter-out -ljava,$(LDFLAGS_JDKLIB)) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1166
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1167
		LDFLAGS_windows:=netapi32.lib user32.lib mpr.lib advapi32.lib,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1168
		LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  1169
		LDFLAGS_SUFFIX_solaris:=-lc,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1170
		EXCLUDE_FILES:=$(LIBJAAS_EXCLUDE_FILES),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1171
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1172
		RC_FLAGS:=$(RC_FLAGS) \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1173
			  -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1174
			  -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1175
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1176
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjaas,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1177
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1178
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1179
$(BUILD_LIBJAAS) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1180
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1181
BUILD_LIBRARIES += $(BUILD_LIBJAAS)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1182
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1183
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1184
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1185
$(eval $(call SetupNativeCompilation,BUILD_LIBJSDT,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1186
		LIBRARY:=jsdt,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1187
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1188
                SRC:=$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1189
			$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tracing/dtrace,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1190
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1191
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1192
		CFLAGS:=$(CFLAGS_JDKLIB)\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1193
			-I$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1194
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjsdt/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1195
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1196
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1197
		LDFLAGS_SUFFIX_linux:=$(LIBDL),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1198
		LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX) $(LIBDL),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1199
		LDFLAGS_SUFFIX_macosx:=                         $(LIBDL),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  1200
		LDFLAGS_SUFFIX_solaris:=-lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1201
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1202
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1203
			  -D "JDK_FNAME=jsdt.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1204
			  -D "JDK_INTERNAL_NAME=jsdt" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1205
			  -D "JDK_FTYPE=0x2L",\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1206
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsdt, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1207
                DEBUG_SYMBOLS:=true))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1208
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1209
$(BUILD_LIBJSDT) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1210
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1211
BUILD_LIBRARIES += $(BUILD_LIBJSDT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1212
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1213
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1214
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1215
ifdef OPENJDK
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1216
    # TODO: Update awt lib path when awt is converted
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1217
    $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1218
                LIBRARY:=lcms,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1219
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  1220
                SRC:=$(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1221
		LANG:=C,\
15974
91b0e63e6e83 8005530: [lcms] Improve performance of ColorConverOp for default destinations
bae
parents: 15676
diff changeset
  1222
		OPTIMIZATION:=HIGHEST, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1223
		CFLAGS:=$(filter-out -xc99=%none,$(CFLAGS_JDKLIB)) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1224
			$(SHARED_LIBRARY_FLAGS) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1225
			-I$(JDK_TOPDIR)/src/share/native/sun/java2d \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1226
			-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1227
		CFLAGS_solaris:=-xc99=no_lib,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1228
		CFLAGS_windows:=-DCMS_IS_WINDOWS_,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1229
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/liblcms/mapfile-vers, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1230
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1231
                         $(call SET_SHARED_LIBRARY_ORIGIN), \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1232
		LDFLAGS_solaris:=/usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1233
		LDFLAGS_windows:=$(WIN_AWT_LIB) $(WIN_JAVA_LIB),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  1234
		LDFLAGS_SUFFIX_solaris:=-lawt -ljava -ljvm -lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1235
		LDFLAGS_SUFFIX_macosx:=$(LIBM) -lawt -ljava -ljvm,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1236
		LDFLAGS_SUFFIX_linux:=-lm -lawt -ljava -ljvm,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1237
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1238
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1239
			  -D "JDK_FNAME=lcms.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1240
			  -D "JDK_INTERNAL_NAME=lcms" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1241
			  -D "JDK_FTYPE=0x2L",\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1242
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms,\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1243
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1244
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1245
    BUILD_LIBRARIES += $(BUILD_LIBLCMS)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1246
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1247
    $(BUILD_LIBLCMS) : $(BUILD_LIBAWT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1248
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1249
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1250
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1251
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1252
ifdef OPENJDK
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1253
    BUILD_LIBJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1254
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1255
    BUILD_LIBJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1256
    BUILD_LIBJPEG_CLOSED_SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1257
    BUILD_LIBJPEG_CLOSED_INCLUDES:=-I$(BUILD_LIBJPEG_CLOSED_SRC)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1258
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1259
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1260
BUILD_LIBJPEG_REORDER:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1261
ifeq ($(OPENJDK_TARGET_OS), solaris)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1262
    ifneq ($(OPENJDK_TARGET_CPU), x86_64)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1263
        BUILD_LIBJPEG_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1264
    endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1265
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1266
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1267
# Suppress gcc warnings like "variable might be clobbered by 'longjmp'
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1268
# or 'vfork'": this warning indicates that some variable is placed to
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1269
# a register by optimized compiler and it's value might be lost on longjmp().
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1270
# Recommended way to avoid such warning is to declare the variable as
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1271
# volatile to prevent the optimization. However, this approach does not
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1272
# work because we have to declare all variables as volatile in result.
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1273
#ifndef CROSS_COMPILE_ARCH
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1274
#    CC_43_OR_NEWER:=\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1275
#        $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1276
#              \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1277
#    ifeq ($(CC_43_OR_NEWER),1)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1278
#        BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1279
#    endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1280
#endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1281
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1282
$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1283
                LIBRARY:=jpeg, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1284
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1285
                SRC:=$(BUILD_LIBJPEG_CLOSED_SRC) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1286
		     $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1287
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1288
		OPTIMIZATION:=HIGHEST, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1289
		CFLAGS:=$(CFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1290
			$(BUILD_LIBJPEG_CLOSED_INCLUDES) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1291
			-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1292
		MAPFILE:=$(BUILD_LIBJPEG_MAPFILE), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1293
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1294
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1295
		LDFLAGS_windows:=$(WIN_JAVA_LIB) jvm.lib,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1296
		LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1297
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1298
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1299
			  -D "JDK_FNAME=jpeg.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1300
			  -D "JDK_INTERNAL_NAME=jpeg" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1301
			  -D "JDK_FTYPE=0x2L",\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1302
		REORDER:=$(BUILD_LIBJPEG_REORDER),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1303
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjpeg,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1304
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1305
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1306
$(BUILD_LIBJPEG) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1307
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1308
BUILD_LIBRARIES += $(BUILD_LIBJPEG)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1309
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1310
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1311
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1312
ifndef OPENJDK
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1313
    FONT_HEADERS:=-I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1314
    BUILD_LIBFONTMANAGER_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1315
    LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1316
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1317
    FONT_HEADERS:=$(FREETYPE2_CFLAGS)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1318
    BUILD_LIBFONTMANAGER_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1319
    BUILD_LIBFONTMANAGER_FONTLIB:=$(FREETYPE2_LIBS)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1320
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1321
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1322
LIBFONTMANAGER_OPTIMIZATION:=HIGH
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1323
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1324
ifeq ($(OPENJDK_TARGET_OS),windows)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1325
    LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1326
				    X11TextRenderer.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1327
    LIBFONTMANAGER_OPTIMIZATION:=LOW
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1328
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1329
    LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1330
				    lcdglyph.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1331
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1332
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1333
BUILD_LIBFONTMANAGER_CFLAGS_COMMON:=\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1334
			$(X_CFLAGS) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1335
			-DLE_STANDALONE -DHEADLESS \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1336
			$(FONT_HEADERS) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1337
			-I$(JDK_TOPDIR)/src/share/native/sun/font \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1338
			-I$(JDK_TOPDIR)/src/share/native/sun/font/layout \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1339
			-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1340
			-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1341
			-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1342
			-I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1343
			-I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1344
			-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1345
			-I$(JDK_TOPDIR)/src/share/native/sun/java2d
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1346
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1347
# Turn off aliasing with GCC for ExtensionSubtables.cpp
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1348
ifeq ($(OPENJDK_TARGET_OS), linux)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1349
    BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS:=-fno-strict-aliasing
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1350
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1351
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1352
$(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1353
		LIBRARY:=fontmanager, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1354
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1355
                SRC:=$(JDK_TOPDIR)/src/share/native/sun/font\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1356
		     $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1357
		EXCLUDE_FILES:=$(LIBFONTMANAGER_EXCLUDE_FILES) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1358
			       AccelGlyphCache.c,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1359
		LANG:=C++,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1360
		CFLAGS:=$(CFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1361
		CXXFLAGS:=$(CXXFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1362
		OPTIMIZATION:=$(LIBFONTMANAGER_OPTIMIZATION), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1363
		CFLAGS_windows= -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1364
				-DCC_NOEX, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1365
		MAPFILE:=$(BUILD_LIBFONTMANAGER_MAPFILE), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1366
		LDFLAGS:=$(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1367
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1368
		LDFLAGS_SUFFIX:=$(BUILD_LIBFONTMANAGER_FONTLIB),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1369
		LDFLAGS_SUFFIX_linux:=-lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1370
		LDFLAGS_SUFFIX_solaris:=-lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1371
		LDFLAGS_SUFFIX_macosx:=-lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1372
				       -ljava -ljvm,\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1373
		LDFLAGS_SUFFIX_windows:=$(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1374
					$(WIN_AWT_LIB),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1375
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1376
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1377
			  -D "JDK_FNAME=fontmanager.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1378
			  -D "JDK_INTERNAL_NAME=fontmanager" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1379
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1380
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfontmanager,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1381
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1382
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1383
$(BUILD_LIBFONTMANAGER) : $(BUILD_LIBAWT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1384
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1385
ifneq (,$(findstring $(OPENJDK_TARGET_OS),solaris macosx))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1386
$(BUILD_LIBFONTMANAGER) : $(BUILD_LIBAWT_XAWT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1387
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1388
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1389
BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1390
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1391
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1392
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1393
ifndef OPENJDK
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1394
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1395
#    ifeq ($(OPENJDK_TARGET_OS), linux)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1396
#        ifeq ("$(CC_VER_MAJOR)", "3")
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1397
#            OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1398
#        endif                           
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1399
#    endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1400
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1401
# The resulting size of the t2k lib file is (at least on linux) dependant on the order of 
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1402
# the input .o files. Because of this the new build will differ in size to the old build.
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1403
    BUILD_LIBT2K_CFLAGS_COMMON:=-I$(JDK_TOPDIR)/src/share/native/sun/font \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1404
		            -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1405
		            -I$(JDK_TOPDIR)/src/closed/share/native/sun/font \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1406
		            -I$(JDK_TOPDIR)/src/share/share/native/sun/font \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1407
		            -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1408
		            -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1409
		            -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1410
		            -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1411
		            -I$(JDK_TOPDIR)/src/share/native/sun/java2d
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1412
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1413
    $(eval $(call SetupNativeCompilation,BUILD_LIBT2K,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1414
                LIBRARY:=t2k, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1415
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1416
                SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/font \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1417
		     $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1418
		     $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k/ttHints,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1419
		EXCLUDE_FILES:=orion.c,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1420
		LANG:=C++,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1421
		OPTIMIZATION:=HIGH, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1422
		CFLAGS:=$(CFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1423
		CXXFLAGS:=$(CXXFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1424
		CFLAGS_windows=-DCC_NOEX, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1425
		CXXFLAGS_windows=-DCC_NOEX, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1426
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libt2k/mapfile-vers, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1427
		LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1428
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1429
		LDFLAGS_windows:=user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1430
		LDFLAGS_SUFFIX_posix:=$(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1431
		LDFLAGS_SUFFIX_solaris:=-lawt -lawt_xawt,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1432
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1433
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1434
			  -D "JDK_FNAME=t2k.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1435
			  -D "JDK_INTERNAL_NAME=t2k" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1436
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1437
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libt2k,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1438
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1439
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1440
    # t2k is linked against fontmanager
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1441
    $(BUILD_LIBT2K) : $(BUILD_LIBFONTMANAGER)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1442
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1443
    BUILD_LIBRARIES += $(BUILD_LIBT2K)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1444
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1445
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1446
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1447
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1448
ifeq ($(OPENJDK_TARGET_OS), windows)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1449
    ifeq ($(OPENJDK_TARGET_CPU), x86)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1450
        KERNEL32_LIB:=kernel32.lib
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1451
    endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1452
    $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1453
                LIBRARY:=jawt, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1454
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1455
                SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1456
		INCLUDE_FILES:=jawt.cpp,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1457
		LANG:=C++,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1458
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1459
		CFLAGS:=$(CXXFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1460
			-EHsc -DUNICODE -D_UNICODE \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1461
			-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1462
		        -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1463
		        -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1464
			-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
15883
f57291ffafbf 8008073: build-infra: Need --with-dxsdk option? And awt/sound -I option additions?
erikj
parents: 15676
diff changeset
  1465
			-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
f57291ffafbf 8008073: build-infra: Need --with-dxsdk option? And awt/sound -I option additions?
erikj
parents: 15676
diff changeset
  1466
			-I$(DXSDK_INCLUDE_PATH), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1467
		LDFLAGS:=$(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1468
			 advapi32.lib $(WIN_AWT_LIB),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1469
		LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1470
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1471
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1472
			  -D "JDK_FNAME=jawt.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1473
			  -D "JDK_INTERNAL_NAME=jawt" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1474
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1475
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjawt,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1476
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1477
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1478
$(BUILD_LIBJAWT) : $(BUILD_LIBAWT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1479
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1480
$(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1481
	$(ECHO) Copying $(@F)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1482
	$(CP) $(JDK_OUTPUTDIR)/objs/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1483
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1484
BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1485
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1486
else # OPENJDK_TARGET_OS not windows
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1487
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1488
    JAWT_LIBS:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1489
    ifneq ($(OPENJDK_TARGET_OS), solaris)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1490
        JAWT_LIBS += -lawt
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1491
    endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1492
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1493
    ifndef BUILD_HEADLESS_ONLY
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1494
        JAWT_LIBS += -lawt_xawt
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1495
    else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1496
        JAWT_LIBS += -lawt_headless
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1497
        HEADLESS_CFLAG += -DHEADLESS
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1498
    endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1499
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1500
    JAWT_FILES:=jawt.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1501
    ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1502
	JAWT_FILES:=jawt.m
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1503
	JAWT_LIBS:=-lawt_lwawt
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1504
    endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1505
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1506
    $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1507
                LIBRARY:=jawt, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1508
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1509
                SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1510
                     $(JDK_TOPDIR)/src/macosx/native/sun/awt,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1511
		INCLUDE_FILES:=$(JAWT_FILES),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1512
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1513
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1514
		CFLAGS:=$(CFLAGS_JDKLIB), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1515
		CFLAGS_linux:=$(HEADLESS_CFLAG),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1516
		CFLAGS_macosx:=-I$(JDK_TOPDIR)/src/solaris/native/sun/awt ,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1517
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjawt/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1518
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1519
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1520
		LDFLAGS_solaris:=-L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1521
		LDFLAGS_SUFFIX_linux:=$(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1522
		LDFLAGS_SUFFIX_solaris:=$(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1523
		LDFLAGS_SUFFIX_macosx:=-Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1524
				       -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1525
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjawt))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1526
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1527
ifndef BUILD_HEADLESS_ONLY
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1528
$(BUILD_LIBJAWT) : $(BUILD_LIBAWT_XAWT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1529
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1530
$(BUILD_LIBJAWT) : $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1531
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1532
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1533
ifeq ($(OPENJDK_TARGET_OS),macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1534
$(BUILD_LIBJAWT) : $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1535
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1536
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1537
endif # OPENJDK_TARGET_OS
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1538
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1539
BUILD_LIBRARIES += $(BUILD_LIBJAWT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1540
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1541
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1542
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1543
LIBINSTRUMENT_SRC   :=$(JDK_TOPDIR)/src/share/instrument \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1544
                      $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1545
                      $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1546
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1547
LIBINSTRUMENT_FILES :=\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1548
	EncodingSupport.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1549
	EncodingSupport_md.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1550
	FileSystemSupport_md.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1551
	InstrumentationImplNativeMethods.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1552
	InvocationAdapter.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1553
	JarFacade.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1554
	JPLISAgent.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1555
	JPLISAssert.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1556
	JavaExceptions.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1557
	PathCharsValidator.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1558
	Reentrancy.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1559
	Utilities.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1560
	canonicalize_md.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1561
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1562
LIBINSTRUMENT_DIR   :=$(JDK_OUTPUTDIR)/objs/libinstrument
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1563
LIBINSTRUMENT_CFLAGS:=$(CFLAGS_JDKLIB) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1564
                      -I$(JDK_TOPDIR)/src/share/instrument \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1565
                      -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1566
                      -I$(JDK_TOPDIR)/src/share/bin
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1567
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1568
LIBINSTRUMENT_LDFLAGS:=
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1569
LIBINSTRUMENT_LDFLAGS_SUFFIX:=
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1570
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1571
ifeq ($(OPENJDK_TARGET_OS), windows)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1572
    LIBINSTRUMENT_LDFLAGS += $(JDK_OUTPUTDIR)/objs/jli_static.lib $(WIN_JAVA_LIB) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1573
				 -export:Agent_OnAttach advapi32.lib
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1574
    # Statically link the C runtime so that there are not dependencies on modules 
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1575
    # not on the search patch when invoked from the Windows system directory 
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1576
    # (or elsewhere).
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1577
    LIBINSTRUMENT_CFLAGS := $(filter-out -MD,$(LIBINSTRUMENT_CFLAGS))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1578
    # equivalent of strcasecmp is stricmp on Windows
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1579
    LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1580
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1581
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1582
$(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1583
		LIBRARY:=instrument, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1584
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1585
		SRC:=$(LIBINSTRUMENT_SRC),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1586
		INCLUDE_FILES:=$(LIBINSTRUMENT_FILES),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1587
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1588
		OPTIMIZATION:=LOW, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1589
		CFLAGS:=$(LIBINSTRUMENT_CFLAGS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1590
		CFLAGS_debug:=-DJPLIS_LOGGING,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1591
		CFLAGS_release:=-DNO_JPLIS_LOGGING,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1592
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libinstrument/mapfile-vers, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1593
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1594
			 $(call SET_SHARED_LIBRARY_ORIGIN) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1595
                         $(LIBINSTRUMENT_LDFLAGS),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1596
		LDFLAGS_linux:=$(call SET_SHARED_LIBRARY_ORIGIN,/jli),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1597
		LDFLAGS_solaris:= $(call SET_SHARED_LIBRARY_ORIGIN,/jli),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1598
		LDFLAGS_macosx:=-Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1599
				-framework Cocoa -framework Security -framework ApplicationServices,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1600
		LDFLAGS_SUFFIX:=$(LIBINSTRUMENT_LDFLAGS_SUFFIX),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1601
		LDFLAGS_SUFFIX_macosx:=-liconv $(LIBZ),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  1602
		LDFLAGS_SUFFIX_solaris:=$(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1603
		LDFLAGS_SUFFIX_linux:=$(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1604
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1605
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1606
			  -D "JDK_FNAME=instrument.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1607
			  -D "JDK_INTERNAL_NAME=instrument" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1608
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1609
		OBJECT_DIR:=$(LIBINSTRUMENT_DIR),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1610
		DEBUG_SYMBOLS:=true))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1611
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1612
ifneq (,$(findstring $(OPENJDK_TARGET_OS), macosx windows))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1613
$(BUILD_LIBINSTRUMENT) : $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1614
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1615
$(BUILD_LIBINSTRUMENT) : $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1616
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1617
$(BUILD_LIBINSTRUMENT) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1618
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1619
BUILD_LIBRARIES += $(BUILD_LIBINSTRUMENT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1620
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1621
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1622
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1623
BUILD_LIBMANAGEMENT_SRC:=$(JDK_TOPDIR)/src/share/native/sun/management \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1624
                           $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/management \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1625
                           $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/management
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1626
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1627
BUILD_LIBMANAGEMENT_EXCLUDES:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1628
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1629
BUILD_LIBMANAGEMENT_CFLAGS:=-I$(JDK_TOPDIR)/src/share/native/sun/management
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1630
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1631
ifneq ($(OPENJDK_TARGET_OS), windows)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1632
	BUILD_LIBMANAGEMENT_EXCLUDES += OperatingSystem_md.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1633
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1634
	BUILD_LIBMANAGEMENT_EXCLUDES += UnixOperatingSystem_md.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1635
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1636
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1637
ifneq ($(OPENJDK_TARGET_OS),solaris)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1638
	BUILD_LIBMANAGEMENT_EXCLUDES += SolarisOperatingSystem.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1639
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1640
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1641
ifneq ($(OPENJDK_TARGET_OS),linux)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1642
	BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1643
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1644
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1645
ifneq ($(OPENJDK_TARGET_OS),macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1646
	BUILD_LIBMANAGEMENT_EXCLUDES += MacosxOperatingSystem.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1647
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1648
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1649
LIBMANAGEMENT_OPTIMIZATION:=HIGH
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1650
ifneq ($(findstring $(OPENJDK_TARGET_OS),solaris linux),)
14707
511b222f99b2 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14706
diff changeset
  1651
    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1652
        LIBMANAGEMENT_OPTIMIZATION:=LOW
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1653
    endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1654
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1655
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1656
$(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1657
		LIBRARY:=management,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1658
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1659
		SRC:=$(BUILD_LIBMANAGEMENT_SRC),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1660
		EXCLUDE_FILES:=$(BUILD_LIBMANAGEMENT_EXCLUDES),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1661
		LANG:=C,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1662
		OPTIMIZATION:=$(LIBMANAGEMENT_OPTIMIZATION), \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1663
		CFLAGS:=$(CFLAGS_JDKLIB) $(BUILD_LIBMANAGEMENT_CFLAGS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1664
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libmanagement/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1665
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1666
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1667
		LDFLAGS_solaris:=-lkstat,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1668
		LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1669
		LDFLAGS_SUFFIX_windows:=jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1670
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1671
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1672
			  -D "JDK_FNAME=management.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1673
			  -D "JDK_INTERNAL_NAME=management" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1674
			  -D "JDK_FTYPE=0x2L",\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1675
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmanagement,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1676
		DEBUG_SYMBOLS:=true))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1677
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1678
$(BUILD_LIBMANAGEMENT) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1679
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1680
BUILD_LIBRARIES += $(BUILD_LIBMANAGEMENT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1681
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1682
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1683
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1684
BUILD_LIBHPROF_SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/hprof $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/hprof
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1685
BUILD_LIBHPROF_CFLAGS:=-I$(JDK_TOPDIR)/src/share/demo/jvmti/hprof \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1686
                         -I$(JDK_TOPDIR)/src/share/npt \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1687
                         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1688
                         -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1689
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1690
BUILD_LIBHPROF_LDFLAGS:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1691
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1692
LIBHPROF_OPTIMIZATION:=HIGHEST
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1693
ifneq ($(findstring $(OPENJDK_TARGET_OS),solaris linux),)
14707
511b222f99b2 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14706
diff changeset
  1694
    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1695
        LIBHPROF_OPTIMIZATION:=LOW
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1696
    endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1697
endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1698
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1699
$(eval $(call SetupNativeCompilation,BUILD_LIBHPROF,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1700
		LIBRARY:=hprof, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1701
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1702
		SRC:=$(BUILD_LIBHPROF_SRC),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1703
		LANG:=C,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1704
		OPTIMIZATION:=$(LIBHPROF_OPTIMIZATION), \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1705
		CFLAGS:=$(CFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1706
                         $(BUILD_LIBHPROF_CFLAGS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1707
		CFLAGS_debug:=-DHPROF_LOGGING,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1708
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libhprof/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1709
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1710
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1711
		LDFLAGS_windows:=wsock32.lib winmm.lib advapi32.lib,\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  1712
		LDFLAGS_SUFFIX_linux:=$(LIBDL),\
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  1713
		LDFLAGS_SUFFIX_macosx:=$(LIBDL),\
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  1714
		LDFLAGS_SUFFIX_solaris:=-lsocket -lnsl $(LIBDL) -lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1715
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1716
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1717
			  -D "JDK_FNAME=hprof.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1718
			  -D "JDK_INTERNAL_NAME=hprof" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1719
			  -D "JDK_FTYPE=0x2L",\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1720
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libhprof_jvmti,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1721
		DEBUG_SYMBOLS:=true))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1722
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1723
BUILD_LIBRARIES += $(BUILD_LIBHPROF)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1724
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1725
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1726
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1727
$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA_CRW_DEMO,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1728
		LIBRARY:=java_crw_demo, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1729
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1730
		SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1731
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1732
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1733
		CFLAGS:=$(CFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1734
                        -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1735
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjava_crw_demo/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1736
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1737
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  1738
		LDFLAGS_SUFFIX_solaris:=-lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1739
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1740
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1741
			  -D "JDK_FNAME=java_crw_demo.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1742
			  -D "JDK_INTERNAL_NAME=java_crw_demo" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1743
			  -D "JDK_FTYPE=0x2L",\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1744
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjava_crw_demo,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1745
		DEBUG_SYMBOLS:=true))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1746
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1747
BUILD_LIBRARIES += $(BUILD_LIBJAVA_CRW_DEMO)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1748
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1749
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1750
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1751
$(eval $(call SetupNativeCompilation,BUILD_LIBNPT,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1752
		LIBRARY:=npt, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1753
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1754
		SRC:=$(JDK_TOPDIR)/src/share/npt $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1755
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1756
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1757
		CFLAGS:=$(CFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1758
                        -I$(JDK_TOPDIR)/src/share/npt \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1759
                        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1760
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libnpt/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1761
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1762
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1763
		LDFLAGS_macosx:=-liconv,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1764
		LDFLAGS_SUFFIX_windows:=-export:nptInitialize -export:nptTerminate,\
14344
a5537423264b 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14235
diff changeset
  1765
		LDFLAGS_SUFFIX_solaris:=-lc, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1766
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1767
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1768
			  -D "JDK_FNAME=npt.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1769
			  -D "JDK_INTERNAL_NAME=npt" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1770
			  -D "JDK_FTYPE=0x2L",\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1771
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnpt,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1772
		DEBUG_SYMBOLS:=true))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1773
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1774
BUILD_LIBRARIES += $(BUILD_LIBNPT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1775
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1776
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1777
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1778
LIBNET_SRC_DIRS:=$(JDK_TOPDIR)/src/share/native/java/net \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1779
                   $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1780
                   $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/dns \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1781
                   $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/spi
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1782
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1783
ifeq ($(OPENJDK_TARGET_OS),windows)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1784
    LIBNET_SRC_DIRS+=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/www/protocol/http/ntlm
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1785
else
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1786
    LIBNET_SRC_DIRS+=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/sdp
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1787
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1788
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1789
LIBNET_CFLAGS:=$(foreach dir,$(LIBNET_SRC_DIRS),-I$(dir))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1790
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1791
LIBNET_EXCLUDE_FILES:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1792
ifneq ($(OPENJDK_TARGET_OS),linux)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1793
	LIBNET_EXCLUDE_FILES += linux_close.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1794
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1795
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1796
ifneq ($(OPENJDK_TARGET_OS),macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1797
	LIBNET_EXCLUDE_FILES += bsd_close.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1798
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1799
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1800
ifeq ($(OPENJDK_TARGET_OS),windows)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1801
	LIBNET_EXCLUDE_FILES += PlainSocketImpl.c PlainDatagramSocketImpl.c SdpSupport.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1802
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1803
	LIBNET_EXCLUDE_FILES += TwoStacksPlainSocketImpl.c DualStackPlainSocketImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1804
                                TwoStacksPlainDatagramSocketImpl.c DualStackPlainDatagramSocketImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1805
				NTLMAuthSequence.c NetworkInterface_winXP.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1806
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1807
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1808
$(eval $(call SetupNativeCompilation,BUILD_LIBNET,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1809
		LIBRARY:=net,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1810
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1811
		SRC:=$(LIBNET_SRC_DIRS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1812
		EXCLUDE_FILES:=$(LIBNET_EXCLUDE_FILES), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1813
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1814
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1815
		CFLAGS:=$(CFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1816
                        $(LIBNET_CFLAGS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1817
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libnet/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1818
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1819
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1820
		LDFLAGS_SUFFIX_macosx:=-ljvm -ljava,\
14344
a5537423264b 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14235
diff changeset
  1821
		LDFLAGS_SUFFIX_solaris:=-ljvm -ljava -lnsl -lsocket $(LIBDL) -lc ,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1822
		LDFLAGS_SUFFIX_linux:=$(LIBDL) -ljvm -lpthread -ljava,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1823
		LDFLAGS_SUFFIX_windows:=ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1824
					delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1825
					-DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1826
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1827
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1828
			  -D "JDK_FNAME=net.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1829
			  -D "JDK_INTERNAL_NAME=net" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1830
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1831
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnet,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1832
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1833
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1834
$(BUILD_LIBNET) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1835
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1836
BUILD_LIBRARIES += $(BUILD_LIBNET)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1837
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1838
$(JDK_OUTPUTDIR)/lib/net.properties: $(JDK_TOPDIR)/src/share/lib/net.properties
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1839
	$(ECHO) $(LOG_INFO) Copying $(@F)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1840
	$(MKDIR) -p $(@D)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1841
	$(CP) $< $@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1842
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1843
COPY_FILES += $(JDK_OUTPUTDIR)/lib/net.properties
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1844
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1845
ifeq ($(OPENJDK_TARGET_OS), solaris)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1846
$(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template : $(JDK_TOPDIR)/src/${OPENJDK_TARGET_OS_API_DIR}/lib/sdp/sdp.conf.template
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1847
	$(ECHO) $(LOG_INFO) Copying $(@F)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1848
	$(MKDIR) -p $(@D)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1849
	$(CP) $< $@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1850
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1851
COPY_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1852
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1853
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1854
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1855
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1856
BUILD_LIBNIO_SRC:=\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1857
        $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/nio \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1858
	$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1859
	$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1860
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1861
BUILD_LIBNIO_CFLAGS:=\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1862
	-I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1863
	-I$(JDK_TOPDIR)/src/share/native/java/io \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1864
	-I$(JDK_TOPDIR)/src/share/native/java/net \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1865
        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1866
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1867
BUILD_LIBNIO_FILES:=\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1868
        DatagramChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1869
        DatagramDispatcher.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1870
	FileChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1871
	FileDispatcherImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1872
	FileKey.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1873
	IOUtil.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1874
        MappedByteBuffer.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1875
	Net.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1876
	ServerSocketChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1877
	SocketChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1878
	SocketDispatcher.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1879
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1880
ifeq ($(OPENJDK_TARGET_OS), windows)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1881
	BUILD_LIBNIO_FILES += \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1882
		Iocp.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1883
		RegistryFileTypeDetector.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1884
		WindowsAsynchronousFileChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1885
		WindowsAsynchronousServerSocketChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1886
		WindowsAsynchronousSocketChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1887
		WindowsNativeDispatcher.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1888
	        WindowsSelectorImpl.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1889
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1890
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1891
ifeq ($(OPENJDK_TARGET_OS), linux)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1892
	BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1893
	BUILD_LIBNIO_FILES += \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1894
		EPoll.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1895
		EPollArrayWrapper.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1896
		EPollPort.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1897
		InheritedChannel.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1898
		NativeThread.c \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1899
		PollArrayWrapper.c \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1900
		UnixAsynchronousServerSocketChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1901
		UnixAsynchronousSocketChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1902
		GnomeFileTypeDetector.c \
14702
111342b28e67 7142921: (fs) Files.probeContentType reports a MIME type of "text/plain" on Ubuntu 11.04
dxu
parents: 14526
diff changeset
  1903
		MagicFileTypeDetector.c \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1904
		LinuxNativeDispatcher.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1905
		LinuxWatchService.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1906
		UnixCopyFile.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1907
		UnixNativeDispatcher.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1908
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1909
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1910
ifeq ($(OPENJDK_TARGET_OS), macosx)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1911
	BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1912
	BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/macosx/native/sun/nio/ch
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1913
	BUILD_LIBNIO_FILES += \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1914
		InheritedChannel.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1915
		NativeThread.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1916
	        PollArrayWrapper.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1917
		UnixAsynchronousServerSocketChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1918
		UnixAsynchronousSocketChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1919
		BsdNativeDispatcher.c \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1920
		MacOSXNativeDispatcher.c \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1921
		UnixCopyFile.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1922
		UnixNativeDispatcher.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1923
		KQueue.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1924
		KQueuePort.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1925
		KQueueArrayWrapper.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1926
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1927
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1928
ifeq ($(OPENJDK_TARGET_OS), solaris)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1929
	BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1930
	BUILD_LIBNIO_FILES += \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1931
		DevPollArrayWrapper.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1932
		InheritedChannel.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1933
		NativeThread.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1934
		PollArrayWrapper.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1935
		SolarisEventPort.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1936
		UnixAsynchronousServerSocketChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1937
		UnixAsynchronousSocketChannelImpl.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1938
		GnomeFileTypeDetector.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1939
		SolarisNativeDispatcher.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1940
		SolarisWatchService.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1941
		UnixCopyFile.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1942
		UnixNativeDispatcher.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1943
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1944
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1945
$(eval $(call SetupNativeCompilation,BUILD_LIBNIO,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1946
		LIBRARY:=nio,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1947
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1948
		SRC:=$(BUILD_LIBNIO_SRC),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1949
		INCLUDE_FILES:=$(BUILD_LIBNIO_FILES), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1950
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1951
		OPTIMIZATION:=HIGH, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1952
		CFLAGS:=$(CFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1953
                        $(BUILD_LIBNIO_CFLAGS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1954
		MAPFILE:=$(BUILD_LIBNIO_MAPFILE), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1955
		LDFLAGS:=$(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1956
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1957
		LDFLAGS_SUFFIX_linux:=-ljava -lnet -lpthread $(LIBDL),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1958
		LDFLAGS_SUFFIX_solaris:=-ljvm -lsocket -lposix4 $(LIBDL) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1959
				        -lsendfile -ljava -lnet -lc,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1960
		LDFLAGS_SUFFIX_windows:=jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1961
					$(JDK_OUTPUTDIR)/objs/libnet/net.lib \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1962
                                        $(JDK_OUTPUTDIR)/objs/libjava/io_util.obj \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1963
		                        $(JDK_OUTPUTDIR)/objs/libjava/FileDescriptor_md.obj \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1964
					advapi32.lib,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1965
		LDFLAGS_SUFFIX_macosx:=-ljava -lnet -pthread -framework CoreFoundation,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1966
		LDFLAGS_SUFFIX:=,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1967
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1968
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1969
			  -D "JDK_FNAME=nio.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1970
			  -D "JDK_INTERNAL_NAME=nio" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  1971
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1972
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnio,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1973
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1974
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1975
BUILD_LIBRARIES += $(BUILD_LIBNIO)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1976
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1977
$(BUILD_LIBNIO) : $(BUILD_LIBNET)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1978
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1979
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1980
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1981
ifeq ($(OPENJDK_TARGET_OS_API),posix)
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  1982
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1983
  ifneq ($(OPENJDK_TARGET_OS),macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1984
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1985
    SCTP_WERROR := -Werror
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1986
    ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1987
      SCTP_WERROR :=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1988
    endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1989
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1990
    $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1991
                LIBRARY:=sctp,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1992
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  1993
                SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch/sctp,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1994
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1995
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1996
		CFLAGS:=$(CFLAGS_JDKLIB)\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1997
			-I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1998
			-I$(JDK_TOPDIR)/src/share/native/sun/nio/ch/sctp \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  1999
			-I$(JDK_TOPDIR)/src/share/native/java/net \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2000
			-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2001
			-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2002
		CFLAGS_linux:=$(SCTP_WERROR),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2003
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsctp/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2004
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2005
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2006
		LDFLAGS_SUFFIX_linux:=-lpthread $(LIBDL) -ljava -ljvm,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2007
		LDFLAGS_SUFFIX_posix:=-lnio -lnet,\
14344
a5537423264b 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14235
diff changeset
  2008
		LDFLAGS_SUFFIX_solaris:=-lsocket -ljava -ljvm -lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2009
		LDFLAGS_SUFFIX_macosx:=-ljava -ljvm,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2010
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsctp))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2011
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2012
    BUILD_LIBRARIES += $(BUILD_LIBSCTP)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2013
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2014
    $(BUILD_LIBSCTP) : $(BUILD_LIBNIO)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2015
  endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2016
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2017
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2018
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2019
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2020
BUILD_LIBJLI_SRC_DIRS:=$(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2021
LIBJLI_CFLAGS:=$(CFLAGS_JDKLIB) $(foreach dir,$(BUILD_LIBJLI_SRC_DIRS),-I$(dir))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2022
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2023
BUILD_LIBJLI_FILES:=\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2024
	java.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2025
	splashscreen_stubs.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2026
	parse_manifest.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2027
	version_comp.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2028
	wildcard.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2029
	jli_util.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2030
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2031
ifeq ($(JVM_VARIANT_ZERO), true)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2032
	ERGO_FAMILY:=zero
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2033
else
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2034
	ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2035
		ERGO_FAMILY:=i586
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2036
	else
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2037
		ERGO_FAMILY:=$(OPENJDK_TARGET_CPU_ARCH)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2038
	endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2039
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2040
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2041
ifeq ($(OPENJDK_TARGET_OS), macosx)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2042
	LIBJLI_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/bin
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2043
	BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/bin
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2044
	BUILD_LIBJLI_FILES += java_md_common.c java_md_macosx.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2045
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2046
	BUILD_LIBJLI_java_md_macosx.c_CFLAGS:=-x objective-c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2047
	BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS:=-x objective-c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2048
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2049
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2050
ifeq ($(OPENJDK_TARGET_OS), windows)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2051
	BUILD_LIBJLI_FILES += java_md.c \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2052
			      cmdtoargs.c
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2053
        # Staticically link with c runtime on windows.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2054
	LIBJLI_CFLAGS:=$(filter-out -MD,$(LIBJLI_CFLAGS))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2055
else ifneq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2056
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2057
	BUILD_LIBJLI_FILES += java_md_common.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2058
	BUILD_LIBJLI_FILES += java_md_solinux.c ergo.c 
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2059
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2060
	ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2061
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2062
        # if the architecture specific ergo file exists then
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2063
        # use it, else use the generic definitions from ergo.c
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2064
	ifneq ($(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(ERGO_ARCH_FILE)),)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2065
		BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2066
	else # !ERGO_ARCH_FILE
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2067
		LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2068
	endif # ERGO_ARCH_FILE
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2069
endif #WINDOWS
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2070
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2071
# Append defines depending on target platform
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2072
LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2073
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2074
ifeq ($(OPENJDK_TARGET_OS), macosx)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2075
	LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2076
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2077
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2078
ifneq ($(USE_EXTERNAL_LIBZ),true)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2079
	BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2080
	LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2081
	BUILD_LIBJLI_FILES += \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2082
		inflate.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2083
		inftrees.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2084
		inffast.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2085
		zadler32.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2086
		zcrc32.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2087
		zutil.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2088
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2089
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2090
ifeq ($(OPENJDK_TARGET_OS), windows)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2091
    LIBJLI_OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2092
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2093
    LIBJLI_OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE)/jli
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2094
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2095
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2096
$(eval $(call SetupNativeCompilation,BUILD_LIBJLI,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2097
		LIBRARY:=jli,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2098
                OUTPUT_DIR:=$(LIBJLI_OUTPUT_DIR),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2099
		SRC:=$(BUILD_LIBJLI_SRC_DIRS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2100
		INCLUDE_FILES:=$(BUILD_LIBJLI_FILES),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2101
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2102
		OPTIMIZATION:=HIGH, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2103
		CFLAGS:=$(LIBJLI_CFLAGS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2104
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjli/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2105
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2106
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2107
		LDFLAGS_linux:=$(call SET_SHARED_LIBRARY_ORIGIN,/..),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2108
		LDFLAGS_solaris:=$(call SET_SHARED_LIBRARY_ORIGIN,/..),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2109
		LDFLAGS_macosx:=-framework Cocoa -framework Security -framework ApplicationServices,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2110
		LDFLAGS_SUFFIX_solaris:=$(LIBZ) $(LIBDL) -lc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2111
		LDFLAGS_SUFFIX_linux:=$(LIBZ) $(LIBDL) -lc -lpthread,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2112
		LDFLAGS_SUFFIX_macosx:=$(LIBZ),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2113
		LDFLAGS_SUFFIX_windows:=\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2114
			-export:JLI_Launch \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2115
			-export:JLI_ManifestIterate \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2116
			-export:JLI_SetTraceLauncher \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2117
			-export:JLI_ReportErrorMessage \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2118
			-export:JLI_ReportErrorMessageSys \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2119
			-export:JLI_ReportMessage \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2120
			-export:JLI_ReportExceptionDescription \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2121
			-export:JLI_MemAlloc \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2122
			-export:JLI_CmdToArgs \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2123
			-export:JLI_GetStdArgc \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2124
			-export:JLI_GetStdArgs \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2125
			advapi32.lib \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2126
			comctl32.lib \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2127
			user32.lib,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2128
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2129
		RC_FLAGS:=$(RC_FLAGS) \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2130
			  -D "JDK_FNAME=jli.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2131
			  -D "JDK_INTERNAL_NAME=jli" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2132
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2133
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2134
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2135
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2136
BUILD_LIBRARIES += $(BUILD_LIBJLI)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2137
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2138
# On windows, the static library has the same suffix as the import library created by
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2139
# with the shared library, so the static library is given a different name. No harm
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2140
# in doing it for all platform to reduce complexity.
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2141
ifeq ($(OPENJDK_TARGET_OS), windows)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2142
    $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2143
		STATIC_LIBRARY:=jli_static,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2144
                OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2145
		SRC:=$(BUILD_LIBJLI_SRC_DIRS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2146
		INCLUDE_FILES:=$(BUILD_LIBJLI_FILES),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2147
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2148
		OPTIMIZATION:=HIGH, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2149
		CFLAGS:=$(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2150
		ARFLAGS:=$(ARFLAGS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2151
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli_static))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2152
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2153
BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2154
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2155
else ifeq ($(OPENJDK_TARGET_OS),macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2156
    #
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2157
    # On macosx they do partial (incremental) linking of libjli_static.a
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2158
    #   code it here...rather than add support to NativeCompilation
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2159
    #   as this is first time I see it
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2160
    $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2161
		LIBRARY:=jli_static, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2162
                OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2163
		SRC:=$(BUILD_LIBJLI_SRC_DIRS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2164
		INCLUDE_FILES:=$(BUILD_LIBJLI_FILES),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2165
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2166
		OPTIMIZATION:=HIGH, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2167
		CFLAGS:=$(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2168
		LDFLAGS:=-nostdlib -r,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2169
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli_static))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2170
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2171
$(JDK_OUTPUTDIR)/objs/libjli_static.a : $(BUILD_LIBJLI_STATIC)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2172
	$(CP) -a $< $@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2173
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2174
BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2175
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2176
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2177
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2178
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2179
ifndef OPENJDK
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2180
ifeq ($(ENABLE_JFR), true)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2181
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2182
$(eval $(call SetupNativeCompilation,BUILD_LIBJFR,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2183
		LIBRARY:=jfr,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2184
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2185
		SRC:=$(JDK_TOPDIR)/src/closed/share/native/oracle/jfr,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2186
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2187
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2188
		CFLAGS:=$(CFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2189
                        -I$(JDK_TOPDIR)/src/closed/share/javavm/export, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2190
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjfr/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2191
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2192
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
15676
291a66e841c2 8008294: build-infra: Build-infra closed fails on solaris 11.1
erikj
parents: 15334
diff changeset
  2193
		LDFLAGS_SUFFIX_solaris:=-lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2194
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2195
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2196
			  -D "JDK_FNAME=jfr.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2197
			  -D "JDK_INTERNAL_NAME=jfr" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2198
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2199
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjfr,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2200
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2201
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2202
BUILD_LIBRARIES += $(BUILD_LIBJFR)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2203
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2204
endif
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2205
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2206
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2207
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2208
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2209
ifndef OPENJDK
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2210
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2211
BUILD_LIBKCMS_EXCLUDE_FILES:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2212
ifeq ($(OPENJDK_TARGET_OS),windows)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2213
	BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2214
else
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2215
	BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2216
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2217
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2218
BUILD_LIBKCMS_FLAGS:=$(CFLAGS_JDKLIB)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2219
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2220
ifeq ($(OPENJDK_TARGET_OS),solaris)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2221
     # This particular library uses a feature called PIC_CODE_SMALL (on solaris)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2222
     #   implement it like this...since it's only used here
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2223
     BUILD_LIBKCMS_FLAGS:=$(patsubst -KPIC,-Kpic,$(BUILD_LIBKCMS_FLAGS))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2224
else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2225
     BUILD_LIBKCMS_FLAGS:=$(patsubst -fPIC,-fpic,$(BUILD_LIBKCMS_FLAGS))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2226
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2227
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2228
$(eval $(call SetupNativeCompilation,BUILD_LIBKCMS,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2229
		LIBRARY:=kcms,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2230
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2231
		SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2232
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2233
		EXCLUDE_FILES:=$(BUILD_LIBKCMS_EXCLUDE_FILES),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2234
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2235
		CFLAGS:=$(BUILD_LIBKCMS_FLAGS) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2236
                        -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2237
		CFLAGS_linux:=-Wno-missing-field-initializers,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2238
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libkcms/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2239
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2240
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2241
		LDFLAGS_SUFFIX_linux:=-lc -lpthread,\
15676
291a66e841c2 8008294: build-infra: Build-infra closed fails on solaris 11.1
erikj
parents: 15334
diff changeset
  2242
		LDFLAGS_SUFFIX_solaris:=-lc,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2243
		LDFLAGS_SUFFIX_windows:=$(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \
14706
0651f78051e0 8004104: build-infra: Minor cleanup
erikj
parents: 14526
diff changeset
  2244
		LDFLAGS_SUFFIX_posix:=-lm -ljava -ljvm,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2245
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2246
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2247
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2248
			  -D "JDK_FNAME=kcms.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2249
			  -D "JDK_INTERNAL_NAME=kcms" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2250
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2251
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libkcms,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2252
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2253
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2254
$(BUILD_LIBKCMS) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2255
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2256
BUILD_LIBRARIES += $(BUILD_LIBKCMS)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2257
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2258
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2259
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2260
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2261
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2262
ifndef OPENJDK
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2263
ifeq ($(OPENJDK_TARGET_OS), solaris)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2264
ifneq ($(OPENJDK_TARGET_CPU), x86_64)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2265
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2266
ifeq ($(shell if test "$(OS_VERSION_MAJOR)" -eq 5 -a "$(OS_VERSION_MINOR)" -le 10; then $(ECHO) ok; fi), ok)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2267
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2268
SUNWJDGA_MAPFILE:=
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2269
ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2270
	SUNWJDGA_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjdga/mapfile-vers
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2271
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2272
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2273
$(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2274
		LIBRARY:=sunwjdga,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2275
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2276
		SRC:=$(JDK_TOPDIR)/src/solaris/native/sun/jdga, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2277
		LANG:=C, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2278
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2279
		CFLAGS:=$(CFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2280
			-I$(JDK_TOPDIR)/src/share/javavm/export \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2281
			-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2282
			-I$(OPENWIN_HOME)/include, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2283
		MAPFILE:=$(SUNWJDGA_MAPFILE), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2284
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2285
			 $(call SET_SHARED_LIBRARY_ORIGIN), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2286
		LDFLAGS_SUFFIX:=-L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -ldga -lX11 $(LIBDL) -lc, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2287
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunwjdga))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2288
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2289
BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2290
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2291
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2292
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2293
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2294
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2295
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2296
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2297
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2298
ifeq ($(BUILD_HEADLESS), true)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2299
ifneq ($(OPENJDK_TARGET_OS), windows)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2300
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2301
LIBAWT_HEADLESS_DIRS:=$(JDK_TOPDIR)/src/share/native/sun/font \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2302
                        $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2303
			$(JDK_TOPDIR)/src/solaris/native/sun/font \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2304
			$(JDK_TOPDIR)/src/solaris/native/sun/awt \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2305
			$(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2306
			$(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2307
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2308
LIBAWT_HEADLESS_CFLAGS:=-DHEADLESS=true \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2309
                          -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2310
			  $(CUPS_CFLAGS) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2311
			  $(X_CFLAGS) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2312
			  -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2313
			  -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2314
			  -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2315
			  -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2316
			  -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2317
			  -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2318
			  -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2319
			  -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2320
                          $(foreach dir,$(LIBAWT_HEADLESS_DIRS),-I$(dir))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2321
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2322
LIBAWT_HEADLESS_FILES:=\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2323
	awt_Font.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2324
	HeadlessToolkit.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2325
	fontpath.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2326
	VDrawingArea.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2327
	X11Color.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2328
	X11Renderer.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2329
	X11PMBlitLoops.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2330
	X11SurfaceData.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2331
	X11FontScaler_md.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2332
	X11TextRenderer_md.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2333
        OGLBlitLoops.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2334
        OGLBufImgOps.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2335
        OGLContext.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2336
        OGLFuncs.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2337
        OGLMaskBlit.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2338
        OGLMaskFill.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2339
        OGLPaints.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2340
        OGLRenderQueue.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2341
        OGLRenderer.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2342
        OGLSurfaceData.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2343
        OGLTextRenderer.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2344
        OGLVertexCache.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2345
        GLXGraphicsConfig.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2346
        GLXSurfaceData.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2347
        AccelGlyphCache.c \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2348
	CUPSfuncs.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2349
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2350
LIBAWT_HEADLESS_REORDER:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2351
ifeq ($(OPENJDK_TARGET_OS), solaris)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2352
	ifneq ($(OPENJDK_TARGET_CPU), x86_64)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2353
		LIBAWT_HEADLESS_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2354
	endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2355
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2356
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2357
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2358
		LIBRARY:=awt_headless,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2359
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2360
		SRC:=$(LIBAWT_HEADLESS_DIRS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2361
		INCLUDE_FILES:=$(LIBAWT_HEADLESS_FILES),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2362
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2363
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2364
		CFLAGS:=$(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  2365
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/mapfile-vers,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2366
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2367
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2368
		LDFLAGS_linux:=$(call SET_SHARED_LIBRARY_ORIGIN,/..),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2369
		LDFLAGS_solaris:=$(call SET_SHARED_LIBRARY_ORIGIN,/..) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2370
				 -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2371
				 -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2372
		LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_ORIGIN).,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2373
		REORDER:=$(LIBAWT_HEADLESS_REORDER), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2374
		LDFLAGS_SUFFIX_linux:=-ljvm -lawt -lm $(LIBDL) -ljava,\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  2375
		LDFLAGS_SUFFIX_solaris:=$(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc,\
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  2376
		LDFLAGS_SUFFIX_macosx:=-ljvm $(LIBCXX) -lawt $(LIBDL) -ljava,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2377
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_headless))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2378
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2379
$(BUILD_LIBAWT_HEADLESS) : $(BUILD_LIBAWT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2380
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2381
BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2382
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2383
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2384
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2385
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2386
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2387
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2388
ifndef BUILD_HEADLESS_ONLY
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2389
LIBSPLASHSCREEN_DIRS:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2390
	$(JDK_TOPDIR)/src/share/native/sun/awt/giflib \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2391
	$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2392
	$(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2393
	$(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2394
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2395
ifneq ($(OPENJDK_TARGET_OS), macosx)
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2396
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2397
else
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2398
    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2399
endif
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2400
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2401
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2402
LIBSPLASHSCREEN_CFLAGS:=-DSPLASHSCREEN -DPNG_NO_MMX_CODE \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2403
	$(foreach dir,$(LIBSPLASHSCREEN_DIRS),-I$(dir))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2404
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2405
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2406
	LIBSPLASHSCREEN_CFLAGS:=-I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2407
                                  $(LIBSPLASHSCREEN_CFLAGS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2408
                                  -F/System/Library/Frameworks/JavaVM.framework/Frameworks
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2409
	LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2410
	LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2411
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2412
	LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS:=-x objective-c -O0
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2413
	LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS:=-x objective-c -O0
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2414
	LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS:=-x objective-c -O0
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2415
	LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS:=-x objective-c -O0
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2416
	LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS:=-x objective-c -O0
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2417
	LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS:=-x objective-c -O0
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2418
	LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS:=-O0
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2419
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2420
else ifneq ($(OPENJDK_TARGET_OS), windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2421
	LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2422
else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2423
	LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2424
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2425
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2426
LIBSPLASHSCREEN_LDFLAGS_SUFFIX:=
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2427
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2428
ifneq ($(USE_EXTERNAL_LIBZ),true)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2429
	LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2430
	LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2431
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2432
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2433
ifeq ($(OPENJDK_TARGET_OS), macosx)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2434
	LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2435
				  -framework ApplicationServices \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2436
				  -framework Foundation \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2437
				  -framework Cocoa \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2438
                                  -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2439
				  -framework JavaNativeFoundation
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2440
else ifneq ($(OPENJDK_TARGET_OS), windows)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2441
	LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2442
else # OPENJDK_TARGET_OS
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2443
	LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2444
endif # OPENJDK_TARGET_OS
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2445
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2446
$(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2447
		LIBRARY:=splashscreen,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2448
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2449
		SRC:=$(LIBSPLASHSCREEN_DIRS),\
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2450
		EXCLUDE_FILES:=imageioJPEG.c jpegdecoder.c pngtest.c,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2451
		LANG:=C,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2452
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2453
		CFLAGS:=$(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2454
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2455
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2456
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2457
		LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  2458
		LDFLAGS_SUFFIX_solaris:=-lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2459
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2460
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2461
			  -D "JDK_FNAME=splashscreen.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2462
			  -D "JDK_INTERNAL_NAME=splashscreen" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2463
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2464
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsplashscreen,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2465
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2466
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2467
BUILD_LIBRARIES += $(LIBSPLASHSCREEN)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2468
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2469
ifeq ($(OPENJDK_TARGET_OS),macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2470
$(LIBSPLASHSCREEN) :  $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) 
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2471
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2472
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2473
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2474
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2475
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2476
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2477
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2478
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2479
LIBDCPR_SRC_DIRS:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2480
	$(JDK_TOPDIR)/src/closed/share/native/sun/dc/doe \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2481
	$(JDK_TOPDIR)/src/closed/share/native/sun/dc/path \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2482
	$(JDK_TOPDIR)/src/closed/share/native/sun/dc/pr \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2483
	$(JDK_TOPDIR)/src/closed/share/native/sun/dc/util
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2484
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2485
LIBDCPR_CFLAGS:=$(foreach dir,$(LIBDCPR_SRC_DIRS),-I$(dir)) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2486
	          -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2487
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2488
$(eval $(call SetupNativeCompilation,BUILD_LIBDCPR,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2489
		LIBRARY:=dcpr,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2490
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2491
		SRC:=$(LIBDCPR_SRC_DIRS),\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2492
		LANG:=C,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2493
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2494
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2495
			$(LIBDCPR_CFLAGS), \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2496
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libdcpr/mapfile-vers, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2497
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2498
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2499
		LDFLAGS_SUFFIX:=$(LIBM) $(LDFLAGS_JDKLIB_SUFFIX),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2500
		LDFLAGS_SUFFIX_posix:=-lm,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2501
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2502
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2503
			  -D "JDK_FNAME=dcpr.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2504
			  -D "JDK_INTERNAL_NAME=dcpr" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2505
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2506
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdcpr,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2507
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2508
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2509
$(BUILD_LIBDCPR) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2510
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2511
BUILD_LIBRARIES += $(BUILD_LIBDCPR)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2512
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2513
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2514
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2515
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2516
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2517
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2518
		LIBRARY:=j2pcsc,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2519
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2520
		SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2521
                     $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2522
		LANG:=C,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2523
		CFLAGS_posix:=-D__sun_jdk,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2524
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2525
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2526
                     -I$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2527
                     -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2528
                     -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio/MUSCLE,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2529
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2pcsc/mapfile-vers, \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2530
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2531
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2532
		LDFLAGS_SUFFIX_posix:=$(LIBDL), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2533
		LDFLAGS_SUFFIX_windows:=winscard.lib,\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  2534
		LDFLAGS_SUFFIX_solaris:=-lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2535
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2536
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2537
			  -D "JDK_FNAME=j2pcsc.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2538
			  -D "JDK_INTERNAL_NAME=j2pcsc" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2539
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2540
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2pcsc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2541
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2542
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2543
BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2544
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2545
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2546
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2547
ifneq ($(OPENJDK_TARGET_OS), windows)
14780
a65826af2aa4 8004235: Disable native JGSS provider on Mac
weijun
parents: 14702
diff changeset
  2548
ifneq ($(OPENJDK_TARGET_OS), macosx)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2549
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2550
		LIBRARY:=j2gss,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2551
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2552
		SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2553
                     $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2554
		LANG:=C,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2555
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2556
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2557
                     -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2558
                     -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2559
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2gss/mapfile-vers, \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2560
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2561
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  2562
		LDFLAGS_SUFFIX:=$(LIBDL),\
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  2563
		LDFLAGS_SUFFIX_solaris:=-lc,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2564
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2gss))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2565
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2566
BUILD_LIBRARIES += $(BUILD_LIBJ2GSS)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2567
endif
14780
a65826af2aa4 8004235: Disable native JGSS provider on Mac
weijun
parents: 14702
diff changeset
  2568
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2569
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2570
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2571
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2572
BUILD_LIBKRB5_NAME:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2573
ifeq ($(OPENJDK_TARGET_OS), windows)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2574
     BUILD_LIBKRB5_NAME:=w2k_lsa_auth
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2575
     BUILD_LIBKRB5_SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2576
     BUILD_LIBKRB5_LIBS:=advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2577
			 gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2578
			 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2579
else ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2580
     BUILD_LIBKRB5_NAME:=osxkrb5
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2581
     BUILD_LIBKRB5_SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/krb5
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2582
     BUILD_LIBKRB5_LIBS:=-framework Kerberos
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2583
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2584
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2585
ifneq ($(BUILD_LIBKRB5_NAME),)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2586
$(eval $(call SetupNativeCompilation,BUILD_LIBKRB5,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2587
		LIBRARY:=$(BUILD_LIBKRB5_NAME),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2588
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
14525
58044c98b2fb 8003477: build-infra: Remove explicit source file listings for libs when possible
erikj
parents: 14524
diff changeset
  2589
		SRC:=$(BUILD_LIBKRB5_SRC),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2590
		LANG:=C,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2591
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2592
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2593
		        -I$(JDK_TOPDIR)/src/share/native/sun/security/krb5 \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2594
                        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5 ,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2595
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2596
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2597
		LDFLAGS_SUFFIX:=$(BUILD_LIBKRB5_LIBS) ,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2598
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2599
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2600
			  -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2601
			  -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2602
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2603
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libkrb5,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2604
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2605
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2606
BUILD_LIBRARIES += $(BUILD_LIBKRB5)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2607
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2608
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2609
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2610
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2611
ifeq ($(OPENJDK_TARGET_OS), windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2612
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2613
$(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2614
		LIBRARY:=sunmscapi,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2615
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2616
		SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2617
		LANG:=C++,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2618
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2619
		CFLAGS:=$(CFLAGS_JDKLIB) \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2620
                        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi ,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2621
		LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2622
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2623
		LDFLAGS_SUFFIX:=Crypt32.Lib advapi32.lib,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2624
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2625
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2626
			  -D "JDK_FNAME=sunmscapi.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2627
			  -D "JDK_INTERNAL_NAME=sunmscapi" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2628
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2629
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunmscapi,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2630
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2631
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2632
BUILD_LIBRARIES += $(BUILD_LIBSUNMSCAPI)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2633
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2634
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2635
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2636
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2637
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2638
		LIBRARY:=j2pkcs11,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2639
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2640
		SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2641
                     $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2642
                     $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2643
                     $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2644
		LANG:=C,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2645
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2646
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2647
		        -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2648
		        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2649
		        -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2650
                        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2651
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2pkcs11/mapfile-vers, \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2652
		LDFLAGS:=$(LDFLAGS_JDKLIB) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2653
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
14426
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  2654
		LDFLAGS_SUFFIX_posix:=$(LIBDL),\
2f6942e2316a 8002365: build-infra: Build-infra fails on solaris 11.1 on sparc.
tbell
parents: 14425
diff changeset
  2655
		LDFLAGS_SUFFIX_solaris:=-lc,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2656
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2657
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2658
			  -D "JDK_FNAME=j2pkcs11.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2659
			  -D "JDK_INTERNAL_NAME=j2pkcs11" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2660
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2661
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2pkcs11,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2662
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2663
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2664
BUILD_LIBRARIES += $(BUILD_LIBJ2PKCS11)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2665
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2666
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2667
16129
744dd8193801 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 16127
diff changeset
  2668
ifeq ($(ENABLE_INTREE_EC),yes)
744dd8193801 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 16127
diff changeset
  2669
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2670
BUILD_LIBSUNEC_FLAGS:= -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2671
                       -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2672
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2673
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2674
# On sol-sparc...all libraries are compiled with -xregs=no%appl
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2675
#   (set in CFLAGS_REQUIRED_sparc)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2676
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2677
# except!!! libsunec.so
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2678
#
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2679
ECC_JNI_SOLSPARC_FILTER:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2680
ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2681
     ECC_JNI_SOLSPARC_FILTER:=-xregs=no%appl
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2682
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2683
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2684
$(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2685
		LIBRARY:=sunec,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2686
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2687
		SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/ec \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2688
                     $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2689
		LANG:=C++, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2690
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2691
		CFLAGS:=$(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB))\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2692
                        $(BUILD_LIBSUNEC_FLAGS) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2693
                        -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2694
		CXXFLAGS:=$(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2695
                          $(BUILD_LIBSUNEC_FLAGS),\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2696
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsunec/mapfile-vers, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2697
		LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2698
		LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_ORIGIN),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2699
		LDFLAGS_SUFFIX:=$(LIBCXX),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2700
                LDFLAGS_SUFFIX_linux:=-lc ,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2701
                LDFLAGS_SUFFIX_solaris:=-lc ,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2702
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2703
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2704
			  -D "JDK_FNAME=sunec.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2705
			  -D "JDK_INTERNAL_NAME=sunec" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2706
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2707
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunec,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2708
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2709
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2710
BUILD_LIBRARIES += $(BUILD_LIBSUNEC)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2711
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2712
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2713
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2714
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2715
LIBJSOUND_SRC_DIRS:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2716
	$(JDK_TOPDIR)/src/share/native/com/sun/media/sound \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2717
	$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/media/sound
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2718
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2719
LIBJSOUND_SRC_FILES:=Utilities.c Platform.c
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2720
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2721
LIBJSOUND_LANG:=C
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2722
LIBJSOUND_CFLAGS:=$(foreach dir,$(LIBJSOUND_SRC_DIRS),-I$(dir))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2723
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2724
EXTRA_SOUND_JNI_LIBS:=
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2725
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2726
LIBJSOUND_MIDIFILES:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2727
	MidiInDevice.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2728
	MidiInDeviceProvider.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2729
	MidiOutDevice.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2730
	MidiOutDeviceProvider.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2731
	PlatformMidi.c
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2732
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2733
# files needed for ports
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2734
LIBJSOUND_PORTFILES:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2735
	PortMixerProvider.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2736
	PortMixer.c
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2737
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2738
# files needed for direct audio
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2739
LIBJSOUND_DAUDIOFILES:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2740
	DirectAudioDeviceProvider.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2741
	DirectAudioDevice.c
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2742
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2743
ifeq ($(OPENJDK_TARGET_OS), windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2744
	EXTRA_SOUND_JNI_LIBS += jsoundds
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2745
	LIBJSOUND_CFLAGS += -DX_PLATFORM=X_WINDOWS \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2746
                            -DUSE_PLATFORM_MIDI_OUT=TRUE \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2747
                            -DUSE_PLATFORM_MIDI_IN=TRUE \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2748
                            -DUSE_PORTS=TRUE
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2749
	LIBJSOUND_SRC_FILES += \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2750
		PLATFORM_API_WinOS_MidiIn.cpp \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2751
		PLATFORM_API_WinOS_MidiOut.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2752
		PLATFORM_API_WinOS_Util.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2753
		PLATFORM_API_WinOS_Ports.c
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2754
	LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2755
	LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2756
endif # OPENJDK_TARGET_OS windows
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2757
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2758
ifeq ($(OPENJDK_TARGET_OS), linux)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2759
	EXTRA_SOUND_JNI_LIBS += jsoundalsa
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2760
	LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2761
endif # OPENJDK_TARGET_OS linux
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2762
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2763
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2764
	LIBJSOUND_LANG:=C++
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2765
	LIBJSOUND_CFLAGS += -DX_PLATFORM=X_MACOSX \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2766
                            -DUSE_PORTS=TRUE \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2767
                            -DUSE_DAUDIO=TRUE \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2768
                            -DUSE_PLATFORM_MIDI_OUT=TRUE \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2769
                            -DUSE_PLATFORM_MIDI_IN=TRUE
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2770
	LIBJSOUND_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/com/sun/media/sound
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2771
	LIBJSOUND_SRC_FILES += \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2772
		PLATFORM_API_MacOSX_Utils.cpp \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2773
		PLATFORM_API_MacOSX_PCM.cpp \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2774
		PLATFORM_API_MacOSX_Ports.cpp \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2775
                PLATFORM_API_MacOSX_MidiIn.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2776
                PLATFORM_API_MacOSX_MidiOut.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2777
                PLATFORM_API_MacOSX_MidiUtils.c
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2778
	LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2779
	LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2780
	LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2781
endif # OPENJDK_TARGET_OS macosx
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2782
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2783
ifeq ($(OPENJDK_TARGET_OS), solaris)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2784
	LIBJSOUND_CFLAGS += -DX_PLATFORM=X_SOLARIS \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2785
                            -DUSE_PORTS=TRUE \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2786
                            -DUSE_DAUDIO=TRUE
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2787
	LIBJSOUND_SRC_FILES += \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2788
		PLATFORM_API_SolarisOS_Utils.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2789
		PLATFORM_API_SolarisOS_Ports.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2790
		PLATFORM_API_SolarisOS_PCM.c
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2791
	LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2792
	LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2793
	LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2794
endif # OPENJDK_TARGET_OS solaris
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2795
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2796
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2797
ifeq ($(JVM_VARIANT_ZERO), true)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2798
	LIBJSOUND_CFLAGS += -DX_ARCH=X_ZERO
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2799
else
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2800
  ifeq ($(OPENJDK_TARGET_CPU), x86)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2801
	LIBJSOUND_CFLAGS += -DX_ARCH=X_I586
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2802
  endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2803
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2804
  ifeq ($(OPENJDK_TARGET_CPU), sparc)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2805
	LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARC
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2806
  endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2807
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2808
  ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2809
	LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARCV9
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2810
  endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2811
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2812
  ifeq ($(OPENJDK_TARGET_CPU), x86_64)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2813
	LIBJSOUND_CFLAGS += -DX_ARCH=X_AMD64
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2814
  endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2815
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2816
  ifeq ($(OPENJDK_TARGET_CPU), arm)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2817
	LIBJSOUND_CFLAGS += -DX_ARCH=X_ARM
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2818
  endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2819
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2820
  ifeq ($(OPENJDK_TARGET_CPU), ppc)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2821
	LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2822
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2823
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2824
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2825
LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2826
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2827
$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2828
		LIBRARY:=jsound,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2829
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2830
		SRC:=$(LIBJSOUND_SRC_DIRS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2831
		INCLUDE_FILES:=$(LIBJSOUND_SRC_FILES),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2832
		LANG:=$(LIBJSOUND_LANG),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2833
		OPTIMIZATION:=LOW, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2834
		CFLAGS:=$(CFLAGS_JDKLIB) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2835
		        $(LIBJSOUND_CFLAGS), \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2836
		CXXFLAGS:=$(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2837
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjsound/mapfile-vers, \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2838
		LDFLAGS:=$(LDFLAGS_JDKLIB)\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2839
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2840
		LDFLAGS_macosx:=-framework CoreAudio -framework CoreFoundation \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2841
				-framework CoreServices -framework AudioUnit $(LIBCXX) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2842
				-framework CoreMIDI -framework AudioToolbox,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2843
		LDFLAGS_windows:=$(WIN_JAVA_LIB) advapi32.lib winmm.lib,\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2844
		LDFLAGS_SUFFIX_posix:=-ljava -ljvm,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2845
		LDFLAGS_SUFFIX_solaris:=-lc ,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2846
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2847
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2848
			  -D "JDK_FNAME=jsound.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2849
			  -D "JDK_INTERNAL_NAME=jsound" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2850
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2851
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsound,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2852
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2853
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2854
$(BUILD_LIBJSOUND) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2855
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2856
BUILD_LIBRARIES += $(BUILD_LIBJSOUND)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2857
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2858
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2859
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2860
ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)),)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2861
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2862
$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDALSA,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2863
		LIBRARY:=jsoundalsa,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2864
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2865
		SRC:=$(LIBJSOUND_SRC_DIRS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2866
		INCLUDE_FILES:=Utilities.c $(LIBJSOUND_MIDIFILES) $(LIBJSOUND_PORTFILES) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2867
                                $(LIBJSOUND_DAUDIOFILES) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2868
				PLATFORM_API_LinuxOS_ALSA_CommonUtils.c   \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2869
				PLATFORM_API_LinuxOS_ALSA_PCM.c     \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2870
				PLATFORM_API_LinuxOS_ALSA_PCMUtils.c   \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2871
				PLATFORM_API_LinuxOS_ALSA_MidiIn.c  \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2872
				PLATFORM_API_LinuxOS_ALSA_MidiOut.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2873
				PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2874
				PLATFORM_API_LinuxOS_ALSA_Ports.c,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2875
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2876
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2877
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2878
			$(LIBJSOUND_CFLAGS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2879
			-DUSE_DAUDIO=TRUE \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2880
			-DUSE_PORTS=TRUE  \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2881
			-DUSE_PLATFORM_MIDI_OUT=TRUE \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2882
			-DUSE_PLATFORM_MIDI_IN=TRUE, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2883
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjsoundalsa/mapfile-vers, \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2884
		LDFLAGS:=$(LDFLAGS_JDKLIB)\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2885
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2886
		LDFLAGS_SUFFIX:=-lasound -ljava -ljvm,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2887
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsoundalsa))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2888
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2889
$(BUILD_LIBJSOUNDALSA) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2890
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2891
BUILD_LIBRARIES += $(BUILD_LIBJSOUNDALSA)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2893
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2894
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2895
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2896
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2897
ifneq ($(filter jsoundds, $(EXTRA_SOUND_JNI_LIBS)),)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2898
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2899
$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDDS,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2900
		LIBRARY:=jsoundds,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2901
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2902
		SRC:=$(LIBJSOUND_SRC_DIRS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2903
		INCLUDE_FILES:=Utilities.c $(LIBJSOUND_DAUDIOFILES) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2904
				PLATFORM_API_WinOS_DirectSound.cpp, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2905
		LANG:=C++,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2906
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2907
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2908
			$(LIBJSOUND_CFLAGS) \
15883
f57291ffafbf 8008073: build-infra: Need --with-dxsdk option? And awt/sound -I option additions?
erikj
parents: 15676
diff changeset
  2909
			-DUSE_DAUDIO=TRUE \
f57291ffafbf 8008073: build-infra: Need --with-dxsdk option? And awt/sound -I option additions?
erikj
parents: 15676
diff changeset
  2910
                        -I$(DXSDK_INCLUDE_PATH), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2911
		LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2912
			 $(call SET_SHARED_LIBRARY_ORIGIN),\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2913
		LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2914
		VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2915
		RC_FLAGS:=$(RC_FLAGS)\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2916
			  -D "JDK_FNAME=jsoundds.dll" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2917
			  -D "JDK_INTERNAL_NAME=jsoundds" \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2918
			  -D "JDK_FTYPE=0x2L",\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2919
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsoundds,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2920
		DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2921
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2922
$(BUILD_LIBJSOUNDDS) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2923
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2924
BUILD_LIBRARIES += $(BUILD_LIBJSOUNDDS)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2925
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2926
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2927
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2928
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2929
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2930
ifeq ($(OPENJDK_TARGET_OS), solaris)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2931
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2932
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2933
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2UCRYPTO,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2934
		LIBRARY:=j2ucrypto,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2935
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2936
		SRC:=$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2937
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2938
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2939
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2940
			-I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto ,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2941
		MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2ucrypto/mapfile-vers, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2942
		LDFLAGS:=$(LDFLAGS_JDKLIB),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2943
		LDFLAGS_SUFFIX:=$(LIBDL),\
15676
291a66e841c2 8008294: build-infra: Build-infra closed fails on solaris 11.1
erikj
parents: 15334
diff changeset
  2944
		LDFLAGS_SUFFIX_solaris:=-lc,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2945
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2ucrypto))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2946
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2947
$(BUILD_LIBJ2UCRYPTO) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2948
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2949
BUILD_LIBRARIES += $(BUILD_LIBJ2UCRYPTO)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2950
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2951
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2952
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2953
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2954
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2955
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2956
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2957
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2958
$(eval $(call SetupNativeCompilation,BUILD_LIBAPPLESCRIPTENGINE,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2959
		LIBRARY:=AppleScriptEngine,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2960
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2961
		SRC:=$(JDK_TOPDIR)/src/macosx/native/apple/applescript,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2962
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2963
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2964
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2965
			-I$(JDK_TOPDIR)/src/macosx/native/apple/applescript \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2966
			-F/System/Library/Frameworks/JavaVM.framework/Frameworks \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2967
                        -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2968
		LDFLAGS:=$(LDFLAGS_JDKLIB)\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2969
			 $(call SET_SHARED_LIBRARY_ORIGIN), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2970
		LDFLAGS_SUFFIX:=-framework Cocoa \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2971
                                -framework Carbon \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2972
                                -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2973
                                -framework JavaNativeFoundation \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  2974
                                $(LDFLAGS_JDKLIB_SUFFIX),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2975
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libAppleScriptEngine))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2976
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2977
$(BUILD_LIBAPPLESCRIPTENGINE) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2978
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2979
BUILD_LIBRARIES += $(BUILD_LIBAPPLESCRIPTENGINE)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2980
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2981
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2982
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2983
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2984
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2985
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2986
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2987
$(eval $(call SetupNativeCompilation,BUILD_LIBOSXAPP,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2988
		LIBRARY:=osxapp,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2989
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2990
		SRC:=$(JDK_TOPDIR)/src/macosx/native/sun/osxapp,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2991
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2992
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  2993
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2994
			-I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
  2995
			-I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2996
                        -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2997
                        -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2998
		LDFLAGS:=$(LDFLAGS_JDKLIB)\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  2999
			 $(call SET_SHARED_LIBRARY_ORIGIN), \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3000
		LDFLAGS_SUFFIX_macosx:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3001
	-framework Accelerate \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3002
	-framework ApplicationServices \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3003
	-framework AudioToolbox \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3004
	-framework Carbon \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3005
	-framework Cocoa \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3006
	-framework Security \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3007
	-framework ExceptionHandling \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3008
        -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3009
	-framework JavaNativeFoundation \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3010
	-framework JavaRuntimeSupport \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3011
	-framework OpenGL \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3012
	-framework IOSurface \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3013
	-framework QuartzCore, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3014
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libosxapp))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3015
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3016
BUILD_LIBRARIES += $(BUILD_LIBOSXAPP)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3017
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3018
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3019
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3020
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3021
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3022
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3023
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3024
LIBOSX_DIRS:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3025
  $(JDK_TOPDIR)/src/macosx/native/com/apple/concurrent \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3026
  $(JDK_TOPDIR)/src/macosx/native/java/util \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3027
  $(JDK_TOPDIR)/src/macosx/native/com/apple/eio \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3028
  $(JDK_TOPDIR)/src/macosx/native/apple/security \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3029
  $(JDK_TOPDIR)/src/macosx/native/apple/launcher
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3030
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3031
$(eval $(call SetupNativeCompilation,BUILD_LIBOSX,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3032
		LIBRARY:=osx,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3033
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3034
		SRC:=$(LIBOSX_DIRS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3035
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3036
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3037
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3038
                        $(foreach dir,$(LIBOSX_DIRS),-I$(dir)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3039
                        -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3040
                        -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3041
                        -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3042
		LDFLAGS:=$(LDFLAGS_JDKLIB)\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3043
			 $(call SET_SHARED_LIBRARY_ORIGIN), \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3044
		LDFLAGS_SUFFIX_macosx:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3045
    -losxapp \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3046
    -framework Cocoa \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3047
    -framework ApplicationServices \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3048
    -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3049
    -framework JavaNativeFoundation \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3050
    -framework JavaRuntimeSupport \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3051
    -framework Security \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3052
    -framework SystemConfiguration \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3053
    $(LDFLAGS_JDKLIB_SUFFIX), \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3054
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libosx))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3055
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3056
BUILD_LIBRARIES += $(BUILD_LIBOSX)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3057
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3058
$(BUILD_LIBOSX) : $(BUILD_LIBOSXAPP)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3059
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3060
$(BUILD_LIBOSX) : $(BUILD_LIBJAVA)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3061
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3062
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3063
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3064
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3065
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3066
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3067
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3068
LIBAWT_LWAWT_FILES:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3069
        awt.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3070
        ApplicationDelegate.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3071
        CFRetainedResource.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3072
        CGLGraphicsConfig.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3073
        CGLSurfaceData.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3074
        CGLLayer.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3075
        CGraphicsConfig.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3076
        CGraphicsDevice.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3077
        CGraphicsEnv.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3078
        CCharToGlyphMapper.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3079
        CSystemColors.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3080
        AWTFont.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3081
        CGGlyphOutlines.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3082
        CGGlyphImages.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3083
        CoreTextSupport.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3084
        AWTStrike.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3085
        InitIDs.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3086
        AWTEvent.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3087
        AWTView.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3088
        AWTWindow.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3089
        AWTSurfaceLayers.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3090
        CCursorManager.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3091
        CClipboard.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3092
        CDataTransferer.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3093
        CDragSource.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3094
        CDragSourceContextPeer.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3095
        CDropTarget.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3096
        CDropTargetContextPeer.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3097
        CInputMethod.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3098
        CDesktopPeer.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3099
        OSVersion.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3100
        DnDUtilities.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3101
        CFileDialog.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3102
        CImage.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3103
        CMenu.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3104
        CMenuBar.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3105
        CMenuComponent.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3106
        CMenuItem.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3107
        CPopupMenu.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3108
        CRobot.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3109
        CTrayIcon.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3110
        CWrapper.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3111
        JavaAccessibilityAction.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3112
        JavaAccessibilityUtilities.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3113
        JavaComponentAccessibility.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3114
        JavaTextAccessibility.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3115
        LWCToolkit.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3116
        GeomUtilities.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3117
        CPrinterJob.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3118
        PrintModel.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3119
        PrinterSurfaceData.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3120
        PrinterView.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3121
        QuartzSurfaceData.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3122
        QuartzRenderer.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3123
        CTextPipe.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3124
        ImageSurfaceData.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3125
        awt_DrawingSurface.m \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3126
        \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3127
        OGLBlitLoops.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3128
        OGLBufImgOps.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3129
        OGLContext.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3130
        OGLFuncs.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3131
        OGLMaskBlit.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3132
        OGLMaskFill.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3133
        OGLPaints.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3134
        OGLRenderQueue.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3135
        OGLRenderer.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3136
        OGLSurfaceData.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3137
        OGLTextRenderer.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3138
        OGLVertexCache.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3139
        AccelGlyphCache.c \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3140
        CUPSfuncs.c
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3141
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3142
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3143
LIBAWT_LWAWT_DIRS:=\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3144
  $(JDK_TOPDIR)/src/macosx/native/sun/awt \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3145
  $(JDK_TOPDIR)/src/macosx/native/sun/font \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3146
  $(JDK_TOPDIR)/src/macosx/native/sun/java2d/opengl \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3147
  $(JDK_TOPDIR)/src/solaris/native/sun/awt \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3148
  $(JDK_TOPDIR)/src/share/native/sun/font \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3149
  $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3150
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3151
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3152
		LIBRARY:=awt_lwawt,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3153
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3154
		SRC:=$(LIBAWT_LWAWT_DIRS),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3155
		LANG:=C,\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3156
		INCLUDE_FILES:=$(LIBAWT_LWAWT_FILES),\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3157
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3158
		CFLAGS:=$(CFLAGS_JDKLIB) \
14233
18fda1299ea9 8001891: build-infra: Adding X_CFLAGS and X_LIBS to lwawt and sizer compilation
ohrstrom
parents: 14231
diff changeset
  3159
                        $(X_CFLAGS) \
18fda1299ea9 8001891: build-infra: Adding X_CFLAGS and X_LIBS to lwawt and sizer compilation
ohrstrom
parents: 14231
diff changeset
  3160
                        $(X_LIBS) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3161
                        $(foreach dir,$(LIBAWT_LWAWT_DIRS),-I$(dir)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3162
                        -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3163
                        -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3164
                        -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3165
                        -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3166
                        -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3167
                        -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3168
                        -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3169
                        -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3170
                        -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3171
                        -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3172
		LDFLAGS:=$(LDFLAGS_JDKLIB)\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3173
			 $(call SET_SHARED_LIBRARY_ORIGIN), \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3174
		LDFLAGS_SUFFIX_macosx:=-lawt -lmlib_image -losxapp -ljvm $(LIBM) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3175
				       -framework Accelerate \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3176
				       -framework ApplicationServices \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3177
				       -framework AudioToolbox \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3178
				       -framework Carbon \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3179
				       -framework Cocoa \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3180
				       -framework Security \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3181
				       -framework ExceptionHandling \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3182
				       -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3183
				       -framework JavaNativeFoundation \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3184
				       -framework JavaRuntimeSupport \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3185
				       -framework OpenGL \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3186
				       -framework QuartzCore -ljava,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3187
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_lwawt))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3188
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3189
BUILD_LIBRARIES += $(BUILD_LIBAWT_LWAWT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3190
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3191
$(BUILD_LIBAWT_LWAWT) : $(BUILD_LIBAWT) 
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3192
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3193
$(BUILD_LIBAWT_LWAWT) : $(BUILD_LIBMLIB_IMAGE)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3194
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3195
$(BUILD_LIBAWT_LWAWT) : $(BUILD_LIBOSXAPP)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3196
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3197
$(BUILD_LIBAWT_LWAWT) : $(BUILD_LIBJAVA)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3198
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3199
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3200
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3201
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3202
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3203
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3204
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3205
$(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3206
		LIBRARY:=osxui,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3207
                OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3208
		SRC:=$(JDK_TOPDIR)/src/macosx/native/com/apple/laf,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3209
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3210
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3211
		CFLAGS:=$(CFLAGS_JDKLIB) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3212
                        -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3213
			-I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3214
			-I$(JDK_TOPDIR)/src/macosx/native/sun/awt \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3215
                        -F/System/Library/Frameworks/JavaVM.framework/Frameworks, \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3216
		LDFLAGS:=$(LDFLAGS_JDKLIB)\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3217
			 $(call SET_SHARED_LIBRARY_ORIGIN) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3218
			 -Xlinker -rpath -Xlinker @loader_path,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3219
		LDFLAGS_SUFFIX_macosx:=-lawt -losxapp -lawt_lwawt \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3220
				       -framework Cocoa \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3221
				       -framework Carbon \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3222
				       -framework ApplicationServices \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3223
				       -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3224
				       -framework JavaNativeFoundation \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3225
				       -framework JavaRuntimeSupport \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3226
				       -ljava -ljvm,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3227
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libosxui))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3228
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3229
BUILD_LIBRARIES += $(BUILD_LIBOSXUI)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3230
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3231
$(BUILD_LIBOSXUI) : $(BUILD_LIBAWT) 
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3232
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3233
$(BUILD_LIBOSXUI) : $(BUILD_LIBOSXAPP)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3234
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3235
$(BUILD_LIBOSXUI) : $(BUILD_LIBAWT_LWAWT)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3236
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3237
#$(BUILD_LIBOSXUI) : $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3238
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3239
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3240
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3241
##########################################################################################
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3242
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3243
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3244
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3245
# Ugly hack to mimic behaviour in old build where this is built as an xcode project.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3246
SET_SHARED_LIBRARY_NAME=-Xlinker -install_name -Xlinker /usr/local/lib/libJObjC.dylib
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3247
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3248
$(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC32,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3249
		LIBRARY:=JObjC,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3250
                OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc32,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3251
		SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/native \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3252
                     $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/native ,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3253
		LANG:=C,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3254
		OPTIMIZATION:=LOW, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3255
		CFLAGS:=-fpascal-strings \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3256
                        -fobjc-gc \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3257
                        -gdwarf-2 \
14344
a5537423264b 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14235
diff changeset
  3258
                        $(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers_jobjc \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3259
                        -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3260
			-m32,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3261
		LDFLAGS:=$(LDFLAGS_JDKLIB)\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3262
			-m32, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3263
		LDFLAGS_SUFFIX:=-framework Foundation -framework JavaVM \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3264
                                  -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3265
                                  -framework JavaNativeFoundation \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3266
                                  -lffi, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3267
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc32))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3268
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3269
$(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC64,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3270
		LIBRARY:=JObjC,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3271
                OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc64,\
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3272
		SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/native \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3273
                     $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/native ,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3274
		LANG:=C,\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3275
		OPTIMIZATION:=LOW, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3276
		CFLAGS:=-fpascal-strings \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3277
                        -fobjc-gc \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3278
                        -gdwarf-2 \
14344
a5537423264b 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14235
diff changeset
  3279
                        $(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers_jobjc \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3280
                        -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3281
			, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3282
		LDFLAGS:=-fpascal-strings \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3283
                         -fobjc-gc \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3284
                         -gdwarf-2 \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3285
                         $(LDFLAGS_JDKLIB)\
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3286
			 $(call SET_SHARED_LIBRARY_ORIGIN), \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3287
		LDFLAGS_SUFFIX:=-framework Foundation -framework JavaVM \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3288
                                  -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3289
                                  -framework JavaNativeFoundation \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
  3290
                                  -lffi, \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3291
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc64))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3292
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3293
$(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX): $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3294
	$(LIPO) -create -output $@ $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3295
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
  3296
BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3297
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3298
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3299
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3300
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
  3301
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3302
ifndef OPENJDK
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3303
ifeq ($(OPENJDK_TARGET_OS), windows)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3304
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3305
  ACCESSBRIDGE_SRCDIR:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3306
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3307
  define SetupAccessBridge
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3308
    # Parameter 1 Suffix
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3309
    # Parameter 2 Machine
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3310
    # Parameter 3 ACCESSBRIDGE_ARCH_ suffix
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3311
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3312
    $(call SetupNativeCompilation,BUILD_JAWTACCESSBRIDGE$1,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3313
		LIBRARY=JAWTAccessBridge$1,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3314
		OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3315
		SRC:=$(ACCESSBRIDGE_SRCDIR),\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3316
		INCLUDE_FILES:=JAWTAccessBridge.cpp,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3317
		LANG:=C++,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3318
		OPTIMIZATION:=LOW,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3319
		CFLAGS:=$(CFLAGS_JDKLIB) \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3320
			-DACCESSBRIDGE_ARCH_$3,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3321
		LDFLAGS:=$(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3322
			 winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3323
			 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3324
			 -subsystem:windows -machine:$2 \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3325
			 -def:$(ACCESSBRIDGE_SRCDIR)/JAWTAccessBridge.DEF,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3326
		VERSIONINFO_RESOURCE:=$(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3327
		RC_FLAGS:=$(RC_FLAGS),\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3328
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjawtaccessbridge$1,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3329
		DEBUG_SYMBOLS:=true)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3330
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3331
    $$(BUILD_JAWTACCESSBRIDGE$1): $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3332
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3333
    $(call SetupNativeCompilation,BUILD_JAVAACCESSBRIDGE$1,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3334
		LIBRARY=JavaAccessBridge$1,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3335
		OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3336
		SRC:=$(ACCESSBRIDGE_SRCDIR),\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3337
		INCLUDE_FILES:=AccessBridgeATInstance.cpp AccessBridgeDebug.cpp \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3338
			       AccessBridgeJavaEntryPoints.cpp \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3339
			       AccessBridgeMessages.cpp JavaAccessBridge.cpp,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3340
		LANG:=C++,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3341
		OPTIMIZATION:=LOW,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3342
		CFLAGS:=$(CFLAGS_JDKLIB) \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3343
			-DACCESSBRIDGE_ARCH_$3,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3344
		LDFLAGS:=$(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3345
			 winspool.lib comdlg32.lib advapi32.lib shell32.lib \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3346
			 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3347
			 -subsystem:windows -machine:$2 \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3348
			 -def:$(ACCESSBRIDGE_SRCDIR)/JavaAccessBridge.DEF,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3349
		VERSIONINFO_RESOURCE:=$(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3350
		RC_FLAGS:=$(RC_FLAGS),\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3351
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjavaaccessbridge$1,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3352
		DEBUG_SYMBOLS:=true)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3353
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3354
    $(call SetupNativeCompilation,BUILD_WINDOWSACCESSBRIDGE$1,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3355
		LIBRARY=WindowsAccessBridge$1,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3356
		OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3357
		SRC:=$(ACCESSBRIDGE_SRCDIR),\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3358
		INCLUDE_FILES:=AccessBridgeJavaVMInstance.cpp AccessBridgeMessageQueue.cpp \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3359
			       AccessBridgeMessages.cpp AccessBridgeWindowsEntryPoints.cpp \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3360
			       WinAccessBridge.cpp AccessBridgeDebug.cpp \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3361
			       AccessBridgeEventHandler.cpp,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3362
		LANG:=C++,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3363
		OPTIMIZATION:=LOW,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3364
		CFLAGS:=$(filter-out -MD,$(CFLAGS_JDKLIB)) -MT \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3365
			-DACCESSBRIDGE_ARCH_$3,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3366
		LDFLAGS:=$(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3367
			 winspool.lib comdlg32.lib advapi32.lib shell32.lib \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3368
			 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3369
			 -subsystem:windows -machine:$2 \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3370
			 -def:$(ACCESSBRIDGE_SRCDIR)/WinAccessBridge.DEF,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3371
		VERSIONINFO_RESOURCE:=$(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3372
		RC_FLAGS:=$(RC_FLAGS),\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3373
		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libwindowsaccessbridge$1,\
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3374
		DEBUG_SYMBOLS:=true)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3375
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3376
    BUILD_LIBRARIES += $$(BUILD_JAWTACCESSBRIDGE$1) $$(BUILD_JAVAACCESSBRIDGE$1) \
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3377
		       $$(BUILD_WINDOWSACCESSBRIDGE$1)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3378
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3379
  endef
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3380
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3381
  ifeq ($(OPENJDK_TARGET_CPU_BITS),32)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3382
    $(eval $(call SetupAccessBridge,-32,I386,32))
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3383
    $(eval $(call SetupAccessBridge,,I386,LEGACY))
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3384
  else
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3385
    $(eval $(call SetupAccessBridge,-64,X64,64))
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3386
  endif
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3387
endif
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3388
endif
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3389
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3390
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3391
##########################################################################################
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14855
diff changeset
  3392
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  3393
all: $(COPY_FILES) $(BUILD_LIBRARIES)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  3394
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
  3395
.PHONY: all