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